This commit is contained in:
kevinz000
2018-12-07 04:59:06 -08:00
parent c2c688c4c8
commit fba5b39cab
4 changed files with 142 additions and 144 deletions

View File

@@ -77,7 +77,7 @@ SUBSYSTEM_DEF(atoms)
var/start_tick = world.time
var/result = A.initialize(arglist(arguments))
var/result = A.Initialize(arglist(arguments))
if(start_tick != world.time)
BadInitializeCalls[the_type] |= BAD_INIT_SLEPT

View File

@@ -14,14 +14,14 @@
//Simple variable to prevent me from doing attack_hand in both this and the child computer
var/zone = "This computer is working on a wireless range, the range is currently limited to 25 meters."
initialize()
/obj/machinery/computer/area_atmos/Initialize()
. = ..()
scanscrubbers()
attack_ai(var/mob/user as mob)
/obj/machinery/computer/area_atmos/attack_ai(var/mob/user as mob)
return src.attack_hand(user)
attack_hand(var/mob/user as mob)
/obj/machinery/computer/area_atmos/attack_hand(var/mob/user as mob)
if(..(user))
return
src.add_fingerprint(usr)
@@ -91,7 +91,7 @@
user << browse("[dat]", "window=miningshuttle;size=400x400")
status = ""
Topic(href, href_list)
/obj/machinery/computer/area_atmos/Topic(href, href_list)
if(..())
return
usr.set_machine(src)
@@ -113,13 +113,12 @@
scrubber.on = text2num(href_list["toggle"])
scrubber.update_icon()
proc/validscrubber( var/obj/machinery/portable_atmospherics/powered/scrubber/huge/scrubber as obj )
/obj/machinery/computer/area_atmos/proc/validscrubber(obj/machinery/portable_atmospherics/powered/scrubber/huge/scrubber as obj)
if(!isobj(scrubber) || get_dist(scrubber.loc, src.loc) > src.range || scrubber.loc.z != src.loc.z)
return 0
return FALSE
return TRUE
return 1
proc/scanscrubbers()
/obj/machinery/computer/area_atmos/proc/scanscrubbers()
connectedscrubbers = new()
var/found = 0
@@ -131,8 +130,7 @@
if(!found)
status = "ERROR: No scrubber found!"
src.updateUsrDialog()
updateUsrDialog()
/obj/machinery/computer/area_atmos/area
zone = "This computer is working in a wired network limited to this area."

View File

@@ -116,7 +116,7 @@
var/last_transmission
var/datum/radio_frequency/radio_connection
initialize()
/obj/item/radio/integrated/signal/Initialize()
if(!radio_controller)
return
@@ -125,12 +125,12 @@
set_frequency(frequency)
proc/set_frequency(new_frequency)
/obj/item/radio/integrated/signal/proc/set_frequency(new_frequency)
radio_controller.remove_object(src, frequency)
frequency = new_frequency
radio_connection = radio_controller.add_object(src, frequency)
proc/send_signal(message="ACTIVATE")
/obj/item/radio/integrated/signal/proc/send_signal(message="ACTIVATE")
if(last_transmission && world.time < (last_transmission + 5))
return
@@ -147,8 +147,6 @@
radio_connection.post_signal(src, signal)
return
/obj/item/radio/integrated/signal/Destroy()
if(radio_controller)
radio_controller.remove_object(src, frequency)

View File

@@ -213,7 +213,8 @@
takes_underlays = 1
blocks_air = 1 //I'd make these unsimulated but it just fucks with so much stuff so many other places.
initialize()
/turf/simulated/shuttle/plating/carry/Initialize()
. = ..()
icon_state = "carry_ingame"
/turf/simulated/shuttle/plating/airless/carry
@@ -223,7 +224,8 @@
takes_underlays = 1
blocks_air = 1
initialize()
/turf/simulated/shuttle/plating/airless/carry/Initialize()
. = ..()
icon_state = "carry_ingame"
/turf/simulated/shuttle/plating/skipjack //Skipjack plating