Melee Tweaks and Changes

TheDenSS14 · Feb 26, 2025 · d3a5162 · d3a5162
1 parent 24bf812
commit d3a5162
Show file tree

Hide file tree

Showing 26 changed files with 82 additions and 30 deletions.
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
@@ -36,6 +36,7 @@
     quickEquip: false
     slots:
     - back
+    - suitStorage
     sprite: Objects/Fun/Instruments/eguitar.rsi
   - type: Tag
     tags:
@@ -80,6 +81,7 @@
     quickEquip: false
     slots:
     - back
+    - suitStorage
     sprite: Objects/Fun/Instruments/bassguitar.rsi
   - type: Tag
     tags:
@@ -131,6 +133,7 @@
     quickEquip: false
     slots:
     - back
+    - suitStorage
     sprite: Objects/Fun/Instruments/rockguitar.rsi
   - type: Tag
     tags:
@@ -161,6 +164,7 @@
     quickEquip: false
     slots:
     - back
+    - suitStorage
     sprite: Objects/Fun/Instruments/guitar.rsi
   - type: Wieldable
   - type: Damageable # Smash it! Does 20 damage a hit, but breaks after 1 hit.

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
@@ -416,7 +416,7 @@
     heavyDamageBaseModifier: 1
     heavyStaminaCost: 10
     maxTargets: 8
-    angle: 360
+    angle: 120
     soundHit:
       path: /Audio/Items/drill_hit.ogg
   - type: DamageOtherOnHit
@@ -461,7 +461,7 @@
     heavyDamageBaseModifier: 1
     heavyStaminaCost: 10
     maxTargets: 8
-    angle: 360
+    angle: 120
     soundHit:
       path: /Audio/Items/drill_hit.ogg
   - type: DamageOtherOnHit
@@ -619,4 +619,4 @@
     state: evil
   - type: Item
     size: Small
-    heldPrefix: evil
+    heldPrefix: evil
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -473,8 +473,8 @@
         - MobState
     damage:
       types:
-        Blunt: 20
-        Slash: 5
+        Blunt: 25
+        Slash: 10
   - type: Projectile
     impactEffect: BulletImpactEffectKinetic
     damage:
@@ -1046,7 +1046,7 @@
       collection: MeatLaserImpact
 
 - type: entity
-  name: laser bolt 
+  name: laser bolt
   id: BulletLaser
   parent: BaseBullet
   categories: [ HideSpawnMenu ]
@@ -1095,7 +1095,7 @@
   - type: ProjectileSpread
     proto: BulletLaser
     count: 5 #50 heat damage if you hit all your shots, but wide spread
-    spread: 30 
+    spread: 30
 
 - type: entity
   name: narrow laser barrage
@@ -1139,7 +1139,7 @@
   - type: ProjectileSpread
     proto: BulletDisablerSmg
     count: 3 #bit stronger than a disabler if you hit your shots you goober, still not a 2 hit stun though
-    spread: 9 
+    spread: 9
 
 - type: entity #Goobstation, put here so the X-01 stuff isnt spread everywhere.
   name: magnum bolt
@@ -1178,4 +1178,4 @@
         Blunt: 3
         Heat: 15
     soundHit:
-      collection: MeatLaserImpact
+      collection: MeatLaserImpact
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
@@ -37,9 +37,11 @@
     - Rolling
     speedModifier: 0.75 # a bit unwieldly but does the job
   - type: Clothing
+    sprite: Objects/Weapons/Melee/baseball_bat.rsi
     quickEquip: false
     slots:
     - back
+    - suitStorage
   - type: Construction
     graph: WoodenBat
     node: bat

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
@@ -47,6 +47,7 @@
     quickEquip: false
     slots:
     - back
+    - suitStorage
   - type: Tool
     qualities:
       - Prying

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/home_run_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/home_run_bat.yml
@@ -29,6 +29,12 @@
     size: Large
   - type: Tool
     speedModifier: 0.5 # it's very heavy, it rolls slower than a wooden bat
