From 49403abf1f2ad771f1a6a0fcb51c1b1f49b59eed Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 13 Nov 2022 13:55:03 -0500 Subject: [PATCH] autocall revert --- code/controllers/shuttle_controller.dm | 8 ++++---- code/datums/gamemode/dynamic/dynamic.dm | 4 ---- code/game/machinery/computer/communications.dm | 4 ++-- code/modules/mob/living/silicon/ai/death.dm | 2 +- vgstation13.dme | 2 +- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/code/controllers/shuttle_controller.dm b/code/controllers/shuttle_controller.dm index ba9e5658f7db..2b3e7b11cd57 100644 --- a/code/controllers/shuttle_controller.dm +++ b/code/controllers/shuttle_controller.dm @@ -423,7 +423,7 @@ var/global/datum/emergency_shuttle/emergency_shuttle else return 1 -/proc/shuttle_autocall(var/reason = "None") +/proc/shuttle_autocall() if (emergency_shuttle.departed) return @@ -431,7 +431,7 @@ var/global/datum/emergency_shuttle/emergency_shuttle return emergency_shuttle.incall(2) - log_game("[reason]. Shuttle called.") - message_admins("[reason]. Shuttle called.", 1) - captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes. Justification: [reason]") + log_game("All the AIs, comm consoles and boards are destroyed. Shuttle called.") + message_admins("All the AIs, comm consoles and boards are destroyed. Shuttle called.", 1) + captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.") world << sound('sound/AI/shuttlecalled.ogg') diff --git a/code/datums/gamemode/dynamic/dynamic.dm b/code/datums/gamemode/dynamic/dynamic.dm index 6e767feb83f8..6d84c458901e 100644 --- a/code/datums/gamemode/dynamic/dynamic.dm +++ b/code/datums/gamemode/dynamic/dynamic.dm @@ -47,7 +47,6 @@ var/stacking_limit = 90 var/list/dead_players = list() var/list/list_observers = list() var/last_time_of_population = 0 - var/last_time_of_late_shuttle_call = 0 var/latejoin_injection_cooldown = 0 var/midround_injection_cooldown = 0 @@ -656,9 +655,6 @@ var/stacking_limit = 90 last_time_of_population = world.time else if(last_time_of_population && world.time - last_time_of_population > 1 HOURS) //if enough time has passed without it ticker.station_nolife_cinematic() - if(world.time > (7 HOURS + 40 MINUTES) && world.time - last_time_of_late_shuttle_call > 1 HOURS && emergency_shuttle.direction == 0) // 8 hour work shift, with time for shuttle to arrive and leave. If recalled, do every hour - shuttle_autocall("Shift due to end") - last_time_of_late_shuttle_call = world.time /datum/gamemode/dynamic/proc/GetInjectionChance() var/chance = 0 diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 55d238f31901..b7eb9bfbd433 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -726,7 +726,7 @@ var/list/shuttle_log = list() if(ticker.mode.name == "revolution" || ticker.mode.name == "AI malfunction") return ..() - shuttle_autocall("All the AIs, comm consoles and boards are destroyed") + shuttle_autocall() ..() // -- Blob defcon 1 things @@ -828,6 +828,6 @@ var/list/shuttle_log = list() if(ticker.mode.name == "revolution" || ticker.mode.name == "AI malfunction") return ..() - shuttle_autocall("All the AIs, comm consoles and boards are destroyed") + shuttle_autocall() ..() diff --git a/code/modules/mob/living/silicon/ai/death.dm b/code/modules/mob/living/silicon/ai/death.dm index d4158f0f03ba..ec3c126d5bd7 100644 --- a/code/modules/mob/living/silicon/ai/death.dm +++ b/code/modules/mob/living/silicon/ai/death.dm @@ -42,7 +42,7 @@ callshuttle = 0 if(callshuttle == 3) //if all three conditions are met - shuttle_autocall("All the AIs, comm consoles and boards are destroyed") + shuttle_autocall() if(explosive && !gibbed && !istype(loc, /obj/machinery/power/apc)) visible_message("[name] begins to spark violently!") diff --git a/vgstation13.dme b/vgstation13.dme index c38c0bba9b4b..c2998e2c783d 100644 --- a/vgstation13.dme +++ b/vgstation13.dme @@ -2523,8 +2523,8 @@ #include "code\modules\research\xenoarchaeology\artifact\artifact_hoverpod.dm" #include "code\modules\research\xenoarchaeology\artifact\artifact_losetta.dm" #include "code\modules\research\xenoarchaeology\artifact\artifact_replicator.dm" -#include "code\modules\research\xenoarchaeology\artifact\artifact_vendor.dm" #include "code\modules\research\xenoarchaeology\artifact\artifact_unknown.dm" +#include "code\modules\research\xenoarchaeology\artifact\artifact_vendor.dm" #include "code\modules\research\xenoarchaeology\artifact\effect.dm" #include "code\modules\research\xenoarchaeology\artifact\trigger.dm" #include "code\modules\research\xenoarchaeology\artifact\effects\unknown_affect_cold.dm"