diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 0bc9dfdd50..e8d4078593 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1169,7 +1169,7 @@ About the new airlock wires panel: return src.add_fingerprint(user) - if((istype(C, /obj/item/weapon/weldingtool) && !( src.operating ) && src.density)) + if((istype(C, /obj/item/weapon/weldingtool) && !( src.operating > 0 ) && src.density)) var/obj/item/weapon/weldingtool/W = C if(W.remove_fuel(0,user)) if(!src.welded) @@ -1198,7 +1198,7 @@ About the new airlock wires panel: beingcrowbarred = 1 //derp, Agouri else beingcrowbarred = 0 - if( beingcrowbarred && (density && welded && operating != 1 && src.p_open && (!src.arePowerSystemsOn() || stat & NOPOWER) && !src.locked) ) + if( beingcrowbarred && (operating == -1 || density && welded && operating != 1 && src.p_open && (!src.arePowerSystemsOn() || stat & NOPOWER) && !src.locked) ) playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to remove electronics from the airlock assembly.") if(do_after(user,40)) @@ -1245,6 +1245,7 @@ About the new airlock wires panel: ae.loc = src.loc if(operating == -1) ae.icon_state = "door_electronics_smoked" + operating = 0 del(src) return @@ -1252,7 +1253,7 @@ About the new airlock wires panel: user << "\blue The airlock's motors resist your efforts to force it." else if(locked) user << "\blue The airlock's bolts prevent it from being forced." - else if( !welded && operating != 1 ) + else if( !welded && !operating ) if(density) if(beingcrowbarred == 0) //being fireaxe'd var/obj/item/weapon/twohanded/fireaxe/F = C diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 465af474e6..9ac8ad6c7f 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -219,7 +219,7 @@ /obj/machinery/door/proc/close() if(density) return 1 - if(operating) return + if(operating > 0) return operating = 1 animate("closing") diff --git a/code/game/objects/items/devices/debugger.dm b/code/game/objects/items/devices/debugger.dm index d90edfa1ba..0b1d8c3811 100644 --- a/code/game/objects/items/devices/debugger.dm +++ b/code/game/objects/items/devices/debugger.dm @@ -5,9 +5,10 @@ */ /obj/item/device/debugger - name = "multitool" - desc = "Used for pulsing wires to test which to cut. Not recommended by doctors." - icon_state = "multitool" + icon = 'icon/obj/hacktool.dmi' + name = "debugger" + desc = "Used to debug electronic equipment." + icon_state = "hacktool-g" flags = FPRINT | TABLEPASS| CONDUCT force = 5.0 w_class = 2.0 @@ -24,21 +25,21 @@ if(istype(O, /obj/machinery/power/apc)) var/obj/machinery/power/apc/A = O if(A.emagged || A.malfhack) - usr << "\red There is a software error with the device." + user << "\red There is a software error with the device." else - usr << "\blue The device's software appears to be fine." + user << "\blue The device's software appears to be fine." return 1 if(istype(O, /obj/machinery/door)) var/obj/machinery/door/D = O if(D.operating == -1) - usr << "\red There is a software error with the device." + user << "\red There is a software error with the device." else - usr << "\blue The device's software appears to be fine." + user << "\blue The device's software appears to be fine." return 1 else if(istype(O, /obj/machinery)) var/obj/machinery/A = O if(A.emagged) - usr << "\red There is a software error with the device." + user << "\red There is a software error with the device." else - usr << "\blue The device's software appears to be fine." + user << "\blue The device's software appears to be fine." return 1 \ No newline at end of file diff --git a/code/modules/events/organ_failure.dm b/code/modules/events/organ_failure.dm index 2a6b0b6a37..6160523f0b 100644 --- a/code/modules/events/organ_failure.dm +++ b/code/modules/events/organ_failure.dm @@ -2,7 +2,7 @@ datum/event/organ_failure var/severity = 1 datum/event/organ_failure/setup() - announceWhen = rand(0, 3000) + announceWhen = rand(0, 300) endWhen = announceWhen + 1 severity = rand(1, 3) diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm index 18911c6181..d9cca33e72 100644 --- a/code/modules/events/radiation_storm.dm +++ b/code/modules/events/radiation_storm.dm @@ -12,7 +12,7 @@ sleep(200) - command_alert("The station has entered the radiation belt. Please report to medbay if you experience any unusual symptoms.", "Anomaly Alert") + command_alert("The station has entered the radiation belt. Please remain in a sheltered area until we have passed the radiation belt.", "Anomaly Alert") for(var/i = 0, i < 10, i++) for(var/mob/living/carbon/human/H in living_mob_list) var/turf/T = get_turf(H) @@ -42,4 +42,4 @@ sleep(50) - command_alert("The station has passed the radiation belt", "Anomaly Alert") \ No newline at end of file + command_alert("The station has passed the radiation belt. Please report to medbay if you experience any unusual symptoms.", "Anomaly Alert") \ No newline at end of file diff --git a/code/modules/events/wallrot.dm b/code/modules/events/wallrot.dm index 02e33c52d7..13da0842b0 100644 --- a/code/modules/events/wallrot.dm +++ b/code/modules/events/wallrot.dm @@ -5,7 +5,7 @@ datum/event/wallrot var/severity = 1 datum/event/wallrot/setup() - announceWhen = rand(0, 3000) + announceWhen = rand(0, 300) endWhen = announceWhen + 1 severity = rand(5, 10)