diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 7a866928289..687032011b1 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -477,9 +477,9 @@ var/list/turret_icons emagged = 1 enabled=0 - sleep(rand(60,600)) - if(!enabled) - enabled=1 + spawn(rand(60,600)) + if(!enabled) + enabled=1 ..() diff --git a/code/game/machinery/turret_control.dm b/code/game/machinery/turret_control.dm index 987d48011d4..4dc36dbd2e3 100644 --- a/code/game/machinery/turret_control.dm +++ b/code/game/machinery/turret_control.dm @@ -73,7 +73,7 @@ return 1 return 0 - + /obj/machinery/turretid/CanUseTopic(mob/user) if(isLocked(user)) return STATUS_CLOSE @@ -107,7 +107,7 @@ return ui_interact(user) - + /obj/machinery/turretid/attack_ghost(mob/user as mob) ui_interact(user) @@ -224,9 +224,9 @@ enabled=0 updateTurrets() - sleep(rand(60,600)) - if(!enabled) - enabled=1 - updateTurrets() + spawn(rand(60,600)) + if(!enabled) + enabled=1 + updateTurrets() ..() diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm index 5fcdefe6215..e1dc0b4108e 100644 --- a/code/game/objects/effects/overlays.dm +++ b/code/game/objects/effects/overlays.dm @@ -51,7 +51,7 @@ /obj/effect/overlay/temp/emp/pulse name = "emp pulse" icon_state = "emp pulse" - duration = 20 + duration = 8 randomdir = 0 /obj/effect/overlay/palmtree_r diff --git a/code/game/objects/empulse.dm b/code/game/objects/empulse.dm index ed5bbadeadd..414874f6ea2 100644 --- a/code/game/objects/empulse.dm +++ b/code/game/objects/empulse.dm @@ -1,4 +1,4 @@ -proc/empulse(turf/epicenter, heavy_range, light_range, log=0) +/proc/empulse(turf/epicenter, heavy_range, light_range, log=0) if(!epicenter) return if(!istype(epicenter, /turf)) diff --git a/code/modules/media/broadcast/transmitters/broadcast.dm b/code/modules/media/broadcast/transmitters/broadcast.dm index 1a7ad15ed1e..55bb10eaf7d 100644 --- a/code/modules/media/broadcast/transmitters/broadcast.dm +++ b/code/modules/media/broadcast/transmitters/broadcast.dm @@ -88,22 +88,6 @@ return screen */ - -/obj/machinery/light_switch/power_change() - if(powered(LIGHT)) - stat &= ~NOPOWER - else - stat |= NOPOWER - - updateicon() - -/obj/machinery/light_switch/emp_act(severity) - if(stat & (BROKEN|NOPOWER)) - ..(severity) - return - power_change() - ..(severity) - /obj/machinery/media/transmitter/broadcast/update_icon() overlays = 0 if(stat & (NOPOWER|BROKEN)) diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index 7841b1e94b8..edfcd01d211 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -142,7 +142,7 @@ emp_act(severity) ..() - reliability -= round(15/severity) + reliability = max(reliability - round(15/severity), 0) //Do not allow it to go negative! update_icon()