diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index dabdebb380..19a1fc8a73 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -264,7 +264,7 @@ Status: []
"}, if(!anchored) icon_state = "turretCover" return - + ..() if(stat & BROKEN) icon_state = "[lasercolor]destroyed_target_prism" @@ -362,6 +362,10 @@ Status: []
"}, /obj/machinery/porta_turret/bullet_act(var/obj/item/projectile/Proj) + + if(Proj.damage_type == HALLOSS) + return + if(on) if(!attacked && !emagged) attacked = 1 diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm index af5b67c16d..04957c20aa 100644 --- a/code/game/machinery/turrets.dm +++ b/code/game/machinery/turrets.dm @@ -89,6 +89,8 @@ return /obj/machinery/turret/bullet_act(var/obj/item/projectile/Proj) + if(Proj.damage_type == HALLOSS) + return take_damage(Proj.damage) ..() return @@ -297,6 +299,8 @@ popping = 0 /obj/machinery/turret/bullet_act(var/obj/item/projectile/Proj) + if(Proj.damage_type == HALLOSS) + return src.health -= Proj.damage ..() if(prob(45) && Proj.damage > 0) src.spark_system.start() @@ -512,6 +516,8 @@ bullet_act(var/obj/item/projectile/Proj) + if(Proj.damage_type == HALLOSS) + return take_damage(Proj.damage) ..() return