Rounds no longer end instantly

I think I learned a valuable lesson today about how changing numerical
modes should be tested.
This commit is contained in:
Jack Edge
2016-05-26 16:43:24 +01:00
parent 375b1bccc8
commit 05d23faeaa
3 changed files with 28 additions and 10 deletions
+7 -7
View File
@@ -1,11 +1,11 @@
//shuttle mode defines
#define SHUTTLE_IDLE "idle"
#define SHUTTLE_RECALL "recalled"
#define SHUTTLE_CALL "called"
#define SHUTTLE_DOCKED "docked"
#define SHUTTLE_STRANDED "stranded"
#define SHUTTLE_ESCAPE "escape"
#define SHUTTLE_ENDGAME "endgame"
#define SHUTTLE_IDLE 0
#define SHUTTLE_RECALL 1
#define SHUTTLE_CALL 2
#define SHUTTLE_DOCKED 3
#define SHUTTLE_STRANDED 4
#define SHUTTLE_ESCAPE 5
#define SHUTTLE_ENDGAME 6
// Shuttle return values
#define SHUTTLE_NOT_A_DOCKING_PORT "not_a_docking_port"
+19 -1
View File
@@ -43,6 +43,24 @@
master_ui, state)
ui.open()
/proc/shuttlemode2str(mode)
switch(mode)
if(SHUTTLE_IDLE)
. = "idle"
if(SHUTTLE_RECALL)
. = "recalled"
if(SHUTTLE_CALL)
. = "called"
if(SHUTTLE_DOCKED)
. = "docked"
if(SHUTTLE_STRANDED)
. = "stranded"
if(SHUTTLE_ENDGAME)
. = "endgame"
if(!.)
throw EXCEPTION("shuttlemode2str(): invalid mode [mode]")
/obj/machinery/shuttle_manipulator/ui_data(mob/user)
var/list/data = list()
data["tabs"] = list("Status", "Templates", "Modification")
@@ -87,7 +105,7 @@
L["id"] = M.id
L["timer"] = M.timer
L["timeleft"] = M.getTimerStr()
L["mode"] = capitalize(M.mode)
L["mode"] = capitalize(shuttlemode2str(M.mode))
L["status"] = M.getStatusText()
if(M == existing_shuttle)
data["existing_shuttle"] = L
+2 -2
View File
File diff suppressed because one or more lines are too long