From bdb561960ace2fad62954a74c6f9dbea11b430da Mon Sep 17 00:00:00 2001 From: "noisomehollow@lycos.com" Date: Sat, 18 Dec 2010 07:50:54 +0000 Subject: [PATCH] Fixed a bug with communication code. Calling the shuttle should work fine now. Hopefully fixed strike team code not properly deleting discarded ghosts. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@656 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/machinery/computer/communications.dm | 13 +++++++------ code/modules/admin/verbs/striketeam.dm | 8 ++++---- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 91033a08ceb..9c6f293994f 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -388,17 +388,18 @@ /proc/call_shuttle_proc(var/mob/user) if ((!( ticker ) || emergency_shuttle.location)) return - if(world.time < 6000) // Ten minute grace period to let the game get going without lolmetagaming. -- TLE - user << "Centcomm will not allow the shuttle to be called." - return +// if(world.time < 6000) // Ten minute grace period to let the game get going without lolmetagaming. -- TLE +// user << "Centcomm will not allow the shuttle to be called." +// return if(ticker.mode.name == "revolution" || ticker.mode.name == "AI malfunction" || ticker.mode.name == "confliction") user << "Centcom will not allow the shuttle to be called." if(sent_strike_team == 1) user << "Consider all contracts terminated." return - if(sent_strike_team == 1 && ticker.mode.name != "revolution" || ticker.mode.name != "AI malfunction") - user << "Centcom will not allow the shuttle to be called. Consider all contracts terminated." - return + if(sent_strike_team == 1) + if(ticker.mode.name != "revolution" || ticker.mode.name != "AI malfunction") + user << "Centcom will not allow the shuttle to be called. Consider all contracts terminated." + return // if(ticker.mode.name == "blob" || ticker.mode.name == "Corporate Restructuring" || ticker.mode.name == "sandbox") // user << "Under directive 7-10, [station_name()] is quarantined until further notice." // return diff --git a/code/modules/admin/verbs/striketeam.dm b/code/modules/admin/verbs/striketeam.dm index 888ba670b8e..d4a4f3ac45f 100644 --- a/code/modules/admin/verbs/striketeam.dm +++ b/code/modules/admin/verbs/striketeam.dm @@ -7,9 +7,9 @@ var/global/sent_strike_team = 0 if(!ticker) alert("The game hasn't started yet!") return - if(world.time < 6000) - alert("Not so fast, buddy. Wait a few (10) minutes until the game gets going.") - return +// if(world.time < 6000) +// alert("Not so fast, buddy. Wait a few (10) minutes until the game gets going.") +// return if(sent_strike_team == 1) alert("CentCom is already sending a team, Mr. Dumbass.") return @@ -99,7 +99,7 @@ var/global/sent_strike_team = 0 if(candidates.len) var/mob/dead/observer/G = pick(candidates) new_commando.key = G.client.key - del.(G) + del(G) else new_commando.key = "null"