From adc250cdc5028aee0bacd7fb52a59a58c497b01b Mon Sep 17 00:00:00 2001 From: S34NW <12197162+S34NW@users.noreply.github.com> Date: Fri, 10 Sep 2021 22:11:03 +0100 Subject: [PATCH] we don't need these with the istype checks --- code/modules/projectiles/guns/alien.dm | 2 +- code/modules/projectiles/projectile/beams.dm | 2 +- code/modules/projectiles/projectile/bullets.dm | 1 - code/modules/projectiles/projectile/energy.dm | 1 - code/modules/projectiles/projectile/magic.dm | 1 - code/modules/projectiles/projectile/special.dm | 2 +- 6 files changed, 3 insertions(+), 6 deletions(-) diff --git a/code/modules/projectiles/guns/alien.dm b/code/modules/projectiles/guns/alien.dm index 3c43aea531f..135923c6ef6 100644 --- a/code/modules/projectiles/guns/alien.dm +++ b/code/modules/projectiles/guns/alien.dm @@ -70,7 +70,7 @@ damage = 60 damage_type = BRUTE flag = "bullet" - pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE | PASSFENCE + pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE weaken = 5 stun = 5 diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 6101bbbad55..b8e1348fb43 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -1,7 +1,7 @@ /obj/item/projectile/beam name = "laser" icon_state = "laser" - pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE | PASSFENCE + pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE damage = 20 damage_type = BURN hitsound = 'sound/weapons/sear.ogg' diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 4a0aa63e8c1..027de5c9f54 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -6,7 +6,6 @@ flag = "bullet" hitsound_wall = "ricochet" impact_effect_type = /obj/effect/temp_visual/impact_effect - pass_flags = PASSFENCE /obj/item/projectile/bullet/weakbullet //beanbag, heavy stamina damage name = "beanbag slug" diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index 1969e8d7b3c..dc6f3fdf2da 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -5,7 +5,6 @@ damage_type = BURN flag = "energy" is_reflectable = TRUE - pass_flags = PASSFENCE /obj/item/projectile/energy/electrode name = "electrode" diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index b55383ab927..512f9188606 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -6,7 +6,6 @@ nodamage = 1 armour_penetration = 100 flag = "magic" - pass_flags = PASSFENCE /obj/item/projectile/magic/death name = "bolt of death" diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index 8635360afdb..490878ea74d 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -53,7 +53,7 @@ nodamage = 1 flag = "energy" var/temperature = 300 - pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE | PASSFENCE + pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE /obj/item/projectile/temp/New(loc, shot_temp) ..()