+  - type: Clothing
+    sprite: Objects/Weapons/Melee/home_run_bat.rsi
+    quickEquip: false
+    slots:
+    - back
+    - suitStorage
   - type: UseDelay
     delay: 2
   - type: PhysicalComposition

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -106,7 +106,7 @@
   # Shitmed Change
   - type: Scalpel
     speed: 0.3
-  - type: BoneSaw 
+  - type: BoneSaw
     speed: 0.5
 
 - type: entity
@@ -239,7 +239,9 @@
     sprite: Objects/Weapons/Melee/shiv.rsi
     state: icon
   - type: MeleeWeapon
-    attackRate: .57
+    attackRate: .9
+    heavyRateModifier: 1.5
+    heavyDamageBaseModifier: 1.1
     range: 1.4
     damage:
       types:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -24,6 +24,7 @@
         Piercing: 3
     bluntStaminaDamageFactor: 2.0
     heavyDamageBaseModifier: 1.75
+    heavyStaminaCost: 7.5
     maxTargets: 5
     angle: 80
   - type: DamageOtherOnHit
@@ -71,7 +72,7 @@
       path: "/Audio/Items/drill_hit.ogg"
     attackRate: 0.25
     range: 1.5
-    heavyStaminaCost: 0.4
+    heavyStaminaCost: 0
     damage:
       groups:
         Brute: 3
@@ -107,7 +108,7 @@
     wideAnimationRotation: -90
     soundHit:
       path: "/Audio/Items/drill_hit.ogg"
-    heavyStaminaCost: 0.2 # More efficient so less stamina needed to use
+    heavyStaminaCost: 0
     damage:
       groups:
         Brute: 6
@@ -176,7 +177,7 @@
     damage:
       types:
         Blunt: 8
-        Slash: 4
+        Slash: 5
     bluntStaminaDamageFactor: 2.0
     heavyRateModifier: 0.75
     heavyDamageBaseModifier: 1.2
@@ -190,8 +191,8 @@
   - type: IncreaseDamageOnWield
     damage:
       types:
-        Blunt: 2.5
-        Slash: 2.5
+        Blunt: 5
+        Slash: 5
         Structural: 30
   - type: GunRequiresWield
   - type: Item
@@ -201,6 +202,11 @@
     qualities:
       - Prying
   - type: Prying
+  - type: Clothing
+    quickEquip: false
+    slots:
+    - back
+    - suitStorage
 
 - type: entity
   parent: BaseWeaponCrusher
@@ -214,11 +220,11 @@
   - type: MeleeWeapon
     autoAttack: true
     wideAnimationRotation: -135
-    attackRate: 1.25
+    attackRate: 1
     range: 1.4
     damage:
       types:
-        Slash: 9
+        Slash: 12
     heavyRateModifier: 0.9
     heavyDamageBaseModifier: 1.2
     maxTargets: 2
@@ -249,10 +255,21 @@
       groups:
         Brute: -21
   - type: MeleeWeapon
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Blunt: 5
+        Slash: 10
+        Structural: 30
   - type: EmbeddableProjectile
   - type: EmbedPassiveDamage
   - type: ThrowingAngle
     angle: 225
   - type: Tag
     tags:
       - Pickaxe
+  - type: Clothing
+    quickEquip: false
+    slots:
+    - back
+    - suitStorage
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml
@@ -39,6 +39,7 @@
     bluntStaminaDamageFactor: 2.0
     heavyRateModifier: 1.25
     heavyDamageBaseModifier: 1.2
+    heavyStaminaCost: 5
     animation: WeaponArcThrust
   - type: DamageOtherOnHit
   - type: StaminaDamageOnHit

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -88,11 +88,11 @@
       path: /Audio/SimpleStation14/Weapons/Melee/rapierhit.ogg
     damage:
       types:
-        Slash: 12
+        Slash: 17
     heavyRateModifier: 2
     heavyRangeModifier: 2.75 #Superior Japanese folded steel
     heavyDamageBaseModifier: 1.25
