diff --git a/code/controllers/subsystems/master_controller.dm b/code/controllers/subsystems/master_controller.dm index 8b3a39e536b..299cdfe68dd 100644 --- a/code/controllers/subsystems/master_controller.dm +++ b/code/controllers/subsystems/master_controller.dm @@ -1,10 +1,6 @@ -//simplified MC that is designed to fail when procs 'break'. When it fails it's just replaced with a new one. -//It ensures master_controller.process() is never doubled up by killing the MC (hence terminating any of its sleeping procs) -//WIP, needs lots of work still - -// -// TODO - This will be completely replaced by master.dm in time. -// +// KILL THIS FILE WHENEVER POSSIBLE, ONLY HERE BECAUSE LEGACY +SUBSYSTEM_DEF(mastercontroller) + name = "Master Controller System" var/global/datum/controller/game_controller/master_controller //Set in world.New() diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm index 23d50969d60..6a7350b5363 100644 --- a/code/controllers/subsystems/ticker.dm +++ b/code/controllers/subsystems/ticker.dm @@ -306,15 +306,15 @@ SUBSYSTEM_DEF(ticker) mode.process() -// emergency_shuttle.process() //handled in scheduler +// SSemergencyshuttle.process() //handled in scheduler var/game_finished = 0 var/mode_finished = 0 if (config_legacy.continous_rounds) - game_finished = (emergency_shuttle.returned() || mode.station_was_nuked) + game_finished = (SSemergencyshuttle.returned() || mode.station_was_nuked) mode_finished = (!post_game && mode.check_finished()) else - game_finished = (mode.check_finished() || (emergency_shuttle.returned() && emergency_shuttle.evac == 1)) || universe_has_ended + game_finished = (mode.check_finished() || (SSemergencyshuttle.returned() && SSemergencyshuttle.evac == 1)) || universe_has_ended mode_finished = game_finished if(!mode.explosion_in_progress && game_finished && (mode_finished || post_game)) @@ -376,7 +376,7 @@ SUBSYSTEM_DEF(ticker) if(Player.mind && !isnewplayer(Player)) if(Player.stat != DEAD) var/turf/playerTurf = get_turf(Player) - if(emergency_shuttle.departed && emergency_shuttle.evac) + if(SSemergencyshuttle.departed && SSemergencyshuttle.evac) if(isNotAdminLevel(playerTurf.z)) Player << "You survived the round, but remained on [station_name()] as [Player.real_name]." else diff --git a/code/game/gamemodes/cult/narsie.dm b/code/game/gamemodes/cult/narsie.dm index 6d8785f95de..65a16839391 100644 --- a/code/game/gamemodes/cult/narsie.dm +++ b/code/game/gamemodes/cult/narsie.dm @@ -55,8 +55,8 @@ var/global/list/narsie_list = list() spawn(10 SECONDS) if(emergency_shuttle) - emergency_shuttle.call_evac() - emergency_shuttle.launch_time = 0 // Cannot recall + SSemergencyshuttle.call_evac() + SSemergencyshuttle.launch_time = 0 // Cannot recall /obj/singularity/narsie/process() eat() diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index e49856bb677..28676c3bc63 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -213,8 +213,8 @@ var/list/sacrificed = list() spawn(10 SECONDS) if(emergency_shuttle) - emergency_shuttle.call_evac() - emergency_shuttle.launch_time = 0 // Cannot recall + SSemergencyshuttle.call_evac() + SSemergencyshuttle.launch_time = 0 // Cannot recall log_and_message_admins_many(cultists, "summoned the end of days.") // new /obj/singularity/narsie/large(src.loc) diff --git a/code/game/gamemodes/endgame/supermatter_cascade/universe.dm b/code/game/gamemodes/endgame/supermatter_cascade/universe.dm index 0abf98e1f18..3b85c25223b 100644 --- a/code/game/gamemodes/endgame/supermatter_cascade/universe.dm +++ b/code/game/gamemodes/endgame/supermatter_cascade/universe.dm @@ -44,9 +44,9 @@ var/global/universe_has_ended = 0 for(var/mob/M in player_list) M.flash_eyes() - if(emergency_shuttle.can_recall()) + if(SSemergencyshuttle.can_recall()) priority_announcement.Announce("The emergency shuttle has returned due to bluespace distortion.") - emergency_shuttle.recall() + SSemergencyshuttle.recall() AreaSet() MiscSet() diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 7e0986b5202..cd3f481c5f7 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -210,7 +210,7 @@ var/global/list/additional_antag_types = list() latejoin_templates |= antag if(emergency_shuttle && auto_recall_shuttle) - emergency_shuttle.auto_recall = 1 + SSemergencyshuttle.auto_recall = 1 feedback_set_details("round_start","[time2text(world.realtime)]") if(SSticker && SSticker.mode) @@ -261,14 +261,14 @@ var/global/list/additional_antag_types = list() command_announcement.Announce("The presence of [pick(reasons)] in the region is tying up all available local emergency resources; emergency response teams cannot be called at this time, and post-evacuation recovery efforts will be substantially delayed.","Emergency Transmission") /datum/game_mode/proc/check_finished() - if(emergency_shuttle.returned() || station_was_nuked) + if(SSemergencyshuttle.returned() || station_was_nuked) return 1 if(end_on_antag_death && antag_templates && antag_templates.len) for(var/datum/antagonist/antag in antag_templates) if(!antag.antags_are_dead()) return 0 if(config_legacy.continous_rounds) - emergency_shuttle.auto_recall = 0 + SSemergencyshuttle.auto_recall = 0 return 0 return 1 return 0 @@ -334,7 +334,7 @@ var/global/list/additional_antag_types = list() var/text = "" if(surviving_total > 0) text += "
There [surviving_total>1 ? "were [surviving_total] survivors" : "was one survivor"]" - text += " ([escaped_total>0 ? escaped_total : "none"] [emergency_shuttle.evac ? "escaped" : "transferred"]) and [ghosts] ghosts.
" + text += " ([escaped_total>0 ? escaped_total : "none"] [SSemergencyshuttle.evac ? "escaped" : "transferred"]) and [ghosts] ghosts.
" else text += "There were no survivors ([ghosts] ghosts)." world << text diff --git a/code/game/gamemodes/game_mode_latespawn.dm b/code/game/gamemodes/game_mode_latespawn.dm index c28b46e6c6b..5b042983fe0 100644 --- a/code/game/gamemodes/game_mode_latespawn.dm +++ b/code/game/gamemodes/game_mode_latespawn.dm @@ -28,10 +28,10 @@ /datum/game_mode/proc/try_latespawn(var/datum/mind/player, var/latejoin_only) - if(emergency_shuttle.departed || !round_autoantag) + if(SSemergencyshuttle.departed || !round_autoantag) return - if(emergency_shuttle.shuttle && (emergency_shuttle.shuttle.moving_status == SHUTTLE_WARMUP || emergency_shuttle.shuttle.moving_status == SHUTTLE_INTRANSIT)) + if(SSemergencyshuttle.shuttle && (SSemergencyshuttle.shuttle.moving_status == SHUTTLE_WARMUP || SSemergencyshuttle.shuttle.moving_status == SHUTTLE_INTRANSIT)) return // Don't do anything if the shuttle's coming. var/mills = round_duration_in_ticks diff --git a/code/game/gamemodes/newobjective.dm b/code/game/gamemodes/newobjective.dm index 55256fcc4dc..828ace48a68 100644 --- a/code/game/gamemodes/newobjective.dm +++ b/code/game/gamemodes/newobjective.dm @@ -267,7 +267,7 @@ datum explanation_text = "Frame [target.current.real_name], the [target.assigned_role] for a crime and make sure they are arrested and brought back to the CentCom station alive. We'll handle the rest from there." check_completion() - if(!emergency_shuttle.returned()) + if(!SSemergencyshuttle.returned()) return 0 if(target.current.stat == 2) return 0 @@ -313,7 +313,7 @@ datum explanation_text = "[target.current.real_name], the [target.assigned_role] is a [pick("relative of a","friend of a","") + pick("high ranking","important","well-liked")] mercenary [pick("Leader","Officer","Agent","sympathiser")]. Make sure they get off the station safely, while minimizing intervention." check_completion() - if(!emergency_shuttle.returned()) + if(!SSemergencyshuttle.returned()) return 0 if(target.current.stat == 2) @@ -477,7 +477,7 @@ datum explanation_text = "Hijack the emergency shuttle by escaping alone." check_completion() - if(!emergency_shuttle.returned()) + if(!SSemergencyshuttle.returned()) return 0 if(!owner.current || owner.current.stat == 2) @@ -512,7 +512,7 @@ datum explanation_text = "Escape on the shuttle alive, without being arrested." check_completion() - if(!emergency_shuttle.returned()) + if(!SSemergencyshuttle.returned()) return 0 if(!owner.current || owner.current.stat ==2) @@ -1230,7 +1230,7 @@ datum check_completion() if(!istype(owner.current, /mob/living/silicon)) return 0 - if(!emergency_shuttle.returned()) + if(!SSemergencyshuttle.returned()) return 0 if(!owner.current) return 0 @@ -1457,7 +1457,7 @@ datum/objective/silence explanation_text = "Do not allow anyone to escape the station. Only allow the shuttle to be called when everyone is dead and your story is the only one left." check_completion() - if(!emergency_shuttle.returned()) + if(!SSemergencyshuttle.returned()) return 0 var/area/shuttle = locate(/area/shuttle/escape/centcom) diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 724f980be1d..8df21c444e7 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -42,7 +42,7 @@ var/list/nuke_disks = list() if(!is_type_in_list(disk_area, centcom_areas)) disk_rescued = 0 break - var/crew_evacuated = (emergency_shuttle.returned()) + var/crew_evacuated = (SSemergencyshuttle.returned()) if(!disk_rescued && station_was_nuked && !syndies_didnt_escape) feedback_set_details("round_end_result","win - syndicate nuke") diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 9c603e66abe..a625f032eb6 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -226,7 +226,7 @@ datum/objective/hijack check_completion() if(!owner.current || owner.current.stat) return 0 - if(!emergency_shuttle.returned()) + if(!SSemergencyshuttle.returned()) return 0 if(issilicon(owner.current)) return 0 @@ -248,7 +248,7 @@ datum/objective/block check_completion() if(!istype(owner.current, /mob/living/silicon)) return 0 - if(!emergency_shuttle.returned()) + if(!SSemergencyshuttle.returned()) return 0 if(!owner.current) return 0 @@ -266,7 +266,7 @@ datum/objective/silence explanation_text = "Do not allow anyone to escape the station. Only allow the shuttle to be called when everyone is dead and your story is the only one left." check_completion() - if(!emergency_shuttle.returned()) + if(!SSemergencyshuttle.returned()) return 0 for(var/mob/living/player in player_list) @@ -291,7 +291,7 @@ datum/objective/escape return 0 if(isbrain(owner.current)) return 0 - if(!emergency_shuttle.returned()) + if(!SSemergencyshuttle.returned()) return 0 if(!owner.current || owner.current.stat ==2) return 0 diff --git a/code/game/gamemodes/sandbox/sandbox.dm b/code/game/gamemodes/sandbox/sandbox.dm index 39e9249d240..9077e02191d 100644 --- a/code/game/gamemodes/sandbox/sandbox.dm +++ b/code/game/gamemodes/sandbox/sandbox.dm @@ -14,4 +14,4 @@ /datum/game_mode/sandbox/post_setup() ..() if(emergency_shuttle) - emergency_shuttle.auto_recall = 1 + SSemergencyshuttle.auto_recall = 1 diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 09c6bdcf617..e509dd1d1f6 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -124,7 +124,7 @@ if("callshuttle2") if(src.authenticated) call_shuttle_proc(usr) - if(emergency_shuttle.online()) + if(SSemergencyshuttle.online()) post_status("shuttle") src.state = STATE_DEFAULT if("cancelshuttle") @@ -286,8 +286,8 @@ user.set_machine(src) var/dat = "Communications Console" - if (emergency_shuttle.has_eta()) - var/timeleft = emergency_shuttle.estimate_arrival_time() + if (SSemergencyshuttle.has_eta()) + var/timeleft = SSemergencyshuttle.estimate_arrival_time() dat += "Emergency shuttle\n
\nETA: [timeleft / 60 % 60]:[add_zero(num2text(timeleft % 60), 2)]
" if (istype(user, /mob/living/silicon)) @@ -312,8 +312,8 @@ dat += "
\[ Restore Backup Routing Data \]" dat += "
\[ Change alert level \]" - if(emergency_shuttle.location()) - if (emergency_shuttle.online()) + if(SSemergencyshuttle.location()) + if (SSemergencyshuttle.online()) dat += "
\[ Cancel Shuttle Call \]" else dat += "
\[ Call Emergency Shuttle \]" @@ -385,7 +385,7 @@ var/dat = "" switch(src.aistate) if(STATE_DEFAULT) - if(emergency_shuttle.location() && !emergency_shuttle.online()) + if(SSemergencyshuttle.location() && !SSemergencyshuttle.online()) dat += "
\[ Call Emergency Shuttle \]" dat += "
\[ Message List \]" dat += "
\[ Set Status Display \]" @@ -434,7 +434,7 @@ PS.allowedtocall = !(PS.allowedtocall) /proc/call_shuttle_proc(var/mob/user) - if ((!( SSticker ) || !emergency_shuttle.location())) + if ((!( SSticker ) || !SSemergencyshuttle.location())) return if(!universe.OnShuttleCall(usr)) @@ -445,7 +445,7 @@ user << "[GLOB.using_map.boss_short] will not allow the shuttle to be called. Consider all contracts terminated." return - if(emergency_shuttle.deny_shuttle) + if(SSemergencyshuttle.deny_shuttle) user << "The emergency shuttle may not be sent at this time. Please try again later." return @@ -453,11 +453,11 @@ user << "The emergency shuttle is refueling. Please wait another [round((6000-world.time)/600)] minute\s before trying again." return - if(emergency_shuttle.going_to_centcom()) + if(SSemergencyshuttle.going_to_centcom()) user << "The emergency shuttle may not be called while returning to [GLOB.using_map.boss_short]." return - if(emergency_shuttle.online()) + if(SSemergencyshuttle.online()) user << "The emergency shuttle is already on its way." return @@ -465,7 +465,7 @@ user << "Under directive 7-10, [station_name()] is quarantined until further notice." return - emergency_shuttle.call_evac() + SSemergencyshuttle.call_evac() log_game("[key_name(user)] has called the shuttle.") message_admins("[key_name_admin(user)] has called the shuttle.", 1) admin_chat_message(message = "Emergency evac beginning! Called by [key_name(user)]!", color = "#CC2222") //VOREStation Add @@ -474,20 +474,20 @@ return /proc/init_shift_change(var/mob/user, var/force = 0) - if ((!( SSticker ) || !emergency_shuttle.location())) + if ((!( SSticker ) || !SSemergencyshuttle.location())) return - if(emergency_shuttle.going_to_centcom()) + if(SSemergencyshuttle.going_to_centcom()) user << "The shuttle may not be called while returning to [GLOB.using_map.boss_short]." return - if(emergency_shuttle.online()) + if(SSemergencyshuttle.online()) user << "The shuttle is already on its way." return // if force is 0, some things may stop the shuttle call if(!force) - if(emergency_shuttle.deny_shuttle) + if(SSemergencyshuttle.deny_shuttle) user << "[GLOB.using_map.boss_short] does not currently have a shuttle available in your sector. Please try again later." return @@ -501,13 +501,13 @@ if(SSticker.mode.auto_recall_shuttle) //New version pretends to call the shuttle but cause the shuttle to return after a random duration. - emergency_shuttle.auto_recall = 1 + SSemergencyshuttle.auto_recall = 1 if(SSticker.mode.name == "blob" || SSticker.mode.name == "epidemic") user << "Under directive 7-10, [station_name()] is quarantined until further notice." return - emergency_shuttle.call_transfer() + SSemergencyshuttle.call_transfer() //delay events in case of an autotransfer if (isnull(user)) @@ -521,13 +521,13 @@ return /proc/cancel_call_proc(var/mob/user) - if (!( SSticker ) || !emergency_shuttle.can_recall()) + if (!( SSticker ) || !SSemergencyshuttle.can_recall()) return if((SSticker.mode.name == "blob")||(SSticker.mode.name == "Meteor")) return - if(!emergency_shuttle.going_to_centcom()) //check that shuttle isn't already heading to CentCom - emergency_shuttle.recall() + if(!SSemergencyshuttle.going_to_centcom()) //check that shuttle isn't already heading to CentCom + SSemergencyshuttle.recall() log_game("[key_name(user)] has recalled the shuttle.") message_admins("[key_name_admin(user)] has recalled the shuttle.", 1) return diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm index 245a2d38189..533a57fd842 100644 --- a/code/game/machinery/computer/shuttle.dm +++ b/code/game/machinery/computer/shuttle.dm @@ -10,7 +10,7 @@ attackby(var/obj/item/card/W as obj, var/mob/user as mob) if(stat & (BROKEN|NOPOWER)) return - if ((!( istype(W, /obj/item/card) ) || !( SSticker ) || emergency_shuttle.location() || !( user ))) return + if ((!( istype(W, /obj/item/card) ) || !( SSticker ) || SSemergencyshuttle.location() || !( user ))) return if (istype(W, /obj/item/card/id)||istype(W, /obj/item/pda)) if (istype(W, /obj/item/pda)) var/obj/item/pda/pda = W @@ -29,7 +29,7 @@ return 0 var/choice = alert(user, text("Would you like to (un)authorize a shortened launch time? [] authorization\s are still needed. Use abort to cancel all authorizations.", src.auth_need - src.authorized.len), "Shuttle Launch", "Authorize", "Repeal", "Abort") - if(emergency_shuttle.location() && user.get_active_hand() != W) + if(SSemergencyshuttle.location() && user.get_active_hand() != W) return 0 switch(choice) if("Authorize") @@ -43,7 +43,7 @@ message_admins("[key_name_admin(user)] has launched the shuttle") log_game("[user.ckey] has launched the shuttle early") world << "Alert: Shuttle launch time shortened to 10 seconds!" - emergency_shuttle.set_launch_countdown(10) + SSemergencyshuttle.set_launch_countdown(10) //src.authorized = null qdel(src.authorized) src.authorized = list( ) @@ -60,11 +60,11 @@ else if (istype(W, /obj/item/card/emag) && !emagged) var/choice = alert(user, "Would you like to launch the shuttle?","Shuttle control", "Launch", "Cancel") - if(!emagged && !emergency_shuttle.location() && user.get_active_hand() == W) + if(!emagged && !SSemergencyshuttle.location() && user.get_active_hand() == W) switch(choice) if("Launch") world << "Alert: Shuttle launch time shortened to 10 seconds!" - emergency_shuttle.set_launch_countdown(10) + SSemergencyshuttle.set_launch_countdown(10) emagged = 1 if("Cancel") return diff --git a/code/game/machinery/computer3/computers/communications.dm b/code/game/machinery/computer3/computers/communications.dm index e9fb67abc34..cc7325098f2 100644 --- a/code/game/machinery/computer3/computers/communications.dm +++ b/code/game/machinery/computer3/computers/communications.dm @@ -139,7 +139,7 @@ return if(authenticated) call_shuttle_proc(usr) - if(emergency_shuttle.online()) + if(SSemergencyshuttle.online()) post_status("shuttle") state = STATE_DEFAULT @@ -296,8 +296,8 @@ /datum/file/program/communications/proc/main_menu() var/dat = "" if (computer.radio.subspace) - if(emergency_shuttle.online() && emergency_shuttle.location()) - var/timeleft = emergency_shuttle.estimate_arrival_time() + if(SSemergencyshuttle.online() && SSemergencyshuttle.location()) + var/timeleft = SSemergencyshuttle.estimate_arrival_time() dat += "Emergency shuttle\n
\nETA: [timeleft / 60 % 60]:[add_zero(num2text(timeleft % 60), 2)]
" refresh = 1 else @@ -313,8 +313,8 @@ dat += "
\[ Restore Backup Routing Data \]" dat += "
\[ Change alert level \]" - if(emergency_shuttle.location()) - if (emergency_shuttle.online()) + if(SSemergencyshuttle.location()) + if (SSemergencyshuttle.online()) dat += "
\[ Cancel Shuttle Call \]" else dat += "
\[ Call Emergency Shuttle \]" diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index 0ea298a020f..d7cc77c77f8 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -98,16 +98,16 @@ message1 = "-ETA-" message2 = "Never" // You're here forever. return 1 - if(emergency_shuttle.waiting_to_leave()) + if(SSemergencyshuttle.waiting_to_leave()) message1 = "-ETD-" - if(emergency_shuttle.shuttle.is_launching()) + if(SSemergencyshuttle.shuttle.is_launching()) message2 = "Launch" else message2 = get_shuttle_timer_departure() if(length(message2) > CHARS_PER_LINE) message2 = "Error" update_display(message1, message2) - else if(emergency_shuttle.has_eta()) + else if(SSemergencyshuttle.has_eta()) message1 = "-ETA-" message2 = get_shuttle_timer_arrival() if(length(message2) > CHARS_PER_LINE) @@ -196,7 +196,7 @@ /obj/machinery/status_display/proc/get_shuttle_timer_arrival() if(!emergency_shuttle) return "Error" - var/timeleft = emergency_shuttle.estimate_arrival_time() + var/timeleft = SSemergencyshuttle.estimate_arrival_time() if(timeleft < 0) return "" return "[add_zero(num2text((timeleft / 60) % 60),2)]:[add_zero(num2text(timeleft % 60), 2)]" @@ -204,7 +204,7 @@ /obj/machinery/status_display/proc/get_shuttle_timer_departure() if(!emergency_shuttle) return "Error" - var/timeleft = emergency_shuttle.estimate_launch_time() + var/timeleft = SSemergencyshuttle.estimate_launch_time() if(timeleft < 0) return "" return "[add_zero(num2text((timeleft / 60) % 60),2)]:[add_zero(num2text(timeleft % 60), 2)]" diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index 63269f0ac72..d7ffe8332cc 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -388,19 +388,19 @@ dat += "Current Game Mode: [SSticker.mode.name]
" dat += "Round Duration: [roundduration2text()]
" dat += "Emergency shuttle
" - if (!emergency_shuttle.online()) + if (!SSemergencyshuttle.online()) dat += "Call Shuttle
" else - if (emergency_shuttle.wait_for_launch) - var/timeleft = emergency_shuttle.estimate_launch_time() + if (SSemergencyshuttle.wait_for_launch) + var/timeleft = SSemergencyshuttle.estimate_launch_time() dat += "ETL: [(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]
" - else if (emergency_shuttle.shuttle.has_arrive_time()) - var/timeleft = emergency_shuttle.estimate_arrival_time() + else if (SSemergencyshuttle.shuttle.has_arrive_time()) + var/timeleft = SSemergencyshuttle.estimate_arrival_time() dat += "ETA: [(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]
" dat += "Send Back
" - if (emergency_shuttle.shuttle.moving_status == SHUTTLE_WARMUP) + if (SSemergencyshuttle.shuttle.moving_status == SHUTTLE_WARMUP) dat += "Launching now..." dat += "[SSticker.delay_end ? "End Round Normally" : "Delay Round End"]
" diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 93f72a6042e..ec45cbae4c9 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -206,23 +206,23 @@ switch(href_list["call_shuttle"]) if("1") - if ((!( SSticker ) || !emergency_shuttle.location())) + if ((!( SSticker ) || !SSemergencyshuttle.location())) return - if (emergency_shuttle.can_call()) - emergency_shuttle.call_evac() + if (SSemergencyshuttle.can_call()) + SSemergencyshuttle.call_evac() log_admin("[key_name(usr)] called the Emergency Shuttle") message_admins("[key_name_admin(usr)] called the Emergency Shuttle to the station.", 1) if("2") - if (!( SSticker ) || !emergency_shuttle.location()) + if (!( SSticker ) || !SSemergencyshuttle.location()) return - if (emergency_shuttle.can_call()) - emergency_shuttle.call_evac() + if (SSemergencyshuttle.can_call()) + SSemergencyshuttle.call_evac() log_admin("[key_name(usr)] called the Emergency Shuttle") message_admins("[key_name_admin(usr)] called the Emergency Shuttle to the station.", 1) - else if (emergency_shuttle.can_recall()) - emergency_shuttle.recall() + else if (SSemergencyshuttle.can_recall()) + SSemergencyshuttle.recall() log_admin("[key_name(usr)] sent the Emergency Shuttle back") message_admins("[key_name_admin(usr)] sent the Emergency Shuttle back.", 1) @@ -231,17 +231,17 @@ else if(href_list["edit_shuttle_time"]) if(!check_rights(R_SERVER)) return - if (emergency_shuttle.wait_for_launch) - var/new_time_left = input("Enter new shuttle launch countdown (seconds):","Edit Shuttle Launch Time", emergency_shuttle.estimate_launch_time() ) as num + if (SSemergencyshuttle.wait_for_launch) + var/new_time_left = input("Enter new shuttle launch countdown (seconds):","Edit Shuttle Launch Time", SSemergencyshuttle.estimate_launch_time() ) as num - emergency_shuttle.launch_time = world.time + new_time_left*10 + SSemergencyshuttle.launch_time = world.time + new_time_left*10 log_admin("[key_name(usr)] edited the Emergency Shuttle's launch time to [new_time_left]") message_admins("[key_name_admin(usr)] edited the Emergency Shuttle's launch time to [new_time_left*10]", 1) - else if (emergency_shuttle.shuttle.has_arrive_time()) + else if (SSemergencyshuttle.shuttle.has_arrive_time()) - var/new_time_left = input("Enter new shuttle arrival time (seconds):","Edit Shuttle Arrival Time", emergency_shuttle.estimate_arrival_time() ) as num - emergency_shuttle.shuttle.arrive_time = world.time + new_time_left*10 + var/new_time_left = input("Enter new shuttle arrival time (seconds):","Edit Shuttle Arrival Time", SSemergencyshuttle.estimate_arrival_time() ) as num + SSemergencyshuttle.shuttle.arrive_time = world.time + new_time_left*10 log_admin("[key_name(usr)] edited the Emergency Shuttle's arrival time to [new_time_left]") message_admins("[key_name_admin(usr)] edited the Emergency Shuttle's arrival time to [new_time_left*10]", 1) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 65acb54a89e..504df0d1b47 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -828,7 +828,7 @@ Traitors and the like can also be revived with the previous role mostly intact. set category = "Admin" set name = "Call Shuttle" - if ((!( SSticker ) || !emergency_shuttle.location())) + if ((!( SSticker ) || !SSemergencyshuttle.location())) return if(!check_rights(R_ADMIN|R_EVENT)) return @@ -840,15 +840,15 @@ Traitors and the like can also be revived with the previous role mostly intact. if(SSticker.mode.auto_recall_shuttle) choice = input("The shuttle will just return if you call it. Call anyway?") in list("Confirm", "Cancel") if(choice == "Confirm") - emergency_shuttle.auto_recall = 1 //enable auto-recall + SSemergencyshuttle.auto_recall = 1 //enable auto-recall else return choice = input("Is this an emergency evacuation or a crew transfer?") in list("Emergency", "Crew Transfer") if (choice == "Emergency") - emergency_shuttle.call_evac() + SSemergencyshuttle.call_evac() else - emergency_shuttle.call_transfer() + SSemergencyshuttle.call_transfer() feedback_add_details("admin_verb","CSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -864,10 +864,10 @@ Traitors and the like can also be revived with the previous role mostly intact. if(alert(src, "You sure?", "Confirm", "Yes", "No") != "Yes") return - if(!SSticker || !emergency_shuttle.can_recall()) + if(!SSticker || !SSemergencyshuttle.can_recall()) return - emergency_shuttle.recall() + SSemergencyshuttle.recall() feedback_add_details("admin_verb","CCSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] admin-recalled the emergency shuttle.") message_admins("[key_name_admin(usr)] admin-recalled the emergency shuttle.", 1) @@ -883,10 +883,10 @@ Traitors and the like can also be revived with the previous role mostly intact. if(!check_rights(R_ADMIN|R_EVENT)) return - emergency_shuttle.deny_shuttle = !emergency_shuttle.deny_shuttle + SSemergencyshuttle.deny_shuttle = !SSemergencyshuttle.deny_shuttle - log_admin("[key_name(src)] has [emergency_shuttle.deny_shuttle ? "denied" : "allowed"] the shuttle to be called.") - message_admins("[key_name_admin(usr)] has [emergency_shuttle.deny_shuttle ? "denied" : "allowed"] the shuttle to be called.") + log_admin("[key_name(src)] has [SSemergencyshuttle.deny_shuttle ? "denied" : "allowed"] the shuttle to be called.") + message_admins("[key_name_admin(usr)] has [SSemergencyshuttle.deny_shuttle ? "denied" : "allowed"] the shuttle to be called.") /client/proc/cmd_admin_attack_log(mob/M as mob in mob_list) set category = "Special Verbs" diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 536ad3c24e7..980df510665 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -222,7 +222,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp ..() if(statpanel("Status")) if(emergency_shuttle) - var/eta_status = emergency_shuttle.get_status_panel_eta() + var/eta_status = SSemergencyshuttle.get_status_panel_eta() if(eta_status) stat(null, eta_status) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 62c237e10b1..29698e12a14 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -66,7 +66,7 @@ stat("Intent:", "[a_intent]") stat("Move Mode:", "[m_intent]") if(emergency_shuttle) - var/eta_status = emergency_shuttle.get_status_panel_eta() + var/eta_status = SSemergencyshuttle.get_status_panel_eta() if(eta_status) stat(null, eta_status) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 33e14159b54..f86a6cd572d 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -388,7 +388,7 @@ var/list/ai_verbs_default = list( call_shuttle_proc(src) // hack to display shuttle timer - if(emergency_shuttle.online()) + if(SSemergencyshuttle.online()) var/obj/machinery/computer/communications/C = locate() in machines if(C) C.post_status("shuttle") diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index be4217bf4aa..43980613461 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -158,7 +158,7 @@ // this function displays the shuttles ETA in the status panel if the shuttle has been called /mob/living/silicon/proc/show_emergency_shuttle_eta() if(emergency_shuttle) - var/eta_status = emergency_shuttle.get_status_panel_eta() + var/eta_status = SSemergencyshuttle.get_status_panel_eta() if(eta_status) stat(null, eta_status) diff --git a/code/modules/mob/living/simple_animal/borer/borer.dm b/code/modules/mob/living/simple_animal/borer/borer.dm index 8898dc629a5..14d9d2c21bc 100644 --- a/code/modules/mob/living/simple_animal/borer/borer.dm +++ b/code/modules/mob/living/simple_animal/borer/borer.dm @@ -97,7 +97,7 @@ statpanel("Status") if(emergency_shuttle) - var/eta_status = emergency_shuttle.get_status_panel_eta() + var/eta_status = SSemergencyshuttle.get_status_panel_eta() if(eta_status) stat(null, eta_status) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index ca08640a9af..47b3c68b5fe 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -1499,7 +1499,7 @@ //Check for shuttle bumrush /mob/living/simple_mob/proc/check_horde() return 0 - if(emergency_shuttle.shuttle.location) + if(SSemergencyshuttle.shuttle.location) if(!enroute && !target_mob) //The shuttle docked, all monsters rush for the escape hallway if(!shuttletarget && escape_list.len) //Make sure we didn't already assign it a target, and that there are targets to pick shuttletarget = pick(escape_list) //Pick a shuttle target diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm index 5ff089042ef..2f30193654f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm @@ -96,7 +96,7 @@ if(client.statpanel == "Status") statpanel("Status") if(emergency_shuttle) - var/eta_status = emergency_shuttle.get_status_panel_eta() + var/eta_status = SSemergencyshuttle.get_status_panel_eta() if(eta_status) stat(null, eta_status) stat("Chemicals", chemicals) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/frostfly.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/frostfly.dm index 5711868d157..e4e44638008 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/frostfly.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/frostfly.dm @@ -113,7 +113,7 @@ if(client.statpanel == "Status") statpanel("Status") if(emergency_shuttle) - var/eta_status = emergency_shuttle.get_status_panel_eta() + var/eta_status = SSemergencyshuttle.get_status_panel_eta() if(eta_status) stat(null, eta_status) stat("Energy", energy) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm index b1350c5babf..aca4423d09b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm @@ -125,7 +125,7 @@ if(client.statpanel == "Status") statpanel("Status") if(emergency_shuttle) - var/eta_status = emergency_shuttle.get_status_panel_eta() + var/eta_status = SSemergencyshuttle.get_status_panel_eta() if(eta_status) stat(null, eta_status) stat("Chemicals", chemicals) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index a237374c1ea..cc193868c6e 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -425,10 +425,10 @@ dat += "Round Duration: [roundduration2text()]
" if(emergency_shuttle) //In case NanoTrasen decides reposess CentCom's shuttles. - if(emergency_shuttle.going_to_centcom()) //Shuttle is going to CentCom, not recalled + if(SSemergencyshuttle.going_to_centcom()) //Shuttle is going to CentCom, not recalled dat += "The station has been evacuated.
" - if(emergency_shuttle.online()) - if (emergency_shuttle.evac) // Emergency shuttle is past the point of no recall + if(SSemergencyshuttle.online()) + if (SSemergencyshuttle.evac) // Emergency shuttle is past the point of no recall dat += "The station is currently undergoing evacuation procedures.
" else // Crew transfer initiated dat += "The station is currently undergoing crew transfer procedures.
" diff --git a/code/modules/modular_computers/file_system/programs/command/comm.dm b/code/modules/modular_computers/file_system/programs/command/comm.dm index 527656e8136..4c97673e2aa 100644 --- a/code/modules/modular_computers/file_system/programs/command/comm.dm +++ b/code/modules/modular_computers/file_system/programs/command/comm.dm @@ -79,9 +79,9 @@ if(current_viewing_message) data["message_current"] = current_viewing_message - if(emergency_shuttle.location()) + if(SSemergencyshuttle.location()) data["have_shuttle"] = 1 - if(emergency_shuttle.online()) + if(SSemergencyshuttle.online()) data["have_shuttle_called"] = 1 else data["have_shuttle_called"] = 0 diff --git a/code/modules/shuttles/escape_pods.dm b/code/modules/shuttles/escape_pods.dm index 60c1e4bd0d0..383b7dda1e8 100644 --- a/code/modules/shuttles/escape_pods.dm +++ b/code/modules/shuttles/escape_pods.dm @@ -4,9 +4,9 @@ /datum/shuttle/ferry/escape_pod/New() move_time = move_time + rand(-30, 60) - if(name in emergency_shuttle.escape_pods) + if(name in SSemergencyshuttle.escape_pods) CRASH("An escape pod with the name '[name]' has already been defined.") - emergency_shuttle.escape_pods[name] = src + SSemergencyshuttle.escape_pods[name] = src ..() /datum/shuttle/ferry/escape_pod/init_docking_controllers() @@ -51,7 +51,7 @@ "override_enabled" = docking_program.override_enabled, "door_state" = docking_program.memory["door_status"]["state"], "door_lock" = docking_program.memory["door_status"]["lock"], - "can_force" = pod.can_force() || (emergency_shuttle.departed && pod.can_launch()), //allow players to manually launch ahead of time if the shuttle leaves + "can_force" = pod.can_force() || (SSemergencyshuttle.departed && pod.can_launch()), //allow players to manually launch ahead of time if the shuttle leaves "is_armed" = pod.arming_controller.armed, ) @@ -72,7 +72,7 @@ if("force_launch") if (pod.can_force()) pod.force_launch(src) - else if (emergency_shuttle.departed && pod.can_launch()) //allow players to manually launch ahead of time if the shuttle leaves + else if (SSemergencyshuttle.departed && pod.can_launch()) //allow players to manually launch ahead of time if the shuttle leaves pod.launch(src) return 0 diff --git a/code/modules/shuttles/shuttle_emergency.dm b/code/modules/shuttles/shuttle_emergency.dm index b5b86007cd2..6f2b4940fba 100644 --- a/code/modules/shuttles/shuttle_emergency.dm +++ b/code/modules/shuttles/shuttle_emergency.dm @@ -2,9 +2,9 @@ category = /datum/shuttle/ferry/emergency /datum/shuttle/ferry/emergency/New() - if(emergency_shuttle.shuttle) + if(SSemergencyshuttle.shuttle) CRASH("An emergency shuttle has already been defined.") - emergency_shuttle.shuttle = src + SSemergencyshuttle.shuttle = src ..() /datum/shuttle/ferry/emergency/arrived() @@ -12,7 +12,7 @@ var/obj/machinery/computer/shuttle_control/emergency/C = in_use C.reset_authorization() - emergency_shuttle.shuttle_arrived() + SSemergencyshuttle.shuttle_arrived() /datum/shuttle/ferry/emergency/long_jump(var/area/departing, var/area/destination, var/area/interim, var/travel_time, var/direction) //world << "shuttle/ferry/emergency/long_jump: departing=[departing], destination=[destination], interim=[interim], travel_time=[travel_time]" @@ -23,7 +23,7 @@ //update move_time and launch_time so we get correct ETAs move_time = travel_time - emergency_shuttle.launch_time = world.time + SSemergencyshuttle.launch_time = world.time ..() @@ -31,10 +31,10 @@ ..(origin, destination) if (origin == area_station) //leaving the station - emergency_shuttle.departed = 1 - var/estimated_time = round(emergency_shuttle.estimate_arrival_time()/60,1) + SSemergencyshuttle.departed = 1 + var/estimated_time = round(SSemergencyshuttle.estimate_arrival_time()/60,1) - if (emergency_shuttle.evac) + if (SSemergencyshuttle.evac) priority_announcement.Announce(replacetext(replacetext(GLOB.using_map.emergency_shuttle_leaving_dock, "%dock_name%", "[GLOB.using_map.dock_name]"), "%ETA%", "[estimated_time] minute\s")) else priority_announcement.Announce(replacetext(replacetext(GLOB.using_map.shuttle_leaving_dock, "%dock_name%", "[GLOB.using_map.dock_name]"), "%ETA%", "[estimated_time] minute\s")) @@ -67,8 +67,8 @@ if (!can_launch(user)) return if (istype(user, /obj/machinery/computer/shuttle_control/emergency)) //if we were given a command by an emergency shuttle console - if (emergency_shuttle.autopilot) - emergency_shuttle.autopilot = 0 + if (SSemergencyshuttle.autopilot) + SSemergencyshuttle.autopilot = 0 to_chat(world, "Alert: The shuttle autopilot has been overridden. Launch sequence initiated!") if(usr) @@ -81,8 +81,8 @@ if (!can_force(user)) return if (istype(user, /obj/machinery/computer/shuttle_control/emergency)) //if we were given a command by an emergency shuttle console - if (emergency_shuttle.autopilot) - emergency_shuttle.autopilot = 0 + if (SSemergencyshuttle.autopilot) + SSemergencyshuttle.autopilot = 0 to_chat(world, "Alert: The shuttle autopilot has been overridden. Bluespace drive engaged!") if(usr) @@ -95,8 +95,8 @@ if (!can_cancel(user)) return if (istype(user, /obj/machinery/computer/shuttle_control/emergency)) //if we were given a command by an emergency shuttle console - if (emergency_shuttle.autopilot) - emergency_shuttle.autopilot = 0 + if (SSemergencyshuttle.autopilot) + SSemergencyshuttle.autopilot = 0 to_chat(world, "Alert: The shuttle autopilot has been overridden. Launch sequence aborted!") if(usr) diff --git a/maps/endeavor/endeavor_things.dm b/maps/endeavor/endeavor_things.dm index 01c2bc5c05f..c2595ad28a6 100644 --- a/maps/endeavor/endeavor_things.dm +++ b/maps/endeavor/endeavor_things.dm @@ -91,7 +91,7 @@ spawnpoint_type = /datum/spawnpoint/ferry /obj/machinery/cryopod/robot/door/ferry/process() - if(emergency_shuttle.online() || emergency_shuttle.returned()) + if(SSemergencyshuttle.online() || SSemergencyshuttle.returned()) // Transform into a door! But first despawn anyone inside time_till_despawn = 0 ..() diff --git a/maps/tether/tether_things.dm b/maps/tether/tether_things.dm index ed9dd36833c..1bcab7a2a39 100644 --- a/maps/tether/tether_things.dm +++ b/maps/tether/tether_things.dm @@ -226,7 +226,7 @@ time_till_despawn = 10 SECONDS spawnpoint_type = /datum/spawnpoint/tram /obj/machinery/cryopod/robot/door/tram/process() - if(emergency_shuttle.online() || emergency_shuttle.returned()) + if(SSemergencyshuttle.online() || SSemergencyshuttle.returned()) // Transform into a door! But first despawn anyone inside time_till_despawn = 0 ..()