diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index c39e6d58b9257..29450da961206 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -3399,7 +3399,7 @@ types: Slash: 6 Piercing: 6 - Structural: 15 + Structural: 6 # Secondary breaching - type: entity name: space cat diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml b/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml index 6d4266d2524bf..9f70e18829a67 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml @@ -310,7 +310,6 @@ types: Blunt: 5 Slash: 10 - Structural: 5 - type: entity parent: [BaseMobArgocyte, BaseSlicingRefinable] @@ -341,7 +340,6 @@ types: Blunt: 15 Slash: 5 - Structural: 5 - type: MovementSpeedModifier baseSprintSpeed : 6.5 baseWalkSpeed: 5 @@ -374,7 +372,6 @@ types: Blunt: 10 Slash: 15 - Structural: 10 - type: MovementSpeedModifier baseSprintSpeed : 3.5 baseWalkSpeed: 3 @@ -419,7 +416,6 @@ damage: types: Blunt: 25 - Structural: 25 - type: MovementSpeedModifier baseSprintSpeed : 3 baseWalkSpeed: 3 @@ -464,4 +460,3 @@ damage: types: Blunt: 75 - Structural: 50 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml b/Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml index 9e8732bf1aa12..4553ab2a9a957 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml @@ -94,7 +94,6 @@ damage: types: Blunt: 150 - Structural: 70 - type: FootstepModifier footstepSoundCollection: collection: FootstepThud diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml index 09af04aeea20b..da0f139032083 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml @@ -96,7 +96,6 @@ damage: types: Blunt: 6 - Structural: 4 Caustic: 4 - type: InteractionPopup successChance: 0.5 @@ -186,7 +185,6 @@ damage: types: Blunt: 6 - Structural: 4 Caustic: 1 Poison: 4 @@ -226,7 +224,6 @@ damage: types: Blunt: 6 - Structural: 4 Caustic: 4 - type: entity diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml index 31fd3bfd18f4c..c1824de2662e5 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml @@ -97,7 +97,7 @@ damage: types: Blunt: 20 - Structural: 20 + Structural: 5 # Activate Star Platinum's signature move: Digging a hole - type: MeleeSpeech - type: UserInterface interfaces: diff --git a/Resources/Prototypes/Entities/Objects/Misc/eggspider.yml b/Resources/Prototypes/Entities/Objects/Misc/eggspider.yml index c2357ed3c8cad..b5d4e0c891d97 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/eggspider.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/eggspider.yml @@ -11,7 +11,6 @@ damage: types: Blunt: 6 - Structural: 2 animation: WeaponArcPunch - type: Item size: Small diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml index 7a84a3423f563..b1f9041125e0b 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml @@ -47,7 +47,7 @@ damage: types: Blunt: 25 #thwack - Structural: 20 + Structural: 10 soundHit: collection: MetalThud - type: Puller @@ -225,7 +225,6 @@ damage: types: Blunt: 10 #thwack - Structural: 2 - type: MovementSpeedModifier baseWalkSpeed: 2.4 baseSprintSpeed: 3.7 @@ -288,7 +287,6 @@ damage: types: Blunt: 10 #thwack - Structural: 2 - type: MovementSpeedModifier baseWalkSpeed: 2.25 baseSprintSpeed: 3.6 diff --git a/Resources/Prototypes/Entities/Objects/Tools/pka_upgrade.yml b/Resources/Prototypes/Entities/Objects/Tools/pka_upgrade.yml index e06597c0fab24..78d634ccfac4c 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/pka_upgrade.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/pka_upgrade.yml @@ -37,7 +37,7 @@ damage: types: Blunt: 10 - Structural: 15 + Structural: 10 - type: entity id: PKAUpgradeRange diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml index 7556f2c371cf0..e171e3174ac2d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml @@ -5,10 +5,10 @@ name: bullet (.60 anti-materiel) components: - type: Projectile - damage: + damage: # Just enough to destroy a solid wall types: Piercing: 75 - Structural: 226 + Structural: 260 penetrationThreshold: 360 penetrationDamageTypeRequirement: - Structural diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml index a490c77211867..31ea7d18fad28 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -11,8 +11,7 @@ damage: types: Piercing: 40 - Structural: 15 - + Structural: 20 - type: entity parent: BaseBullet @@ -41,7 +40,6 @@ damage: types: Piercing: 10 - Structural: 15 - type: entity parent: PelletShotgun @@ -224,7 +222,6 @@ damage: types: Piercing: 25 - Structural: 5 - type: entity parent: PelletGrapeshot diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml index 29cb56db7dc42..c44cca27af814 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml @@ -300,7 +300,6 @@ types: Piercing: 20 Cold: 20 - Structural: 50 - type: entity parent: ProjectilePolyboltBase diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index b3c49b1d65e7e..0feeee57f482b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -552,7 +552,7 @@ damage: types: Blunt: 15 - Structural: 30 + Structural: 15 # Short lifespan - type: TimedDespawn lifetime: 0.22 # roughly 5.5 tiles diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml index ad286c54cea31..458e2e461461d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml @@ -21,7 +21,6 @@ types: Slash: 11 Piercing: 11 - Structural: 20 - type: Item size: Normal sprite: Objects/Weapons/Melee/armblade.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml index 3aa5b041f83dc..a6d9f1fa9c9e3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml @@ -12,7 +12,6 @@ damage: types: Blunt: 10 - Structural: 5 soundHit: collection: MetalThud - type: Wieldable @@ -20,7 +19,6 @@ damage: types: Blunt: 5 - Structural: 10 - type: Item size: Normal shape: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml index 6dbfd292ca014..e54790d31939c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml @@ -23,7 +23,6 @@ types: Slash: 2 Blunt: 2 - Structural: 4 soundHit: path: /Audio/Weapons/chainsaw_rev.ogg params: @@ -32,7 +31,6 @@ damage: types: Slash: 4 - Structural: 4 - type: Item size: Large shape: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml index 84e89e70706be..7ab81ea737c72 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml @@ -73,7 +73,6 @@ types: Blunt: 10 Slash: 10 - Structural: 5 soundHit: collection: MetalThud - type: Wieldable @@ -82,7 +81,6 @@ types: Blunt: 5 Slash: 5 - Structural: 10 - type: Item size: Ginormous - type: Clothing diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml index 6de8abb69dc56..e03088830fce3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml @@ -44,7 +44,6 @@ types: Slash: 15 Heat: 15 - Structural: 20 - type: MeleeWeapon wideAnimationRotation: -135 attackRate: 1 @@ -312,7 +311,6 @@ types: Slash: 12 Heat: 12 - Structural: 15 - type: ItemToggleActiveSound activeSound: path: /Audio/Weapons/ebladehum.ogg @@ -377,7 +375,6 @@ types: Slash: 20 Heat: 20 - Structural: 20 - type: MeleeRequiresWield - type: HeldSpeedModifier #slowdown is what balances this compared to a dsword walkModifier: 0.6 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml index 4f940a8a85564..985baa20089f7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml @@ -21,7 +21,7 @@ # axes are kinda like sharp hammers, you know? Blunt: 5 Slash: 10 - Structural: 10 + Structural: 5 soundHit: collection: MetalThud - type: Wieldable @@ -29,7 +29,7 @@ damage: types: Slash: 10 - Structural: 40 + Structural: 20 - type: Item size: Ginormous - type: Clothing diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/hammers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/hammers.yml index d2a0ecdbfb9bd..78267f354e02d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/hammers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/hammers.yml @@ -12,7 +12,7 @@ damage: types: Blunt: 10 - Structural: 10 + Structural: 5 soundHit: collection: MetalThud - type: Wieldable @@ -58,12 +58,12 @@ damage: types: Blunt: 20 - Structural: 25 + Structural: 55 # The mighty muscle wizard shatters windows in a single blow - type: DamageOtherOnHit damage: types: Blunt: 15 - Structural: 15 + Structural: 40 - type: Item size: Ginormous @@ -95,7 +95,6 @@ damage: types: Blunt: 5 - Structural: 5 soundHit: path: /Audio/Effects/radpulse5.ogg params: @@ -104,6 +103,5 @@ damage: types: Blunt: 15 - Structural: 15 - type: Item size: Ginormous diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml index a207b30e843bc..c81d2a7c767ea 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml @@ -25,7 +25,7 @@ damage: types: Piercing: 10 - Structural: 30 + Structural: 8 - type: Item size: Normal shape: @@ -63,7 +63,7 @@ damage: types: Piercing: 3 - Structural: 15 + Structural: 5 - type: entity name: diamond tipped mining drill @@ -84,7 +84,7 @@ damage: types: Piercing: 6 - Structural: 30 + Structural: 10 - type: entity @@ -162,7 +162,7 @@ types: Blunt: 6 Slash: 2 - Structural: 30 + Structural: 10 - type: GunRequiresWield - type: DisarmMalus - type: Prying @@ -258,4 +258,4 @@ types: Blunt: 2 Slash: 6 - Structural: 20 + Structural: 10 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml index f5fa2a9576e35..b757f86f33201 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -208,7 +208,7 @@ attackRate: 10 damage: types: - Structural: 150 + Structural: 20 Slash: 20 #Horror Blunt: 20 Heat: 20