-    heavyStaminaCost: 15
+    heavyStaminaCost: 7.5
     maxTargets: 1
     angle: 20
   - type: DamageOtherOnHit
@@ -164,6 +164,7 @@
     heavyRangeModifier: 1.25
     heavyDamageBaseModifier: 1.2
     heavyStaminaCost: 7.5
+    maxTargets: 3
     angle: 80
     soundHit:
         path: /Audio/Weapons/bladeslice.ogg
@@ -200,7 +201,7 @@
     heavyDamageBaseModifier: 1
     heavyStaminaCost: 15
     maxTargets: 10
-    angle: 200
+    angle: 120
     soundHit:
         path: /Audio/Weapons/bladeslice.ogg
   - type: DamageOtherOnHit
@@ -215,6 +216,7 @@
     sprite: Objects/Weapons/Melee/claymore.rsi
     slots:
     - back
+    - suitStorage
 
 - type: entity
   name: cutlass
@@ -234,6 +236,7 @@
     damage:
       types:
         Slash: 12
+        Piercing: 3
     heavyRateModifier: 1.25
     heavyRangeModifier: 1.2
     heavyDamageBaseModifier: 1.2

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
@@ -62,6 +62,11 @@
   parent: BaseBola
   description: An advanced hardlight criminal entangling tool. Otherwise known as an expensive piece of string.
   components:
+  - type: Tag
+    tags:
+      - SecBeltEquip
+  - type: Item
+    size: Small
   - type: Sprite
     sprite: Objects/Weapons/Throwable/energy_bola.rsi
   - type: DamageOnLand
@@ -72,8 +77,8 @@
     destroyOnRemove: true
     freeTime: 2.0
     breakoutTime: 3.5 #all bola should generally be fast to remove
-    walkSpeed: 0.7 #makeshift bola shouldn't slow too much
-    sprintSpeed: 0.7
+    walkSpeed: 0.5 #makeshift bola shouldn't slow too much
+    sprintSpeed: 0.5
     staminaDamage: 55 # Sudden weight increase sapping stamina
     canThrowTrigger: true
     canMoveBreakout: true

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
@@ -41,7 +41,7 @@
     bluntStaminaDamageFactor: 2.5
     heavyRateModifier: 0.75
     heavyDamageBaseModifier: 1.75
-    heavyStaminaCost: 1
+    heavyStaminaCost: 5
     animation: WeaponArcSlash
   - type: DamageOtherOnHit
   - type: StaminaDamageOnHit

diff --git a/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml b/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml
@@ -181,7 +181,7 @@
 - type: loadout
   id: LoadoutSalvageWeaponsThrowingKnife
   category: JobsLogisticsSalvageSpecialist
-  cost: 1
+  cost: 4
   canBeHeirloom: true
   customColorTint: true # Go read Neuromancer
   requirements:
@@ -198,7 +198,7 @@
 - type: loadout
   id: LoadoutSalvageWeaponsMachete
   category: JobsLogisticsSalvageSpecialist
-  cost: 1
+  cost: 2
   canBeHeirloom: true
   customColorTint: true # Go read Neuromancer
   requirements:

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/blunt.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/blunt.yml
@@ -33,6 +33,7 @@
     quickEquip: false
     slots:
     - back
+    - suitStorage
 
 - type: entity
   name: shinai

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/breaching_hammer.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/breaching_hammer.yml
@@ -20,6 +20,7 @@
     soundHit:
       path: /Audio/Nyanotrasen/Weapons/club.ogg
     bluntStaminaDamageFactor: 1.50 # 15 stamina damage
+    heavyStaminaCost: 20
 #  - type: MeleeStaminaCost
 #    swing: 10
 #    wieldCoefficient: 0.5 #if wielded you will only consume 5
@@ -48,3 +49,4 @@
     quickEquip: false
     slots:
     - back
+    - suitStorage