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

Had an extra arg going into the job selection proc.

Browse Source 
Turned off the new del test on the singularity for now.
Bit of work on the signalers.	
Jetpacks edited to use less fuel.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2341 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
mport2004@gmail.com
2011-10-11 10:00:05 +00:00
parent 46a7143e3a
commit 897a89308f
7 changed files with 52 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
code/modules/assembly/signaler.dm
View File

@@ -24,13 +24,13 @@
activate()
if(!..()) return 0//Cooldown check
if(cooldown > 0) return 0
cooldown = 2
spawn(10)
process_cooldown()
signal()
pulse(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)
// pulse(1)//?
return 1
@@ -67,34 +67,32 @@
Topic(href, href_list)
//..()
if(usr.stat)
..()
if(get_dist(src, usr) > 1)
usr << browse(null, "window=signal")
onclose(usr, "signal")
return
if ((usr.contents.Find(src) || (usr.contents.Find(src.holder) || (in_range(src, usr) && istype(src.loc, /turf)))))
usr.machine = src
if (href_list["freq"])
src.frequency += text2num(href_list["freq"])
src.frequency = round(src.frequency)
src.frequency = min(100, src.frequency)
src.frequency = max(1, src.frequency)
return
if(href_list["code"])
src.code += text2num(href_list["code"])
src.code = round(src.code)
src.code = min(100, src.code)
src.code = max(1, src.code)
if (href_list["freq"])
src.frequency += text2num(href_list["freq"])
src.frequency = round(src.frequency)
src.frequency = min(100, src.frequency)
src.frequency = max(1, src.frequency)
if(href_list["send"])
spawn( 0 )
send_signal()
return
if(href_list["code"])
src.code += text2num(href_list["code"])
src.code = round(src.code)
src.code = min(100, src.code)
src.code = max(1, src.code)
if(href_list["send"])
spawn( 0 )
signal()
if(usr)
attack_self(usr)
// if(href_list["listen"])
// src.listening = text2num(href_list["listen"])
else
usr << browse(null, "window=radio")
return
return
proc/signal()//will have to do for now
@@ -102,6 +100,16 @@
if(!S) continue
if(S == src) continue
if((S.frequency == src.frequency) && (S.code == src.code))
S.pulsed(1)
spawn(0)
S.pulse(0)
return 1
return 0
return 0
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
holder.process_activation(src, 1, 0)
return 1