Skip to content

Commit

Permalink
okey we cooking
Browse files Browse the repository at this point in the history
  • Loading branch information
uuuuhuuuu committed Aug 19, 2024
1 parent 30b2c7f commit 6a43ea3
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 2 deletions.
1 change: 1 addition & 0 deletions code/controllers/shuttle_controller.dm
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
process_shuttles += shuttle

GLOB.supply_controller.shuttle = shuttle
GLOB.supply_controller_upp.shuttle = shuttle

//---ELEVATOR---//
// Elevator I
Expand Down
1 change: 1 addition & 0 deletions code/controllers/subsystem/ticker.dm
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@ SUBSYSTEM_DEF(ticker)
to_chat_spaced(world, html = FONT_SIZE_BIG(SPAN_ROLE_BODY("<B>Welcome to [GLOB.round_statistics.round_name]</B>")))

GLOB.supply_controller.start_processing()
GLOB.supply_controller_upp.start_processing()

for(var/i in GLOB.closet_list) //Set up special equipment for lockers and vendors, depending on gamemode
var/obj/structure/closet/C = i
Expand Down
33 changes: 32 additions & 1 deletion code/game/supplyshuttle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ GLOBAL_SUBTYPE_PATHS_LIST_INDEXED(supply_packs_types, /datum/supply_packs, name)
GLOBAL_REFERENCE_LIST_INDEXED_SORTED(supply_packs_datums, /datum/supply_packs, type)

GLOBAL_DATUM_INIT(supply_controller, /datum/controller/supply, new())
GLOBAL_DATUM_INIT(supply_controller_upp, /datum/controller/supply, new())
GLOBAL_DATUM_INIT(supply_controller_upp, /datum/controller/supply/upp, new())

/area/supply
ceiling = CEILING_METAL
Expand Down Expand Up @@ -1325,6 +1325,13 @@ GLOBAL_DATUM_INIT(supply_controller_upp, /datum/controller/supply, new())

frequency.post_signal(src, status_signal)

/obj/structure/machinery/computer/supplycomp/upp
name = "UPP supply console"

/obj/structure/machinery/computer/supplycomp/upp/Initialize()
. = ..()
linked_supply_controller = GLOB.supply_controller_upp

/obj/structure/machinery/computer/supplycomp/vehicle
name = "vehicle ASRS console"
desc = "A console for an Automated Storage and Retrieval System. This one is tied to a deep storage unit for vehicles."
Expand Down Expand Up @@ -1499,3 +1506,27 @@ GLOBAL_DATUM_INIT(supply_controller_upp, /datum/controller/supply, new())

add_fingerprint(usr)
updateUsrDialog()

/datum/controller/supply/upp
all_supply_groups = list(
"Operations",
"Weapons",
"Vehicle Ammo",
"Vehicle Equipment",
"Attachments",
"Ammo",
"Weapons Specialist Ammo",
"Restricted Equipment",
"Clothing",
"Medical",
"Engineering",
"Research",
"Supplies",
"Food",
"Gear",
"Mortar",
"Explosives",
"Reagent tanks",
)

/datum/controller/supply/upp
2 changes: 1 addition & 1 deletion maps/map_files/USS_Almayer/USS_Almayer.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -9619,7 +9619,7 @@
/turf/open/floor/almayer,
/area/almayer/squads/req)
"bpT" = (
/obj/structure/machinery/computer/supplycomp,
/obj/structure/machinery/computer/supplycomp/upp,
/turf/open/floor/almayer/green/north,
/area/almayer/squads/req)
"bpV" = (
Expand Down

0 comments on commit 6a43ea3

Please sign in to comment.