cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-15 09:03:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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 09:27:52 +05:00
committed by GitHub
parent 3216ab1c00
commit 626eaaeb79
65 changed files with 152 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+2 -2
View File
@@ -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)
code/modules/projectiles/guns/energy/special_eguns.dm
+1 -1
View File
@@ -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)
code/modules/projectiles/guns/projectile/saw.dm
+5 -5
View File
@@ -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()
code/modules/projectiles/guns/projectile/sniper.dm
+3 -3
View File
@@ -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
code/modules/projectiles/projectile/beams.dm
+2 -2
View File
@@ -107,7 +107,7 @@
/obj/item/projectile/beam/disabler/weak
name = "weakened disabler beam"
damage = 15
armour_penetration_flat = -10
armor_penetration_flat = -10
light_color = LIGHT_COLOR_BLUE
/obj/item/projectile/beam/disabler/fake
@@ -252,7 +252,7 @@
name = "instagib laser"
icon_state = "purple_laser"
damage = 200
armour_penetration_percentage = 100
armor_penetration_percentage = 100
impact_effect_type = /obj/effect/temp_visual/impact_effect/purple_laser
light_color = LIGHT_COLOR_PURPLE
code/modules/projectiles/projectile/bullets.dm
+7 -7
View File
@@ -66,26 +66,26 @@
/obj/item/projectile/bullet/armourpiercing
damage = 17
armour_penetration_flat = 10
armor_penetration_flat = 10
/obj/item/projectile/bullet/armourpiercing/wt550
damage = 15
armour_penetration_percentage = 50
armour_penetration_flat = 25
armor_penetration_percentage = 50
armor_penetration_flat = 25
/obj/item/projectile/bullet/pellet
name = "pellet"
damage = 12.5
tile_dropoff = 0.75
tile_dropoff_s = 1.25
armour_penetration_flat = -20
armor_penetration_flat = -20
/obj/item/projectile/bullet/pellet/rubber
name = "rubber pellet"
damage = 3
stamina = 12.5
icon_state = "bullet-r"
armour_penetration_flat = -10
armor_penetration_flat = -10
/obj/item/projectile/bullet/pellet/rubber/on_hit(atom/target, blocked = 0)
. = ..()
@@ -125,11 +125,11 @@
/obj/item/projectile/bullet/midbullet3/hp
damage = 40
armour_penetration_flat = -40
armor_penetration_flat = -40
/obj/item/projectile/bullet/midbullet3/ap
damage = 27
armour_penetration_flat = 40
armor_penetration_flat = 40
/obj/item/projectile/bullet/midbullet3/fire
immolate = 1
code/modules/projectiles/projectile/energy_projectiles.dm
+2 -2
View File
@@ -62,7 +62,7 @@
icon_state = "bluespace"
impact_effect_type = /obj/effect/temp_visual/bsg_kaboom
damage = BSG_BASE_DAMAGE
armour_penetration_flat = 50
armor_penetration_flat = 50
range = 9
knockdown = 4 SECONDS //This is going to knock you off your feet
eyeblur = 10 SECONDS
@@ -133,7 +133,7 @@
damage = 45
damage_type = BURN
flag = "energy"
armour_penetration_flat = 10 // It can have a little armor pen, as a treat. Bigger than it looks, energy armor is often low.
armor_penetration_flat = 10 // It can have a little armor pen, as a treat. Bigger than it looks, energy armor is often low.
shield_buster = TRUE
var/reached_target = FALSE
code/modules/projectiles/projectile/homing_projectiles.dm
+1 -1
View File
@@ -27,7 +27,7 @@
damage = 0
damage_type = OXY
nodamage = 1
armour_penetration_percentage = 100
armor_penetration_percentage = 100
flag = MAGIC
antimagic_flags = MAGIC_RESISTANCE
antimagic_charge_cost = 1
code/modules/projectiles/projectile/magic_projectiles.dm
+1 -1
View File
@@ -4,7 +4,7 @@
damage = 0
damage_type = OXY
nodamage = 1
armour_penetration_percentage = 100
armor_penetration_percentage = 100
flag = MAGIC
antimagic_flags = MAGIC_RESISTANCE
antimagic_charge_cost = 1