mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-01-06 15:32:25 +00:00
Fixed two problem with airlock/APC commit:
- Debugger now sends messages to user instead of usr(whoops) - Can now close emagged door with crowbar so you can take out circuit - Couldn't weld emagged doors - Replacing the circuitry should now be sufficient to fix an emagged door.
This commit is contained in:
@@ -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)
|
||||
@@ -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
|
||||
|
||||
@@ -219,7 +219,7 @@
|
||||
|
||||
/obj/machinery/door/proc/close()
|
||||
if(density) return 1
|
||||
if(operating) return
|
||||
if(operating > 0) return
|
||||
operating = 1
|
||||
|
||||
animate("closing")
|
||||
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user