mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 19:47:22 +01:00
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:
co-authored by
PollardTheDragon
parent
3216ab1c00
commit
626eaaeb79
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user