diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 33334ffe04d..8d4d4ac2df2 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -338,6 +338,10 @@ die() //the death process :( /obj/machinery/porta_turret/bullet_act(obj/item/projectile/Proj) + + if(Proj.damage_type == HALLOSS) + return + if(on) if(!attacked && !emagged) attacked = 1 @@ -358,7 +362,7 @@ check_records = prob(50) check_weapons = prob(50) check_access = prob(20) // check_access is a pretty big deal, so it's least likely to get turned on - check_anomalies = prob(50) + check_anomalies = prob(50) if(prob(5)) emagged = 1 diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm index 29811e1a18d..cb76c7921a7 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() @@ -376,6 +380,8 @@ bullet_act(var/obj/item/projectile/Proj) + if(Proj.damage_type == HALLOSS) + return take_damage(Proj.damage) ..() return