From ae0f60c06b5bcc90bfb946cee90ec954ba0965b3 Mon Sep 17 00:00:00 2001 From: Krausus Date: Sun, 21 Aug 2016 11:12:48 -0400 Subject: [PATCH] Makes girders non-bulletproof Also, minor refactoring --- code/game/objects/structures/girders.dm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index d84e879dbe0..9bca4dc0a75 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -25,7 +25,8 @@ /obj/structure/girder/proc/take_damage(var/amount) health -= amount - if(health < 0) + if(health <= 0) + new /obj/item/stack/sheet/metal(get_turf(src)) qdel(src) /obj/structure/girder/attackby(obj/item/W as obj, mob/user as mob, params) @@ -188,15 +189,10 @@ qdel(src) /obj/structure/girder/bullet_act(var/obj/item/projectile/Proj) - if(istype(Proj, /obj/item/projectile/beam)) - health -= Proj.damage - ..() - if(health <= 0) - new /obj/item/stack/sheet/metal(get_turf(src)) - qdel(src) - if(istype(Proj ,/obj/item/projectile/beam/pulse)) src.ex_act(2) + else + take_damage(Proj.damage) ..() return 0