diff --git a/code/game/gamemodes/handofgod/structures.dm b/code/game/gamemodes/handofgod/structures.dm index c10ef417533..9564bd75fd0 100644 --- a/code/game/gamemodes/handofgod/structures.dm +++ b/code/game/gamemodes/handofgod/structures.dm @@ -492,6 +492,7 @@ active_state = "" off_state = "" faction = null + emp_vunerable = 0 var/side = "neutral" /obj/machinery/porta_turret/defensepylon_internal_turret/setup() diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 38c5b09d361..6043a7d3055 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -21,6 +21,8 @@ var/active_state = "Taser" // "Taser"/"Laser/"Bullet" ,blue/red/no glow on active turret var/off_state = "Off" + var/emp_vunerable = 1 // Can be empd + var/scan_range = 7 var/atom/base = null //for turrets inside other objects @@ -394,7 +396,7 @@ /obj/machinery/porta_turret/emp_act(severity) - if(on) + if(on && emp_vunerable) //if the turret is on, the EMP no matter how severe disables the turret for a while //and scrambles its settings, with a slight chance of having an emag effect check_records = pick(0, 1) @@ -966,6 +968,7 @@ base_icon_state = "syndie" active_state = "Bullet" faction = "syndicate" + emp_vunerable = 0 /obj/machinery/porta_turret/syndicate/setup() return