From f6380f385e2ca65b7cf14424a7d1dd488022ebe8 Mon Sep 17 00:00:00 2001 From: Incoming Date: Wed, 21 Jan 2015 23:28:48 -0500 Subject: [PATCH] Removed some now obsoleted code Fixed an edge case --- code/controllers/subsystem/shuttles.dm | 1 - code/controllers/subsystem/shuttles/emergency.dm | 7 ++----- code/modules/admin/verbs/randomverbs.dm | 7 ------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/code/controllers/subsystem/shuttles.dm b/code/controllers/subsystem/shuttles.dm index f4f1d88dd65..91025890fc0 100644 --- a/code/controllers/subsystem/shuttles.dm +++ b/code/controllers/subsystem/shuttles.dm @@ -16,7 +16,6 @@ var/datum/subsystem/shuttle/SSshuttle var/emergencyEscapeTime = 1200 //time taken for emergency shuttle to reach a safe distance after leaving station (in deciseconds) var/area/emergencyLastCallLoc var/emergencyNoEscape - var/emergencyFakeRecall //supply shuttle stuff var/obj/docking_port/mobile/supply/supply diff --git a/code/controllers/subsystem/shuttles/emergency.dm b/code/controllers/subsystem/shuttles/emergency.dm index 90f3645f723..5c5577a262d 100644 --- a/code/controllers/subsystem/shuttles/emergency.dm +++ b/code/controllers/subsystem/shuttles/emergency.dm @@ -77,10 +77,7 @@ mode = SHUTTLE_IDLE timer = 0 if(SHUTTLE_CALL) - if(time_left < SSshuttle.emergencyFakeRecall * SSshuttle.emergencyCallTime) //recall due to fake recalls - cancel() - SSshuttle.emergencyFakeRecall = 0 - else if(time_left <= 0) + if(time_left <= 0) //move emergency shuttle to station if(dock(SSshuttle.getDock("emergency_home"))) setTimer(20) @@ -90,7 +87,7 @@ send2irc("Server", "The Emergency Shuttle has docked with the station.") priority_announce("The Emergency Shuttle has docked with the station. You have [timeLeft(600)] minutes to board the Emergency Shuttle.", null, 'sound/AI/shuttledock.ogg', "Priority") if(SHUTTLE_DOCKED) - if(time_left == 0 && SSshuttle.emergencyNoEscape) + if(time_left <= 0 && SSshuttle.emergencyNoEscape) priority_announce("Hostile enviroment detected. Departure has been postponed indefinitely pending conflict resolution.", null, 'sound/misc/notice1.ogg', "Priority") mode = SHUTTLE_STRANDED if(time_left <= 0 && !SSshuttle.emergencyNoEscape) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 716c923c789..5fa73c314ec 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -681,13 +681,6 @@ Traitors and the like can also be revived with the previous role mostly intact. var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No") if(confirm != "Yes") return - if(ticker.mode.name == "revolution" || ticker.mode.name == "AI malfunction" || ticker.mode.name == "confliction") - var/choice = input("The shuttle will just return if you call it. Call anyway?") in list("Confirm", "Cancel") - if(choice == "Confirm") - SSshuttle.emergencyFakeRecall = rand(5,9) * 0.1 - else - return - SSshuttle.emergency.request() feedback_add_details("admin_verb","CSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] admin-called the emergency shuttle.")