mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 18:32:03 +00:00
Fixed the old emergency shuttle bug where it'd go crazy when you recalled the shuttle when it was already at ten minutes.
Mime access added because clown access felt lonely. Both have no current use other than for door construction. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@619 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -31,6 +31,12 @@ datum/shuttle_controller
|
||||
|
||||
proc/recall()
|
||||
if(direction == 1)
|
||||
var/timeleft = timeleft()
|
||||
if(timeleft >= 600)
|
||||
world << "\blue <B>Shuttle is at Centcom. Unable to recall.</B>"
|
||||
return
|
||||
world << "\blue <B>Alert: The shuttle is going back!</B>"
|
||||
world << sound('shuttlerecalled.ogg')
|
||||
setdirection(-1)
|
||||
online = 1
|
||||
|
||||
|
||||
@@ -42,6 +42,7 @@
|
||||
access_qm = 41
|
||||
access_court = 42
|
||||
access_clown = 43
|
||||
access_mime = 44
|
||||
|
||||
|
||||
/obj/var/list/req_access = null
|
||||
@@ -149,7 +150,7 @@
|
||||
if("Clown")
|
||||
return list(access_maint_tunnels, access_clown)
|
||||
if("Mime")
|
||||
return list(access_maint_tunnels)
|
||||
return list(access_maint_tunnels, access_mime)
|
||||
if("Chef")
|
||||
return list(access_kitchen, access_morgue)
|
||||
if("Roboticist")
|
||||
@@ -182,7 +183,7 @@
|
||||
access_teleporter, access_eva, access_heads, access_captain, access_all_personal_lockers,
|
||||
access_tech_storage, access_chapel_office, access_atmospherics, access_kitchen,
|
||||
access_bar, access_janitor, access_crematorium, access_robotics, access_cargo, access_cargo_bot, access_construction,
|
||||
access_hydroponics, access_library, access_manufacturing, access_lawyer, access_virology, access_cmo, access_qm, access_clown)
|
||||
access_hydroponics, access_library, access_manufacturing, access_lawyer, access_virology, access_cmo, access_qm, access_clown, access_mime)
|
||||
|
||||
/proc/get_access_desc(A)
|
||||
switch(A)
|
||||
@@ -270,6 +271,8 @@
|
||||
return "Quartermaster's Office"
|
||||
if(access_clown)
|
||||
return "HONK! Access"
|
||||
if(access_mime)
|
||||
return "Silent Access"
|
||||
|
||||
/proc/get_all_jobs()
|
||||
return list("Assistant", "Station Engineer", "Detective", "Medical Doctor", "Captain", "Security Officer", "Warden",
|
||||
|
||||
@@ -413,9 +413,6 @@
|
||||
if( ticker.mode.name == "blob" )
|
||||
return
|
||||
|
||||
world << "\blue <B>Alert: The shuttle is going back!</B>" //marker4
|
||||
world << sound('shuttlerecalled.ogg')
|
||||
|
||||
emergency_shuttle.recall()
|
||||
|
||||
return
|
||||
|
||||
@@ -546,9 +546,6 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is
|
||||
src << "Only administrators may use this command."
|
||||
return
|
||||
|
||||
world << "\blue <B>Alert: The shuttle is going back!</B>"
|
||||
world << sound('shuttlerecalled.ogg')
|
||||
|
||||
emergency_shuttle.recall()
|
||||
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user