From 440d9fa3f2b680e4b46c9c2d73ae433937a910d3 Mon Sep 17 00:00:00 2001 From: Kyep Date: Fri, 9 Dec 2016 23:10:28 -0800 Subject: [PATCH 1/2] Fixes xenomorph walls taking damage from disablers --- code/game/objects/effects/aliens.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm index 3c1a16787c0..d7086b53ccc 100644 --- a/code/game/objects/effects/aliens.dm +++ b/code/game/objects/effects/aliens.dm @@ -79,9 +79,12 @@ /obj/structure/alien/resin/bullet_act(obj/item/projectile/Proj) - health -= Proj.damage - ..() - healthcheck() + if(Proj.damage_type != BRUTE && Proj.damage_type != BURN) + ..() + else + health -= Proj.damage + ..() + healthcheck() /obj/structure/alien/resin/ex_act(severity) From 49956eb241be7bf665eaa99dc8b409912c6a3861 Mon Sep 17 00:00:00 2001 From: Kyep Date: Sat, 10 Dec 2016 16:57:52 -0800 Subject: [PATCH 2/2] Tiger request --- code/game/objects/effects/aliens.dm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm index d7086b53ccc..106c451ca09 100644 --- a/code/game/objects/effects/aliens.dm +++ b/code/game/objects/effects/aliens.dm @@ -79,12 +79,10 @@ /obj/structure/alien/resin/bullet_act(obj/item/projectile/Proj) - if(Proj.damage_type != BRUTE && Proj.damage_type != BURN) - ..() - else + if(Proj.damage_type == BRUTE || Proj.damage_type == BURN) health -= Proj.damage - ..() - healthcheck() + ..() + healthcheck() /obj/structure/alien/resin/ex_act(severity)