Scopes updates all merged and stuff

A lot of these will probably get edited again
This commit is contained in:
SoundScopes
2015-05-14 21:02:12 +01:00
parent 93e54b408b
commit ff68c9e1f3
61 changed files with 1914 additions and 1034 deletions
+1
View File
@@ -16,6 +16,7 @@
var/obj/item/device/assembly_holder/holder = null
var/cooldown = 0//To prevent spam
var/wires = WIRE_RECEIVE | WIRE_PULSE
var/datum/wires/connected = null // currently only used by timer/signaler
var/const/WIRE_RECEIVE = 1 //Allows Pulsed(0) to call Activate()
var/const/WIRE_PULSE = 2 //Allows Pulse(0) to act on the holder
+4 -7
View File
@@ -118,14 +118,11 @@
pulse(var/radio = 0)
if(istype(src.loc, /obj/machinery/door/airlock) && src.airlock_wire && src.wires)
var/obj/machinery/door/airlock/A = src.loc
A.pulse(src.airlock_wire)
else if(holder)
holder.process_activation(src, 1, 0)
if(src.connected && src.wires)
connected.Pulse(src)
else
..(radio)
return 1
return ..(radio)
receive_signal(datum/signal/signal)