This commit is contained in:
Katherine Kiefer
2024-03-09 21:16:02 +11:00
parent 94000d357f
commit fd29f9c902
22 changed files with 271 additions and 214 deletions
+3
View File
@@ -139,6 +139,9 @@ Class Procs:
var/market_verb = "Customer"
var/payment_department = ACCOUNT_ENG
///Boolean on whether this machines interact with atmos
var/atmos_processing = FALSE
/obj/machinery/Initialize(mapload)
if(!armor)
armor = list(MELEE = 25, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 70)
@@ -73,11 +73,11 @@
/obj/machinery/air_sensor/Initialize(mapload)
. = ..()
SSair.atmos_machinery += src
SSair.start_processing_machine(src)
set_frequency(frequency)
/obj/machinery/air_sensor/Destroy()
SSair.atmos_machinery -= src
SSair.stop_processing_machine(src)
SSradio.remove_object(src, frequency)
return ..()
+1 -1
View File
@@ -222,7 +222,7 @@
usr.visible_message("<span class='notice'>[usr] switches [on ? "on" : "off"] \the [src].</span>", "<span class='notice'>You switch [on ? "on" : "off"] \the [src].</span>")
update_icon()
if (on)
SSair.atmos_machinery += src
SSair.start_processing_machine(src)
. = TRUE
if("mode")
setMode = params["mode"]
-13
View File
@@ -9,14 +9,6 @@ GLOBAL_LIST(topic_status_cache)
//So subsystems globals exist, but are not initialised
/world/New()
var/debug_server = world.GetConfig("env", "AUXTOOLS_DEBUG_DLL")
if (debug_server)
call(debug_server, "auxtools_init")()
enable_debugging()
AUXTOOLS_CHECK(AUXMOS)
#ifdef EXTOOLS_REFERENCE_TRACKING
enable_reference_tracking()
#endif
world.Profile(PROFILE_START)
log_world("World loaded at [TIME_STAMP("hh:mm:ss", FALSE)]!")
@@ -274,15 +266,10 @@ GLOBAL_LIST(topic_status_cache)
log_world("World rebooted at [TIME_STAMP("hh:mm:ss", FALSE)]")
shutdown_logging() // Past this point, no logging procs can be used, at risk of data loss.
AUXTOOLS_SHUTDOWN(AUXMOS)
..()
/world/Del()
shutdown_logging() // makes sure the thread is closed before end, else we terminate
AUXTOOLS_SHUTDOWN(AUXMOS)
var/debug_server = world.GetConfig("env", "AUXTOOLS_DEBUG_DLL")
if (debug_server)
call(debug_server, "auxtools_shutdown")()
..()
/world/proc/update_status()