cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-04 06:22:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6900 from VOREStation/vplk-sssupply

Browse Source 
Converted old supply_controller to SSsupply
This commit is contained in:
Atermonera
2020-03-27 14:37:31 -07:00
committed by GitHub
parent 8cc08eb93d 8c1ab54467
commit dfda8ea952
15 changed files with 110 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/objects/items/devices/PDA/cart.dm
View File

@@ -425,14 +425,14 @@ var/list/civilian_cartridges = list(
if(mode==47)
var/supplyData[0]
var/datum/shuttle/autodock/ferry/supply/shuttle = supply_controller.shuttle
var/datum/shuttle/autodock/ferry/supply/shuttle = SSsupply.shuttle
if (shuttle)
supplyData["shuttle_moving"] = shuttle.has_arrive_time()
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_controller.shoppinglist)
for(var/S in SSsupply.shoppinglist)
var/datum/supply_order/SO = S
supplyOrderData[++supplyOrderData.len] = list("Number" = SO.ordernum, "Name" = html_encode(SO.object.name), "ApprovedBy" = SO.ordered_by, "Comment" = html_encode(SO.comment))
@@ -444,7 +444,7 @@ var/list/civilian_cartridges = list(
var/requestCount = 0
var/requestData[0]
for(var/S in supply_controller.order_history)
for(var/S in SSsupply.order_history)
var/datum/supply_order/SO = S
if(SO.status != SUP_ORDER_REQUESTED)
continue

28
code/game/objects/items/devices/communicator/cartridge.dm
View File

@@ -140,7 +140,7 @@
if(!reason)
return
supply_controller.create_order(S, user, reason)
SSsupply.create_order(S, user, reason)
internal_data["supply_reqtime"] = (world.time + 5) % 1e5
if(href_list["order_ref"])
@@ -189,20 +189,20 @@
O.approved_at = new_val
if(href_list["approve"])
supply_controller.approve_order(O, user)
SSsupply.approve_order(O, user)
if(href_list["deny"])
supply_controller.deny_order(O, user)
SSsupply.deny_order(O, user)
if(href_list["delete"])
supply_controller.delete_order(O, user)
SSsupply.delete_order(O, user)
if(href_list["clear_all_requests"])
var/mob/user = locate(href_list["user"])
if(!istype(user)) // Invalid ref
return
supply_controller.deny_all_pending(user)
SSsupply.deny_all_pending(user)
if(href_list["export_ref"])
var/datum/exported_crate/E = locate(href_list["export_ref"])
@@ -258,29 +258,29 @@
E.value = num
else if(href_list["delete"])
supply_controller.delete_export(E, user)
SSsupply.delete_export(E, user)
else if(href_list["add_item"])
supply_controller.add_export_item(E, user)
SSsupply.add_export_item(E, user)
if(supply_controller && supply_controller.shuttle)
if(SSsupply && SSsupply.shuttle)
switch(href_list["send_shuttle"])
if("send_away")
if(supply_controller.shuttle.forbidden_atoms_check())
if(SSsupply.shuttle.forbidden_atoms_check())
to_chat(usr, "<span class='warning'>For safety reasons the automated supply shuttle cannot transport live organisms, classified nuclear weaponry or homing beacons.</span>")
else
supply_controller.shuttle.launch(src)
SSsupply.shuttle.launch(src)
to_chat(usr, "<span class='notice'>Initiating launch sequence.</span>")
if("send_to_station")
supply_controller.shuttle.launch(src)
to_chat(usr, "<span class='notice'>The supply shuttle has been called and will arrive in approximately [round(supply_controller.movetime/600,1)] minutes.</span>")
SSsupply.shuttle.launch(src)
to_chat(usr, "<span class='notice'>The supply shuttle has been called and will arrive in approximately [round(SSsupply.movetime/600,1)] minutes.</span>")
if("cancel_shuttle")
supply_controller.shuttle.cancel_launch(src)
SSsupply.shuttle.cancel_launch(src)
if("force_shuttle")
supply_controller.shuttle.force_launch(src)
SSsupply.shuttle.force_launch(src)
// Status display
switch(href_list["stat_display"])

12
code/game/objects/items/devices/communicator/helper.dm
View File

@@ -394,7 +394,7 @@
// code\game\machinery\computer\supply.dm, starting at line 55
/obj/item/weapon/commcard/proc/get_supply_shuttle_status()
var/shuttle_status[0]
var/datum/shuttle/autodock/ferry/supply/shuttle = supply_controller.shuttle
var/datum/shuttle/autodock/ferry/supply/shuttle = SSsupply.shuttle
if(shuttle)
if(shuttle.has_arrive_time())
shuttle_status["location"] = "In transit"
@@ -454,7 +454,7 @@
// code\game\machinery\computer\supply.dm, starting at line 130
/obj/item/weapon/commcard/proc/get_supply_orders()
var/orders[0]
for(var/datum/supply_order/S in supply_controller.order_history)
for(var/datum/supply_order/S in SSsupply.order_history)
orders[++orders.len] = list(
"ref" = "\ref[S]",
"status" = S.status,
@@ -477,7 +477,7 @@
// code\game\machinery\computer\supply.dm, starting at line 147
/obj/item/weapon/commcard/proc/get_supply_receipts()
var/receipts[0]
for(var/datum/exported_crate/E in supply_controller.exported_crates)
for(var/datum/exported_crate/E in SSsupply.exported_crates)
receipts[++receipts.len] = list(
"ref" = "\ref[E]",
"contents" = E.contents,
@@ -495,8 +495,8 @@
// code\game\machinery\computer\supply.dm, starting at line 147
/obj/item/weapon/commcard/proc/get_supply_pack_list()
var/supply_packs[0]
for(var/pack_name in supply_controller.supply_pack)
var/datum/supply_pack/P = supply_controller.supply_pack[pack_name]
for(var/pack_name in SSsupply.supply_pack)
var/datum/supply_pack/P = SSsupply.supply_pack[pack_name]
if(P.group == internal_data["supply_category"])
var/list/pack = list(
"name" = P.name,
@@ -521,7 +521,7 @@
return list(
"shuttle_auth" = (internal_data["supply_controls"] & SUP_SEND_SHUTTLE),
"order_auth" = (internal_data["supply_controls"] & SUP_ACCEPT_ORDERS),
"supply_points" = supply_controller.points,
"supply_points" = SSsupply.points,
"supply_categories" = all_supply_groups
)