cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes an ancient bug where door buttons toggling bolts were inversed, causing the first click to do nothing.

Browse Source
This commit is contained in:
PsiOmega
2015-04-30 18:39:24 +02:00
parent 9c8446ea1c
commit 5bbe839092
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/game/machinery/door_control.dm
View File

@@ -1,7 +1,3 @@
#define CONTROL_POD_DOORS 0
#define CONTROL_NORMAL_DOORS 1
#define CONTROL_EMITTERS 2
/obj/machinery/button/remote /obj/machinery/button/remote
name = "remote object control" name = "remote object control"
desc = "It controls objects, remotely." desc = "It controls objects, remotely."
@@ -65,8 +61,8 @@
use_power(5) use_power(5)
icon_state = "doorctrl1" icon_state = "doorctrl1"
trigger()
desiredstate = !desiredstate desiredstate = !desiredstate
trigger()
spawn(15) spawn(15)
update_icon() update_icon()
@@ -173,9 +169,6 @@
icon_state = "launcherbtt" icon_state = "launcherbtt"
/obj/machinery/button/remote/driver/trigger(mob/user as mob) /obj/machinery/button/remote/driver/trigger(mob/user as mob)
if(..())
return
active = 1 active = 1
update_icon() update_icon()

8
code/game/machinery/doors/airlock.dm
View File

@@ -424,7 +424,7 @@ About the new airlock wires panel:
/obj/machinery/door/airlock/proc/set_idscan(var/activate, var/feedback = 0) /obj/machinery/door/airlock/proc/set_idscan(var/activate, var/feedback = 0)
var/message = "" var/message = ""
if(src.isWireCut(AIRLOCK_WIRE_IDSCAN)) if(src.isWireCut(AIRLOCK_WIRE_IDSCAN))
message = "The IdScan wire has been cut - IdScan feature permanently disabled." message = "The IdScan wire is cut - IdScan feature permanently disabled."
else if(activate && src.aiDisabledIdScanner) else if(activate && src.aiDisabledIdScanner)
src.aiDisabledIdScanner = 0 src.aiDisabledIdScanner = 0
message = "IdScan feature has been enabled." message = "IdScan feature has been enabled."
@@ -439,7 +439,7 @@ About the new airlock wires panel:
var/message = "" var/message = ""
// Safeties! We don't need no stinking safeties! // Safeties! We don't need no stinking safeties!
if (src.isWireCut(AIRLOCK_WIRE_SAFETY)) if (src.isWireCut(AIRLOCK_WIRE_SAFETY))
usr << text("The safety wire is cut - Cannot secure the door.") message = text("The safety wire is cut - Cannot enable safeties.")
else if (!activate && src.safe) else if (!activate && src.safe)
safe = 0 safe = 0
else if (activate && !src.safe) else if (activate && !src.safe)
@@ -673,7 +673,7 @@ About the new airlock wires panel:
src.loseBackupPower() src.loseBackupPower()
if("bolts") if("bolts")
if(src.isWireCut(AIRLOCK_WIRE_DOOR_BOLTS)) if(src.isWireCut(AIRLOCK_WIRE_DOOR_BOLTS))
usr << "The door bolt control wire has been cut - Door bolts permanently dropped." usr << "The door bolt control wire is cut - Door bolts permanently dropped."
else if(activate && src.lock()) else if(activate && src.lock())
usr << "The door bolts have been dropped." usr << "The door bolts have been dropped."
else if(!activate && src.unlock()) else if(!activate && src.unlock())
@@ -704,7 +704,7 @@ About the new airlock wires panel:
if("lights") if("lights")
// Bolt lights // Bolt lights
if(src.isWireCut(AIRLOCK_WIRE_LIGHT)) if(src.isWireCut(AIRLOCK_WIRE_LIGHT))
usr << "The bolt lights wire has been cut - The door bolt lights are permanently disabled." usr << "The bolt lights wire is cut - The door bolt lights are permanently disabled."
else if (!activate && src.lights) else if (!activate && src.lights)
lights = 0 lights = 0
usr << "The door bolt lights have been disabled." usr << "The door bolt lights have been disabled."