From 904efa322fda9e0f4c93b7cd36a0a19ed82b0c39 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Thu, 30 Apr 2015 17:55:11 +0200 Subject: [PATCH] Breaks up the remote door control button into subtypes, depending on what is remotely controlled. Also ensures that the door button respects cut wires, etc. --- code/game/machinery/door_control.dm | 160 +++++++++++-------- code/game/machinery/doors/airlock.dm | 44 +++-- code/game/objects/items/weapons/cards_ids.dm | 2 +- 3 files changed, 122 insertions(+), 84 deletions(-) diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index 928dda2541..30eff9661d 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -2,26 +2,13 @@ #define CONTROL_NORMAL_DOORS 1 #define CONTROL_EMITTERS 2 -/obj/machinery/door_control - name = "remote door-control" - desc = "It controls doors, remotely." +/obj/machinery/button/remote + name = "remote object control" + desc = "It controls objects, remotely." icon = 'icons/obj/stationobjs.dmi' icon_state = "doorctrl0" - desc = "A remote control-switch for a door." power_channel = ENVIRON - var/id = null - var/normaldoorcontrol = CONTROL_POD_DOORS - var/desiredstate = 0 // Zero is closed, 1 is open. - var/specialfunctions = 1 - /* - Bitflag, 1= open - 2= idscan, - 4= bolts - 8= shock - 16= door safties - - */ - + var/desiredstate = 0 var/exposedwires = 0 var/wires = 3 /* @@ -34,14 +21,13 @@ idle_power_usage = 2 active_power_usage = 4 - -/obj/machinery/door_control/attack_ai(mob/user as mob) +/obj/machinery/button/remote/attack_ai(mob/user as mob) if(wires & 2) return src.attack_hand(user) else user << "Error, no route to host." -/obj/machinery/door_control/attackby(obj/item/weapon/W, mob/user as mob) +/obj/machinery/button/remote/attackby(obj/item/weapon/W, mob/user as mob) /* For later implementation if (istype(W, /obj/item/weapon/screwdriver)) { @@ -64,7 +50,56 @@ playsound(src.loc, "sparks", 100, 1) return src.attack_hand(user) -/obj/machinery/door_control/proc/handle_door() +/obj/machinery/button/remote/attack_hand(mob/user as mob) + if(..()) + return + + src.add_fingerprint(user) + if(stat & (NOPOWER|BROKEN)) + return + + if(!allowed(user) && (wires & 1)) + user << "Access Denied" + flick("doorctrl-denied",src) + return + + use_power(5) + icon_state = "doorctrl1" + trigger() + desiredstate = !desiredstate + spawn(15) + update_icon() + +/obj/machinery/button/remote/proc/trigger() + return + +/obj/machinery/button/remote/power_change() + ..() + update_icon() + +/obj/machinery/button/remote/update_icon() + if(stat & NOPOWER) + icon_state = "doorctrl-p" + else + icon_state = "doorctrl0" + +/* + Airlock remote control +*/ +/obj/machinery/button/remote/airlock + name = "remote door-control" + desc = "It controls doors, remotely." + + var/specialfunctions = 1 + /* + Bitflag, 1= open + 2= idscan, + 4= bolts + 8= shock + 16= door safties + */ + +/obj/machinery/button/remote/airlock/trigger() for(var/obj/machinery/door/airlock/D in world) if(D.id_tag == src.id) if(specialfunctions & OPEN) @@ -78,24 +113,31 @@ return if(desiredstate == 1) if(specialfunctions & IDSCAN) - D.aiDisabledIdScanner = 1 + D.set_idscan(0) if(specialfunctions & BOLTS) D.lock() if(specialfunctions & SHOCK) D.electrify(-1) if(specialfunctions & SAFE) - D.safe = 0 + D.set_safeties(0) else if(specialfunctions & IDSCAN) - D.aiDisabledIdScanner = 0 + D.set_idscan(1) if(specialfunctions & BOLTS) D.unlock() if(specialfunctions & SHOCK) D.electrify(0) if(specialfunctions & SAFE) - D.safe = 1 + D.set_safeties(1) -/obj/machinery/door_control/proc/handle_pod() +/* + Blast door remote control +*/ +/obj/machinery/button/remote/blast_door + name = "remote blast door-control" + desc = "It controls blast doors, remotely." + +/obj/machinery/button/remote/blast_door/trigger() for(var/obj/machinery/door/blast/M in world) if(M.id == src.id) if(M.density) @@ -107,59 +149,35 @@ M.close() return -/obj/machinery/door_control/proc/handle_emitters(mob/user as mob) +/* + Emitter remote control +*/ +/obj/machinery/button/remote/emitter + name = "remote emitter control" + desc = "It controls emitters, remotely." + +/obj/machinery/button/remote/emitter/trigger(mob/user as mob) for(var/obj/machinery/power/emitter/E in world) if(E.id == src.id) spawn(0) E.activate(user) return -/obj/machinery/door_control/attack_hand(mob/user as mob) - src.add_fingerprint(user) - if(stat & (NOPOWER|BROKEN)) - return - - if(!allowed(user) && (wires & 1)) - user << "\red Access Denied" - flick("doorctrl-denied",src) - return - - use_power(5) - icon_state = "doorctrl1" - add_fingerprint(user) - - switch(normaldoorcontrol) - if(CONTROL_NORMAL_DOORS) - handle_door() - if(CONTROL_POD_DOORS) - handle_pod() - if(CONTROL_EMITTERS) - handle_emitters(user) - - desiredstate = !desiredstate - spawn(15) - if(!(stat & NOPOWER)) - icon_state = "doorctrl0" - -/obj/machinery/door_control/power_change() - ..() - if(stat & NOPOWER) - icon_state = "doorctrl-p" - else - icon_state = "doorctrl0" - -/obj/machinery/button/driver +/* + Mass driver remote control +*/ +/obj/machinery/button/remote/driver name = "mass driver button" desc = "A remote control switch for a mass driver." + icon = 'icons/obj/objects.dmi' + icon_state = "launcherbtt" -/obj/machinery/button/driver/attack_hand(mob/user as mob) +/obj/machinery/button/remote/driver/trigger(mob/user as mob) if(..()) return - use_power(5) - active = 1 - icon_state = "launcheract" + update_icon() for(var/obj/machinery/door/blast/M in machines) if (M.id == src.id) @@ -177,11 +195,17 @@ for(var/obj/machinery/door/blast/M in machines) if (M.id == src.id) - spawn( 0 ) + spawn(0) M.close() return icon_state = "launcherbtt" - active = 0 + update_icon() return + +/obj/machinery/button/remote/driver/update_icon() + if(!active || (stat & NOPOWER)) + icon_state = "launcherbtt" + else + icon_state = "launcheract" diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 08c9c89ccc..86d1fedb04 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -421,6 +421,33 @@ About the new airlock wires panel: if(feedback && message) usr << message +/obj/machinery/door/airlock/proc/set_idscan(var/activate, var/feedback = 0) + var/message = "" + if(src.isWireCut(AIRLOCK_WIRE_IDSCAN)) + message = "The IdScan wire has been cut - IdScan feature permanently disabled." + else if(activate && src.aiDisabledIdScanner) + src.aiDisabledIdScanner = 0 + message = "IdScan feature has been enabled." + else if(!activate && !src.aiDisabledIdScanner) + src.aiDisabledIdScanner = 1 + message = "IdScan feature has been disabled." + + if(feedback && message) + usr << message + +/obj/machinery/door/airlock/proc/set_safeties(var/activate, var/feedback = 0) + var/message = "" + // Safeties! We don't need no stinking safeties! + if (src.isWireCut(AIRLOCK_WIRE_SAFETY)) + usr << text("The safety wire is cut - Cannot secure the door.") + else if (!activate && src.safe) + safe = 0 + else if (activate && !src.safe) + safe = 1 + + if(feedback && message) + usr << message + // shock user with probability prb (if all connections & power are working) // returns 1 if shocked, 0 otherwise // The preceding comment was borrowed from the grille's shock script @@ -637,14 +664,7 @@ About the new airlock wires panel: var/activate = text2num(href_list["activate"]) switch (href_list["command"]) if("idscan") - if(src.isWireCut(AIRLOCK_WIRE_IDSCAN)) - usr << "The IdScan wire has been cut - IdScan feature permanently disabled." - else if(activate && src.aiDisabledIdScanner) - src.aiDisabledIdScanner = 0 - usr << "IdScan feature has been enabled." - else if(!activate && !src.aiDisabledIdScanner) - src.aiDisabledIdScanner = 1 - usr << "IdScan feature has been disabled." + set_idscan(activate, 1) if("main_power") if(!main_power_lost_until) src.loseMainPower() @@ -672,13 +692,7 @@ About the new airlock wires panel: else if(!activate && !density) close() if("safeties") - // Safeties! We don't need no stinking safeties! - if (src.isWireCut(AIRLOCK_WIRE_SAFETY)) - usr << text("The safety wire is cut - Cannot secure the door.") - else if (activate && src.safe) - safe = 0 - else if (!activate && !src.safe) - safe = 1 + set_safeties(!activate, 1) if("timing") // Door speed control if(src.isWireCut(AIRLOCK_WIRE_SPEED)) diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index e0ea864eee..92d97e3d5d 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -92,7 +92,7 @@ /obj/machinery/shield_gen, /obj/machinery/clonepod, /obj/machinery/deployable, - /obj/machinery/door_control, + /obj/machinery/button/remote, /obj/machinery/porta_turret, /obj/machinery/shieldgen, /obj/machinery/turretid,