diff --git a/code/controllers/verbs.dm b/code/controllers/verbs.dm
index 3faa6e4c80..491a1b2c43 100644
--- a/code/controllers/verbs.dm
+++ b/code/controllers/verbs.dm
@@ -1,7 +1,7 @@
//TODO: rewrite and standardise all controller datums to the datum/controller type
//TODO: allow all controllers to be deleted for clean restarts (see WIP master controller stuff) - MC done - lighting done
-/client/proc/restart_controller(controller in list("Master","Failsafe","Lighting","Supply Shuttle"))
+/client/proc/restart_controller(controller in list("Master","Failsafe","Lighting","Supply"))
set category = "Debug"
set name = "Restart Controller"
set desc = "Restart one of the various periodic loop controllers for the game (be careful!)"
@@ -21,14 +21,14 @@
new /datum/controller/lighting()
lighting_controller.process()
feedback_add_details("admin_verb","RLighting")
- if("Supply Shuttle")
- supply_shuttle.process()
+ if("Supply")
+ supply_controller.process()
feedback_add_details("admin_verb","RSupply")
message_admins("Admin [key_name_admin(usr)] has restarted the [controller] controller.")
return
-/client/proc/debug_controller(controller in list("Master","Failsafe","Ticker","Lighting","Air","Jobs","Sun","Radio","Supply Shuttle","Emergency Shuttle","Configuration","pAI", "Cameras", "Transfer Controller"))
+/client/proc/debug_controller(controller in list("Master","Failsafe","Ticker","Lighting","Air","Jobs","Sun","Radio","Supply","Emergency Shuttle","Configuration","pAI", "Cameras", "Transfer Controller"))
set category = "Debug"
set name = "Debug Controller"
set desc = "Debug the various periodic loop controllers for the game (be careful!)"
@@ -59,8 +59,8 @@
if("Radio")
debug_variables(radio_controller)
feedback_add_details("admin_verb","DRadio")
- if("Supply Shuttle")
- debug_variables(supply_shuttle)
+ if("Supply")
+ debug_variables(supply_controller)
feedback_add_details("admin_verb","DSupply")
if("Emergency Shuttle")
debug_variables(emergency_shuttle)
diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm
index 0ae6a7b28b..18f6d11410 100644
--- a/code/game/gamemodes/gameticker.dm
+++ b/code/game/gamemodes/gameticker.dm
@@ -129,7 +129,7 @@ var/global/datum/controller/gameticker/ticker
//here to initialize the random events nicely at round start
setup_economy()
-
+
setup_shuttle_docks()
spawn(0)//Forking here so we dont have to wait for this to finish
@@ -154,7 +154,7 @@ var/global/datum/controller/gameticker/ticker
if(admins_number == 0)
send2adminirc("Round has started with no admins online.")
- supply_shuttle.process() //Start the supply shuttle regenerating points -- TLE
+ supply_controller.process() //Start the supply shuttle regenerating points -- TLE
master_controller.process() //Start master_controller.process()
lighting_controller.process() //Start processing DynamicAreaLighting updates
@@ -320,7 +320,7 @@ var/global/datum/controller/gameticker/ticker
else
game_finished = (mode.check_finished() || (emergency_shuttle.location == 2 && emergency_shuttle.alert == 1))
mode_finished = game_finished
-
+
if(!mode.explosion_in_progress && game_finished && (mode_finished || post_game))
current_state = GAME_STATE_FINISHED
@@ -351,17 +351,17 @@ var/global/datum/controller/gameticker/ticker
world << "\blue An admin has delayed the round end"
else
world << "\blue An admin has delayed the round end"
-
+
else if (mode_finished)
post_game = 1
-
+
mode.cleanup()
-
+
//call a transfer shuttle vote
spawn(50)
world << "\red The round has ended!"
vote.autotransfer()
-
+
return 1
proc/getfactionbyname(var/name)
diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm
index ab1eb364b7..404c2d54ca 100644
--- a/code/game/machinery/status_display.dm
+++ b/code/game/machinery/status_display.dm
@@ -112,7 +112,7 @@
var/line1 = "SUPPLY"
var/line2 = ""
- var/datum/shuttle/ferry/supply/shuttle = supply_shuttle.get_shuttle()
+ var/datum/shuttle/ferry/supply/shuttle = supply_controller.get_shuttle()
if (!shuttle)
line2 = "Error"
else if(shuttle.has_eta())
@@ -171,7 +171,7 @@
return ""
proc/get_supply_shuttle_timer()
- var/datum/shuttle/ferry/supply/shuttle = supply_shuttle.get_shuttle()
+ var/datum/shuttle/ferry/supply/shuttle = supply_controller.get_shuttle()
if (!shuttle)
return "Error"
diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm
index 679b54f6d9..0f041ef5c9 100644
--- a/code/game/objects/items/devices/PDA/cart.dm
+++ b/code/game/objects/items/devices/PDA/cart.dm
@@ -411,14 +411,14 @@
if(mode==47)
var/supplyData[0]
- var/datum/shuttle/ferry/supply/shuttle = supply_shuttle.get_shuttle()
+ var/datum/shuttle/ferry/supply/shuttle = supply_controller.get_shuttle()
if (shuttle)
supplyData["shuttle_moving"] = shuttle.has_eta()
supplyData["shuttle_eta"] = shuttle.eta_minutes()
supplyData["shuttle_loc"] = shuttle.at_station() ? "Station" : "Dock"
var/supplyOrderCount = 0
var/supplyOrderData[0]
- for(var/S in supply_shuttle.shoppinglist)
+ for(var/S in supply_controller.shoppinglist)
var/datum/supply_order/SO = S
supplyOrderData[++supplyOrderData.len] = list("Number" = SO.ordernum, "Name" = html_encode(SO.object.name), "ApprovedBy" = SO.orderedby, "Comment" = html_encode(SO.comment))
@@ -430,7 +430,7 @@
var/requestCount = 0
var/requestData[0]
- for(var/S in supply_shuttle.requestlist)
+ for(var/S in supply_controller.requestlist)
var/datum/supply_order/SO = S
requestCount++
requestData[++requestData.len] = list("Number" = SO.ordernum, "Name" = html_encode(SO.object.name), "OrderedBy" = SO.orderedby, "Comment" = html_encode(SO.comment))
diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm
index acb21b2b05..df78026f98 100644
--- a/code/game/supplyshuttle.dm
+++ b/code/game/supplyshuttle.dm
@@ -4,7 +4,7 @@
#define SUPPLY_STATION_AREATYPE "/area/supply/station" //Type of the supply shuttle area for station
#define SUPPLY_DOCK_AREATYPE "/area/supply/dock" //Type of the supply shuttle area for dock
-var/datum/controller/supply_shuttle/supply_shuttle = new()
+var/datum/controller/supply/supply_controller = new()
var/list/mechtoys = list(
/obj/item/toy/prize/ripley,
@@ -125,7 +125,7 @@ var/list/mechtoys = list(
var/orderedby = null
var/comment = null
-/datum/controller/supply_shuttle
+/datum/controller/supply
var/processing = 1
var/processing_interval = 300
var/iteration = 0
@@ -333,11 +333,11 @@ var/list/mechtoys = list(
if(temp)
dat = temp
else
- var/datum/shuttle/ferry/supply/shuttle = supply_shuttle.get_shuttle()
+ var/datum/shuttle/ferry/supply/shuttle = supply_controller.get_shuttle()
if (shuttle)
dat += {"
Supply shuttle
Location: [shuttle.has_eta() ? "Moving to station ([shuttle.eta_minutes()] Mins.)":shuttle.at_station() ? "Docked":"Away"]
-
Supply points: [supply_shuttle.points]
+
Supply points: [supply_controller.points]
\nRequest items
View approved orders
View requests
@@ -359,18 +359,18 @@ var/list/mechtoys = list(
//all_supply_groups
//Request what?
last_viewed_group = "categories"
- temp = "Supply points: [supply_shuttle.points]
"
+ temp = "Supply points: [supply_controller.points]
"
temp += "Main Menu
"
temp += "Select a category
"
for(var/supply_group_name in all_supply_groups )
temp += "[supply_group_name]
"
else
last_viewed_group = href_list["order"]
- temp = "Supply points: [supply_shuttle.points]
"
+ temp = "Supply points: [supply_controller.points]
"
temp += "Back to all categories
"
temp += "Request from: [last_viewed_group]
"
- for(var/supply_name in supply_shuttle.supply_packs )
- var/datum/supply_packs/N = supply_shuttle.supply_packs[supply_name]
+ for(var/supply_name in supply_controller.supply_packs )
+ var/datum/supply_packs/N = supply_controller.supply_packs[supply_name]
if(N.hidden || N.contraband || N.group != last_viewed_group) continue //Have to send the type instead of a reference to
temp += "[supply_name] Cost: [N.cost]
" //the obj because it would get caught by the garbage
@@ -381,7 +381,7 @@ var/list/mechtoys = list(
return
//Find the correct supply_pack datum
- var/datum/supply_packs/P = supply_shuttle.supply_packs[href_list["doorder"]]
+ var/datum/supply_packs/P = supply_controller.supply_packs[href_list["doorder"]]
if(!istype(P)) return
var/timeout = world.time + 600
@@ -398,11 +398,11 @@ var/list/mechtoys = list(
else if(issilicon(usr))
idname = usr.real_name
- supply_shuttle.ordernum++
+ supply_controller.ordernum++
var/obj/item/weapon/paper/reqform = new /obj/item/weapon/paper(loc)
reqform.name = "Requisition Form - [P.name]"
reqform.info += "[station_name] Supply Requisition Form
"
- reqform.info += "INDEX: #[supply_shuttle.ordernum]
"
+ reqform.info += "INDEX: #[supply_controller.ordernum]
"
reqform.info += "REQUESTED BY: [idname]
"
reqform.info += "RANK: [idrank]
"
reqform.info += "REASON: [reason]
"
@@ -418,24 +418,24 @@ var/list/mechtoys = list(
//make our supply_order datum
var/datum/supply_order/O = new /datum/supply_order()
- O.ordernum = supply_shuttle.ordernum
+ O.ordernum = supply_controller.ordernum
O.object = P
O.orderedby = idname
- supply_shuttle.requestlist += O
+ supply_controller.requestlist += O
temp = "Thanks for your request. The cargo team will process it as soon as possible.
"
temp += "
Back Main Menu"
else if (href_list["vieworders"])
temp = "Current approved orders:
"
- for(var/S in supply_shuttle.shoppinglist)
+ for(var/S in supply_controller.shoppinglist)
var/datum/supply_order/SO = S
temp += "[SO.object.name] approved by [SO.orderedby] [SO.comment ? "([SO.comment])":""]
"
temp += "
OK"
else if (href_list["viewrequests"])
temp = "Current requests:
"
- for(var/S in supply_shuttle.requestlist)
+ for(var/S in supply_controller.requestlist)
var/datum/supply_order/SO = S
temp += "#[SO.ordernum] - [SO.object.name] requested by [SO.orderedby]
"
temp += "
OK"
@@ -460,7 +460,7 @@ var/list/mechtoys = list(
if (temp)
dat = temp
else
- var/datum/shuttle/ferry/supply/shuttle = supply_shuttle.get_shuttle()
+ var/datum/shuttle/ferry/supply/shuttle = supply_controller.get_shuttle()
if (shuttle)
dat += "
Supply shuttle
"
dat += "\nLocation: "
@@ -495,7 +495,7 @@ var/list/mechtoys = list(
dat += "
\n
"
- dat += {"
\nSupply points: [supply_shuttle.points]
\n
+ dat += {"
\nSupply points: [supply_controller.points]
\n
// [shuttle.at_station() ? "\n*Must be away to order items*
\n
":"\nOrder items
\n
"]
\nOrder items
\n
\nView requests
\n
@@ -517,10 +517,10 @@ var/list/mechtoys = list(
return
/obj/machinery/computer/supplycomp/Topic(href, href_list)
- if(!supply_shuttle)
- world.log << "## ERROR: Eek. The supply_shuttle controller datum is missing somehow."
+ if(!supply_controller)
+ world.log << "## ERROR: Eek. The supply_controller controller datum is missing somehow."
return
- var/datum/shuttle/ferry/supply/shuttle = supply_shuttle.get_shuttle()
+ var/datum/shuttle/ferry/supply/shuttle = supply_controller.get_shuttle()
if (!shuttle)
world.log << "## ERROR: Eek. The supply/shuttle datum is missing somehow."
return
@@ -540,7 +540,7 @@ var/list/mechtoys = list(
temp = "Initiating launch sequence.
OK"
else
shuttle.launch(src)
- temp = "The supply shuttle has been called and will arrive in approximately [round(supply_shuttle.movetime/600,1)] minutes.
OK"
+ temp = "The supply shuttle has been called and will arrive in approximately [round(supply_controller.movetime/600,1)] minutes.
OK"
post_signal("supply")
if (href_list["force_send"])
@@ -555,25 +555,25 @@ var/list/mechtoys = list(
//all_supply_groups
//Request what?
last_viewed_group = "categories"
- temp = "Supply points: [supply_shuttle.points]
"
+ temp = "Supply points: [supply_controller.points]
"
temp += "Main Menu
"
temp += "Select a category
"
for(var/supply_group_name in all_supply_groups )
temp += "[supply_group_name]
"
else
last_viewed_group = href_list["order"]
- temp = "Supply points: [supply_shuttle.points]
"
+ temp = "Supply points: [supply_controller.points]
"
temp += "Back to all categories
"
temp += "Request from: [last_viewed_group]
"
- for(var/supply_name in supply_shuttle.supply_packs )
- var/datum/supply_packs/N = supply_shuttle.supply_packs[supply_name]
+ for(var/supply_name in supply_controller.supply_packs )
+ var/datum/supply_packs/N = supply_controller.supply_packs[supply_name]
if((N.hidden && !hacked) || (N.contraband && !can_order_contraband) || N.group != last_viewed_group) continue //Have to send the type instead of a reference to
temp += "[supply_name] Cost: [N.cost]
" //the obj because it would get caught by the garbage
- /*temp = "Supply points: [supply_shuttle.points]
Request what?
"
+ /*temp = "Supply points: [supply_controller.points]
Request what?
"
- for(var/supply_name in supply_shuttle.supply_packs )
- var/datum/supply_packs/N = supply_shuttle.supply_packs[supply_name]
+ for(var/supply_name in supply_controller.supply_packs )
+ var/datum/supply_packs/N = supply_controller.supply_packs[supply_name]
if(N.hidden && !hacked) continue
if(N.contraband && !can_order_contraband) continue
temp += "[supply_name] Cost: [N.cost]
" //the obj because it would get caught by the garbage
@@ -586,7 +586,7 @@ var/list/mechtoys = list(
return
//Find the correct supply_pack datum
- var/datum/supply_packs/P = supply_shuttle.supply_packs[href_list["doorder"]]
+ var/datum/supply_packs/P = supply_controller.supply_packs[href_list["doorder"]]
if(!istype(P)) return
var/timeout = world.time + 600
@@ -603,11 +603,11 @@ var/list/mechtoys = list(
else if(issilicon(usr))
idname = usr.real_name
- supply_shuttle.ordernum++
+ supply_controller.ordernum++
var/obj/item/weapon/paper/reqform = new /obj/item/weapon/paper(loc)
reqform.name = "Requisition Form - [P.name]"
reqform.info += "[station_name] Supply Requisition Form
"
- reqform.info += "INDEX: #[supply_shuttle.ordernum]
"
+ reqform.info += "INDEX: #[supply_controller.ordernum]
"
reqform.info += "REQUESTED BY: [idname]
"
reqform.info += "RANK: [idrank]
"
reqform.info += "REASON: [reason]
"
@@ -623,10 +623,10 @@ var/list/mechtoys = list(
//make our supply_order datum
var/datum/supply_order/O = new /datum/supply_order()
- O.ordernum = supply_shuttle.ordernum
+ O.ordernum = supply_controller.ordernum
O.object = P
O.orderedby = idname
- supply_shuttle.requestlist += O
+ supply_controller.requestlist += O
temp = "Order request placed.
"
temp += "
Back | Main Menu | Authorize Order"
@@ -637,15 +637,15 @@ var/list/mechtoys = list(
var/datum/supply_order/O
var/datum/supply_packs/P
temp = "Invalid Request"
- for(var/i=1, i<=supply_shuttle.requestlist.len, i++)
- var/datum/supply_order/SO = supply_shuttle.requestlist[i]
+ for(var/i=1, i<=supply_controller.requestlist.len, i++)
+ var/datum/supply_order/SO = supply_controller.requestlist[i]
if(SO.ordernum == ordernum)
O = SO
P = O.object
- if(supply_shuttle.points >= P.cost)
- supply_shuttle.requestlist.Cut(i,i+1)
- supply_shuttle.points -= P.cost
- supply_shuttle.shoppinglist += O
+ if(supply_controller.points >= P.cost)
+ supply_controller.requestlist.Cut(i,i+1)
+ supply_controller.points -= P.cost
+ supply_controller.shoppinglist += O
temp = "Thanks for your order.
"
temp += "
Back Main Menu"
else
@@ -655,7 +655,7 @@ var/list/mechtoys = list(
else if (href_list["vieworders"])
temp = "Current approved orders:
"
- for(var/S in supply_shuttle.shoppinglist)
+ for(var/S in supply_controller.shoppinglist)
var/datum/supply_order/SO = S
temp += "#[SO.ordernum] - [SO.object.name] approved by [SO.orderedby][SO.comment ? " ([SO.comment])":""]
"// (Cancel)
"
temp += "
OK"
@@ -673,7 +673,7 @@ var/list/mechtoys = list(
*/
else if (href_list["viewrequests"])
temp = "Current requests:
"
- for(var/S in supply_shuttle.requestlist)
+ for(var/S in supply_controller.requestlist)
var/datum/supply_order/SO = S
temp += "#[SO.ordernum] - [SO.object.name] requested by [SO.orderedby] [shuttle.idle() ? "":shuttle.at_station() ? "":"Approve Remove"]
"
@@ -683,16 +683,16 @@ var/list/mechtoys = list(
else if (href_list["rreq"])
var/ordernum = text2num(href_list["rreq"])
temp = "Invalid Request.
"
- for(var/i=1, i<=supply_shuttle.requestlist.len, i++)
- var/datum/supply_order/SO = supply_shuttle.requestlist[i]
+ for(var/i=1, i<=supply_controller.requestlist.len, i++)
+ var/datum/supply_order/SO = supply_controller.requestlist[i]
if(SO.ordernum == ordernum)
- supply_shuttle.requestlist.Cut(i,i+1)
+ supply_controller.requestlist.Cut(i,i+1)
temp = "Request removed.
"
break
temp += "
Back Main Menu"
else if (href_list["clearreq"])
- supply_shuttle.requestlist.Cut()
+ supply_controller.requestlist.Cut()
temp = "List cleared.
"
temp += "
OK"
diff --git a/code/modules/shuttles/shuttle_supply.dm b/code/modules/shuttles/shuttle_supply.dm
index 5f1ff015db..fedcc9efa7 100644
--- a/code/modules/shuttles/shuttle_supply.dm
+++ b/code/modules/shuttles/shuttle_supply.dm
@@ -20,7 +20,7 @@
origin = get_location_area(location)
if (!at_station()) //at centcom
- supply_shuttle.buy()
+ supply_controller.buy()
//it would be cool to play a sound here
moving_status = SHUTTLE_WARMUP
@@ -40,7 +40,7 @@
move(origin, away_area)
//wait ETA here.
- arrive_time = world.time + supply_shuttle.movetime
+ arrive_time = world.time + supply_controller.movetime
while (world.time <= arrive_time)
sleep(5)
@@ -50,14 +50,14 @@
moving_status = SHUTTLE_IDLE
if (!at_station()) //at centcom
- supply_shuttle.sell()
+ supply_controller.sell()
// returns 1 if the supply shuttle should be prevented from moving because it contains forbidden atoms
/datum/shuttle/ferry/supply/proc/forbidden_atoms_check()
if (!at_station())
return 0 //if badmins want to send mobs or a nuke on the supply shuttle from centcom we don't care
- return supply_shuttle.forbidden_atoms_check(get_location_area())
+ return supply_controller.forbidden_atoms_check(get_location_area())
/datum/shuttle/ferry/supply/proc/at_station()
return (!location)