Removes british spelling of armor from armor_penetration vars (#30104)

* spelling

* manually rename last armour pen

* Update code/game/objects/obj_defense.dm

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>

* Update goldgrub.dm

---------

Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
This commit is contained in:
kyunkyunkyun
2025-09-01 04:27:52 +00:00
committed by GitHub
co-authored by PollardTheDragon
parent 3216ab1c00
commit 626eaaeb79
65 changed files with 152 additions and 152 deletions
@@ -460,7 +460,7 @@
M.gets_drilled(K.firer)
if(modifier)
for(var/mob/living/L in range(1, target_turf) - K.firer - target)
var/armor = L.run_armor_check(K.def_zone, K.flag, null, null, K.armour_penetration_flat, K.armour_penetration_percentage)
var/armor = L.run_armor_check(K.def_zone, K.flag, null, null, K.armor_penetration_flat, K.armor_penetration_percentage)
L.apply_damage(K.damage * modifier, K.damage_type, K.def_zone, armor)
to_chat(L, "<span class='userdanger'>You're struck by a [K.name]!</span>")
@@ -564,7 +564,7 @@
var/kill_modifier = 1
if(K.pressure_decrease_active)
kill_modifier *= K.pressure_decrease
var/armor = L.run_armor_check(K.def_zone, K.flag, null, null, K.armour_penetration_flat, K.armour_penetration_percentage)
var/armor = L.run_armor_check(K.def_zone, K.flag, null, null, K.armor_penetration_flat, K.armor_penetration_percentage)
L.apply_damage(bounties_reaped[L.type]*kill_modifier, K.damage_type, K.def_zone, armor)
/obj/item/borg/upgrade/modkit/bounty/proc/get_kill(mob/living/L)
@@ -1095,7 +1095,7 @@
desc = "It's about a foot of weird silvery metal with a wicked point."
damage = 25
knockdown = 2
armour_penetration_flat = 30
armor_penetration_flat = 30
icon_state = "magspear"
/obj/item/projectile/bullet/spike/on_hit(atom/target, blocked = 0)
@@ -69,11 +69,11 @@
/obj/item/projectile/bullet/saw
damage = 45
armour_penetration_flat = 5
armor_penetration_flat = 5
/obj/item/projectile/bullet/saw/bleeding
damage = 20
armour_penetration_flat = 0
armor_penetration_flat = 0
/obj/item/projectile/bullet/saw/bleeding/on_hit(atom/target, blocked = 0, hit_zone)
. = ..()
@@ -83,15 +83,15 @@
/obj/item/projectile/bullet/saw/hollow
damage = 60
armour_penetration_flat = -30
armor_penetration_flat = -30
/obj/item/projectile/bullet/saw/ap
damage = 40
armour_penetration_percentage = 100
armor_penetration_percentage = 100
/obj/item/projectile/bullet/saw/incen
damage = 7
armour_penetration_flat = 0
armor_penetration_flat = 0
immolate = 3
/obj/item/projectile/bullet/saw/incen/Move()
@@ -68,7 +68,7 @@
/obj/item/projectile/bullet/sniper
damage = 70
weaken = 10 SECONDS
armour_penetration_flat = 70
armor_penetration_flat = 70
forced_accuracy = TRUE
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE | PASSGIRDER
speed = 0.5
@@ -116,7 +116,7 @@
harmful = FALSE
/obj/item/projectile/bullet/sniper/soporific
armour_penetration_flat = 0
armor_penetration_flat = 0
nodamage = 1
weaken = 0
@@ -143,7 +143,7 @@
projectile_type = /obj/item/projectile/bullet/sniper/haemorrhage
/obj/item/projectile/bullet/sniper/haemorrhage
armour_penetration_flat = 25
armor_penetration_flat = 25
damage = 45
weaken = 6 SECONDS