cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 05:57:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

affected review tweaks

Browse Source
This commit is contained in:
SteelSlayer
2020-09-14 11:38:17 -05:00
parent 23ab463cff
commit 2a70626c78
15 changed files with 99 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/assembly/assembly.dm
+2 -2
View File
@@ -1,7 +1,7 @@
#define WIRE_RECEIVE (1<<0) //Allows pulsed(0) to call Activate()
#define WIRE_RECEIVE (1<<0) //Allows pulse(0) to call Activate()
#define WIRE_PULSE (1<<1) //Allows pulse(0) to act on the holder
#define WIRE_PULSE_SPECIAL (1<<2) //Allows pulse(0) to act on the holders special assembly
#define WIRE_RADIO_RECEIVE (1<<3) //Allows pulsed(1) to call Activate()
#define WIRE_RADIO_RECEIVE (1<<3) //Allows pulse(1) to call Activate()
#define WIRE_RADIO_PULSE (1<<4) //Allows pulse(1) to send a radio message
/obj/item/assembly
code/modules/power/apc.dm
+14
View File
@@ -1368,4 +1368,18 @@
L.update(FALSE)
CHECK_TICK
/obj/machinery/power/apc/proc/relock_callback()
locked = TRUE
updateDialog()
/obj/machinery/power/apc/proc/check_main_power_callback()
if(!wires.is_cut(WIRE_MAIN_POWER1) && !wires.is_cut(WIRE_MAIN_POWER2))
shorted = FALSE
updateDialog()
/obj/machinery/power/apc/proc/check_ai_control_callback()
if(!wires.is_cut(WIRE_AI_CONTROL))
aidisabled = FALSE
updateDialog()
#undef APC_UPDATE_ICON_COOLDOWN