From 1e49f4bdb50ce36967e87b13430b676cc2a94267 Mon Sep 17 00:00:00 2001
From: Killian <49700375+KillianKirilenko@users.noreply.github.com>
Date: Thu, 22 Aug 2024 11:00:14 +0100
Subject: [PATCH] Supply System Updates (#16161)
* supply system updates
* supply system updates
* Update vorestation.dme
---
code/__defines/color.dm | 4 +
code/controllers/subsystems/supply.dm | 50 ++-
code/datums/supplypacks/atmospherics.dm | 17 -
code/datums/supplypacks/contraband.dm | 35 ++
code/datums/supplypacks/contraband_vr.dm | 34 --
code/datums/supplypacks/costumes.dm | 418 +++++++++++++++++-
code/datums/supplypacks/costumes_vr.dm | 415 -----------------
code/datums/supplypacks/engineering.dm | 57 +++
code/datums/supplypacks/engineering_vr.dm | 56 ---
code/datums/supplypacks/hospitality.dm | 118 ++++-
code/datums/supplypacks/hospitality_vr.dm | 122 -----
code/datums/supplypacks/hydroponics.dm | 79 ++++
code/datums/supplypacks/hydroponics_vr.dm | 79 ----
code/datums/supplypacks/medical.dm | 53 ++-
code/datums/supplypacks/medical_vr.dm | 53 ---
code/datums/supplypacks/misc.dm | 105 +++++
code/datums/supplypacks/misc_vr.dm | 87 ----
code/datums/supplypacks/munitions.dm | 75 +++-
code/datums/supplypacks/munitions_vr.dm | 72 ---
code/datums/supplypacks/recreation.dm | 173 ++++++++
code/datums/supplypacks/recreation_vr.dm | 172 -------
code/datums/supplypacks/robotics.dm | 74 ++++
code/datums/supplypacks/robotics_vr.dm | 73 ---
code/datums/supplypacks/science.dm | 50 ++-
code/datums/supplypacks/science_vr.dm | 46 --
code/datums/supplypacks/security.dm | 55 +++
code/datums/supplypacks/security_vr.dm | 56 ---
code/datums/supplypacks/supply.dm | 21 +-
code/datums/supplypacks/supply_vr.dm | 7 -
...nding_refills_vr.dm => vending_refills.dm} | 0
code/datums/supplypacks/voidsuits.dm | 155 ++++++-
code/datums/supplypacks/voidsuits_vr.dm | 152 -------
code/game/objects/random/mapping.dm | 317 +++++++++++++
.../_closets_appearance_definitions.dm | 134 +++++-
.../_closets_appearance_definitions_vr.dm | 106 -----
.../structures/crates_lockers/crates.dm | 12 +
icons/obj/closets/decals/crate.dmi | Bin 3656 -> 4341 bytes
vorestation.dme | 19 +-
38 files changed, 1951 insertions(+), 1600 deletions(-)
delete mode 100644 code/datums/supplypacks/contraband_vr.dm
delete mode 100644 code/datums/supplypacks/costumes_vr.dm
delete mode 100644 code/datums/supplypacks/engineering_vr.dm
delete mode 100644 code/datums/supplypacks/hospitality_vr.dm
delete mode 100644 code/datums/supplypacks/hydroponics_vr.dm
delete mode 100644 code/datums/supplypacks/medical_vr.dm
delete mode 100644 code/datums/supplypacks/misc_vr.dm
delete mode 100644 code/datums/supplypacks/munitions_vr.dm
delete mode 100644 code/datums/supplypacks/recreation_vr.dm
delete mode 100644 code/datums/supplypacks/robotics_vr.dm
delete mode 100644 code/datums/supplypacks/science_vr.dm
delete mode 100644 code/datums/supplypacks/security_vr.dm
delete mode 100644 code/datums/supplypacks/supply_vr.dm
rename code/datums/supplypacks/{vending_refills_vr.dm => vending_refills.dm} (100%)
delete mode 100644 code/datums/supplypacks/voidsuits_vr.dm
delete mode 100644 code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm
diff --git a/code/__defines/color.dm b/code/__defines/color.dm
index baae616b340..43baf63abd6 100644
--- a/code/__defines/color.dm
+++ b/code/__defines/color.dm
@@ -92,6 +92,10 @@
#define COLOR_LIGHT_VIOLET "#e7bfff"
#define COLOR_SAN_MARINO_BLUE "#4b75ab"
#define COLOR_HALF_TRANSPARENT_BLACK "#0000007A"
+#define COLOR_NUKIES_GREEN "#43fe00"
+#define COLOR_NUKIES_YELLOW "#ffe900"
+#define COLOR_DESATTI_PRPLOW "#3300cc"
+#define COLOR_DESATTI_PRPHI "#6600cc"
#define PIPE_COLOR_GREY "#808080"
#define PIPE_COLOR_RED "#ff0000"
diff --git a/code/controllers/subsystems/supply.dm b/code/controllers/subsystems/supply.dm
index c30d559e4ba..59d4f606b5b 100644
--- a/code/controllers/subsystems/supply.dm
+++ b/code/controllers/subsystems/supply.dm
@@ -13,7 +13,7 @@ SUBSYSTEM_DEF(supply)
var/points_per_slip = 2
var/points_per_money = 0.02 // 1 point for $50
//control
- var/ordernum
+ var/ordernum = 0 // Start at zero, it's per-shift tracking
var/list/shoppinglist = list() // Approved orders
var/list/supply_pack = list() // All supply packs
var/list/exported_crates = list() // Crates sent from the station
@@ -25,8 +25,6 @@ SUBSYSTEM_DEF(supply)
var/datum/shuttle/autodock/ferry/supply/shuttle
/datum/controller/subsystem/supply/Initialize()
- ordernum = rand(1,9000)
-
// build master supply list
for(var/typepath in subtypesof(/datum/supply_pack))
var/datum/supply_pack/P = new typepath()
@@ -186,13 +184,31 @@ SUBSYSTEM_DEF(supply)
var/datum/supply_pack/SP = SO.object
shopping_log += "[SP.name];"
- var/obj/A = new SP.containertype(pickedloc)
- A.name = "[SP.containername] [SO.comment ? "([SO.comment])":"" ]"
+ var/obj/A
+ if(SP.containertype)
+ A = new SP.containertype(pickedloc)
+ A.name = "[SP.containername] [SO.comment ? "([SO.comment])":"" ]"
+ if(SP.access)
+ if(isnum(SP.access))
+ A.req_access = list(SP.access)
+ else if(islist(SP.access) && SP.one_access)
+ var/list/L = SP.access // access var is a plain var, we need a list
+ A.req_one_access = L.Copy()
+ LAZYCLEARLIST(A.req_access)
+ else if(islist(SP.access) && !SP.one_access)
+ var/list/L = SP.access
+ A.req_access = L.Copy()
+ LAZYCLEARLIST(A.req_one_access)
+ else
+ log_debug("Supply pack with invalid access restriction [SP.access] encountered!")
//supply manifest generation begin
var/obj/item/weapon/paper/manifest/slip
if(!SP.contraband)
- slip = new /obj/item/weapon/paper/manifest(A)
+ if(A)
+ slip = new /obj/item/weapon/paper/manifest(A)
+ else
+ slip = new /obj/item/weapon/paper/manifest(pickedloc)
slip.is_copy = 0
slip.info = "[command_name()] Shipping Manifest
"
slip.info +="Order #[SO.ordernum]
"
@@ -200,21 +216,6 @@ SUBSYSTEM_DEF(supply)
slip.info +="[orderedamount] PACKAGES IN THIS SHIPMENT
"
slip.info +="CONTENTS:
"
- //spawn the stuff, finish generating the manifest while you're at it
- if(SP.access)
- if(isnum(SP.access))
- A.req_access = list(SP.access)
- else if(islist(SP.access) && SP.one_access)
- var/list/L = SP.access // access var is a plain var, we need a list
- A.req_one_access = L.Copy()
- LAZYCLEARLIST(A.req_access)
- else if(islist(SP.access) && !SP.one_access)
- var/list/L = SP.access
- A.req_access = L.Copy()
- LAZYCLEARLIST(A.req_one_access)
- else
- log_debug("Supply pack with invalid access restriction [SP.access] encountered!")
-
var/list/contains
if(istype(SP,/datum/supply_pack/randomised))
var/datum/supply_pack/randomised/SPR = SP
@@ -231,7 +232,12 @@ SUBSYSTEM_DEF(supply)
var/number_of_items = max(1, contains[typepath])
for(var/j = 1 to number_of_items)
- var/atom/B2 = new typepath(A)
+ var/atom/B2
+ if(A)
+ B2 = new typepath(A)
+ else
+ B2 = new typepath(pickedloc)
+
if(slip)
slip.info += "- [B2.name]
" //add the item to the manifest
diff --git a/code/datums/supplypacks/atmospherics.dm b/code/datums/supplypacks/atmospherics.dm
index d86e8db9c63..13ca4cf1a95 100644
--- a/code/datums/supplypacks/atmospherics.dm
+++ b/code/datums/supplypacks/atmospherics.dm
@@ -17,53 +17,36 @@
/datum/supply_pack/atmos/canister_empty
name = "Empty gas canister"
cost = 7
- containername = "Empty gas canister crate"
- containertype = /obj/structure/closet/crate/large/aether
contains = list(/obj/machinery/portable_atmospherics/canister)
/datum/supply_pack/atmos/canister_air
name = "Air canister"
cost = 10
- containername = "Air canister crate"
- containertype = /obj/structure/closet/crate/large/aether
contains = list(/obj/machinery/portable_atmospherics/canister/air)
/datum/supply_pack/atmos/canister_oxygen
name = "Oxygen canister"
cost = 15
- containername = "Oxygen canister crate"
- containertype = /obj/structure/closet/crate/large/aether
contains = list(/obj/machinery/portable_atmospherics/canister/oxygen)
/datum/supply_pack/atmos/canister_nitrogen
name = "Nitrogen canister"
cost = 10
- containername = "Nitrogen canister crate"
- containertype = /obj/structure/closet/crate/large/aether
contains = list(/obj/machinery/portable_atmospherics/canister/nitrogen)
/datum/supply_pack/atmos/canister_phoron
name = "Phoron gas canister"
cost = 60
- containername = "Phoron gas canister crate"
- containertype = /obj/structure/closet/crate/secure/large/aether
- access = access_atmospherics
contains = list(/obj/machinery/portable_atmospherics/canister/phoron)
/datum/supply_pack/atmos/canister_nitrous_oxide
name = "N2O gas canister"
cost = 15
- containername = "N2O gas canister crate"
- containertype = /obj/structure/closet/crate/secure/large/aether
- access = access_atmospherics
contains = list(/obj/machinery/portable_atmospherics/canister/nitrous_oxide)
/datum/supply_pack/atmos/canister_carbon_dioxide
name = "Carbon dioxide gas canister"
cost = 15
- containername = "CO2 canister crate"
- containertype = /obj/structure/closet/crate/secure/large/aether
- access = access_atmospherics
contains = list(/obj/machinery/portable_atmospherics/canister/carbon_dioxide)
/datum/supply_pack/atmos/air_dispenser
diff --git a/code/datums/supplypacks/contraband.dm b/code/datums/supplypacks/contraband.dm
index 7d8616a8ad0..4fa09605dba 100644
--- a/code/datums/supplypacks/contraband.dm
+++ b/code/datums/supplypacks/contraband.dm
@@ -105,3 +105,38 @@
contraband = 1
containertype = /obj/structure/closet/crate/large
containername = "Suspicious crate"
+
+/datum/supply_pack/supply/stolen
+ name = "Stolen supply crate"
+ contains = list(/obj/item/stolenpackage = 1)
+ cost = 150
+ containertype = /obj/structure/closet/crate
+ containername = "Stolen crate"
+ contraband = 1
+
+/datum/supply_pack/supply/wolfgirl
+ name = "Wolfgirl Crate"
+ cost = 200 //I mean, it's a whole wolfgirl
+ containertype = /obj/structure/largecrate/animal/wolfgirl
+ containername = "Wolfgirl crate"
+ contraband = 1
+
+/datum/supply_pack/supply/catgirl
+ name = "Catgirl Crate"
+ cost = 200 //I mean, it's a whole catgirl
+ containertype = /obj/structure/largecrate/animal/catgirl
+ containername = "Catgirl crate"
+ contraband = 1
+
+/datum/supply_pack/randomised/hospitality/pizzavouchers //WE ALWAYS DELIVER WE ALWAYS DELIVER WE ALWAYS DELIVER WE ALWAYS DELIVER WE ALWAYS DELIVER
+ num_contained = 3
+ contains = list(
+ /obj/item/pizzavoucher,
+ /obj/item/pizzavoucher,
+ /obj/item/pizzavoucher
+ )
+ name = "FANTASTIC PIZZA PIE VOUCHER CRATE!"
+ cost = 60
+ containertype = /obj/structure/closet/crate
+ containername = "WE ALWAYS DELIVER!"
+ contraband = 1
diff --git a/code/datums/supplypacks/contraband_vr.dm b/code/datums/supplypacks/contraband_vr.dm
deleted file mode 100644
index e5e1d256988..00000000000
--- a/code/datums/supplypacks/contraband_vr.dm
+++ /dev/null
@@ -1,34 +0,0 @@
-/datum/supply_pack/supply/stolen
- name = "Stolen supply crate"
- contains = list(/obj/item/stolenpackage = 1)
- cost = 150
- containertype = /obj/structure/closet/crate
- containername = "Stolen crate"
- contraband = 1
-
-/datum/supply_pack/supply/wolfgirl
- name = "Wolfgirl Crate"
- cost = 200 //I mean, it's a whole wolfgirl
- containertype = /obj/structure/largecrate/animal/wolfgirl
- containername = "Wolfgirl crate"
- contraband = 1
-
-/datum/supply_pack/supply/catgirl
- name = "Catgirl Crate"
- cost = 200 //I mean, it's a whole catgirl
- containertype = /obj/structure/largecrate/animal/catgirl
- containername = "Catgirl crate"
- contraband = 1
-
-/datum/supply_pack/randomised/hospitality/pizzavouchers //WE ALWAYS DELIVER WE ALWAYS DELIVER WE ALWAYS DELIVER WE ALWAYS DELIVER WE ALWAYS DELIVER
- num_contained = 3
- contains = list(
- /obj/item/pizzavoucher,
- /obj/item/pizzavoucher,
- /obj/item/pizzavoucher
- )
- name = "FANTASTIC PIZZA PIE VOUCHER CRATE!"
- cost = 60
- containertype = /obj/structure/closet/crate
- containername = "WE ALWAYS DELIVER!"
- contraband = 1
diff --git a/code/datums/supplypacks/costumes.dm b/code/datums/supplypacks/costumes.dm
index 1cf5292f9f1..6bdb9adce8e 100644
--- a/code/datums/supplypacks/costumes.dm
+++ b/code/datums/supplypacks/costumes.dm
@@ -164,4 +164,420 @@
/obj/item/clothing/under/dress/dress_orange,
/obj/item/clothing/under/dress/dress_yellow,
/obj/item/clothing/under/dress/dress_saloon
- )
\ No newline at end of file
+ )
+
+/datum/supply_pack/costumes/xenowear_vr
+ name = "Xenowear crate"
+ contains = list(
+ /obj/item/clothing/shoes/footwraps,
+ /obj/item/clothing/shoes/boots/jackboots/toeless,
+ /obj/item/clothing/shoes/boots/workboots/toeless,
+ /obj/item/clothing/suit/tajaran/furs,
+ /obj/item/clothing/head/tajaran/scarf,
+ /obj/item/clothing/suit/unathi/robe,
+ /obj/item/clothing/suit/unathi/mantle,
+ /obj/item/clothing/under/permit,
+ /obj/item/clothing/under/vox/vox_casual,
+ /obj/item/clothing/under/vox/vox_robes,
+ /obj/item/clothing/under/harness,
+ /obj/item/clothing/under/skirt/loincloth,
+ /obj/item/clothing/gloves/vox
+ )
+ cost = 100
+ containertype = /obj/structure/closet/crate
+ containername = "Xenowear crate"
+
+/datum/supply_pack/costumes/tesh_smocks_vr
+ name = "Teshari smocks"
+ num_contained = 4
+ contains = list(
+ /obj/item/clothing/under/teshari/smock,
+ /obj/item/clothing/under/teshari/smock/white,
+ /obj/item/clothing/under/teshari/smock/red,
+ /obj/item/clothing/under/teshari/smock/yellow,
+ /obj/item/clothing/under/teshari/smock/rainbow,
+ /obj/item/clothing/under/teshari/smock/dress,
+ /obj/item/clothing/under/teshari/smock/blackutilitysmock,
+ /obj/item/clothing/under/teshari/smock/greydress,
+ /obj/item/clothing/under/teshari/smock/blackutility,
+ /obj/item/clothing/under/teshari/smock/bluegreydress
+ )
+ cost = 20
+ containertype = /obj/structure/closet/crate
+ containername = "Teshari smocks crate"
+
+/datum/supply_pack/randomised/costumes/tesh_coats_vr
+ name = "Teshari undercoats"
+ num_contained = 4
+ contains = list(
+ /obj/item/clothing/under/teshari/undercoat/standard/orange_grey,
+ /obj/item/clothing/under/teshari/undercoat/standard/rainbow,
+ /obj/item/clothing/under/teshari/undercoat/standard/lightgrey_grey,
+ /obj/item/clothing/under/teshari/undercoat/standard/white_grey,
+ /obj/item/clothing/under/teshari/undercoat/standard/red_grey,
+ /obj/item/clothing/under/teshari/undercoat/standard/orange,
+ /obj/item/clothing/under/teshari/undercoat/standard/yellow_grey,
+ /obj/item/clothing/under/teshari/undercoat/standard/green_grey,
+ /obj/item/clothing/under/teshari/undercoat/standard/blue_grey,
+ /obj/item/clothing/under/teshari/undercoat/standard/purple_grey,
+ /obj/item/clothing/under/teshari/undercoat/standard/pink_grey,
+ /obj/item/clothing/under/teshari/undercoat/standard/brown_grey
+ )
+ cost = 20
+ containertype = /obj/structure/closet/crate
+ containername = "Teshari undercoats crate"
+
+/datum/supply_pack/randomised/costumes/tesh_coats_b_vr
+ name = "Teshari undercoats (black)"
+ num_contained = 4
+ contains = list(
+ /obj/item/clothing/under/teshari/undercoat,
+ /obj/item/clothing/under/teshari/undercoat/standard/black_orange,
+ /obj/item/clothing/under/teshari/undercoat/standard/black_grey,
+ /obj/item/clothing/under/teshari/undercoat/standard/black_white,
+ /obj/item/clothing/under/teshari/undercoat/standard/black_red,
+ /obj/item/clothing/under/teshari/undercoat/standard/black,
+ /obj/item/clothing/under/teshari/undercoat/standard/black_yellow,
+ /obj/item/clothing/under/teshari/undercoat/standard/black_green,
+ /obj/item/clothing/under/teshari/undercoat/standard/black_blue,
+ /obj/item/clothing/under/teshari/undercoat/standard/black_purple,
+ /obj/item/clothing/under/teshari/undercoat/standard/black_pink,
+ /obj/item/clothing/under/teshari/undercoat/standard/black_brown
+ )
+ cost = 20
+ containertype = /obj/structure/closet/crate
+ containername = "Teshari undercoats crate"
+
+/datum/supply_pack/randomised/costumes/tesh_cloaks_vr
+ name = "Teshari cloaks"
+ num_contained = 4
+ contains = list(
+ /obj/item/clothing/suit/storage/teshari/cloak/standard/white,
+ /obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey,
+ /obj/item/clothing/suit/storage/teshari/cloak/standard/red_grey,
+ /obj/item/clothing/suit/storage/teshari/cloak/standard/orange_grey,
+ /obj/item/clothing/suit/storage/teshari/cloak/standard/yellow_grey,
+ /obj/item/clothing/suit/storage/teshari/cloak/standard/green_grey,
+ /obj/item/clothing/suit/storage/teshari/cloak/standard/blue_grey,
+ /obj/item/clothing/suit/storage/teshari/cloak/standard/purple_grey,
+ /obj/item/clothing/suit/storage/teshari/cloak/standard/pink_grey,
+ /obj/item/clothing/suit/storage/teshari/cloak/standard/brown_grey,
+ /obj/item/clothing/suit/storage/teshari/cloak/standard/rainbow,
+ /obj/item/clothing/suit/storage/teshari/cloak/standard/orange
+ )
+ cost = 40
+ containertype = /obj/structure/closet/crate
+ containername = "Teshari cloaks crate"
+
+/datum/supply_pack/randomised/costumes/tesh_cloaks_b_vr
+ name = "Teshari cloaks (black)"
+ num_contained = 4
+ contains = list(
+ /obj/item/clothing/suit/storage/teshari/cloak,
+ /obj/item/clothing/suit/storage/teshari/cloak/standard/black_red,
+ /obj/item/clothing/suit/storage/teshari/cloak/standard/black_orange,
+ /obj/item/clothing/suit/storage/teshari/cloak/standard/black_yellow,
+ /obj/item/clothing/suit/storage/teshari/cloak/standard/black_green,
+ /obj/item/clothing/suit/storage/teshari/cloak/standard/black_blue,
+ /obj/item/clothing/suit/storage/teshari/cloak/standard/black_purple,
+ /obj/item/clothing/suit/storage/teshari/cloak/standard/black_pink,
+ /obj/item/clothing/suit/storage/teshari/cloak/standard/black_brown,
+ /obj/item/clothing/suit/storage/teshari/cloak/standard/black_grey,
+ /obj/item/clothing/suit/storage/teshari/cloak/standard/black_white,
+ /obj/item/clothing/suit/storage/teshari/cloak/standard/black_glow,
+ /obj/item/clothing/suit/storage/teshari/cloak/standard/dark_retrowave
+ )
+ cost = 40
+ containertype = /obj/structure/closet/crate
+ containername = "Teshari cloaks crate"
+
+/datum/supply_pack/costumes/tesh_worksuits_vr
+ name = "Teshari worksuits"
+ num_contained = 4
+ contains = list(
+ /obj/item/clothing/under/teshari/undercoat/standard/worksuit,
+ /obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackpurple,
+ /obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackorange,
+ /obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackblue,
+ /obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackgreen,
+ /obj/item/clothing/under/teshari/undercoat/standard/worksuit/whitered,
+ /obj/item/clothing/under/teshari/undercoat/standard/worksuit/whitepurple,
+ /obj/item/clothing/under/teshari/undercoat/standard/worksuit/whiteorange,
+ /obj/item/clothing/under/teshari/undercoat/standard/worksuit/whiteblue,
+ /obj/item/clothing/under/teshari/undercoat/standard/worksuit/whitegreen
+ )
+ cost = 20
+ containertype = /obj/structure/closet/crate
+ containername = "Teshari worksuits crate"
+
+/datum/supply_pack/randomised/costumes/tesh_beltcloaks_vr
+ name = "Teshari cloaks (belted)"
+ num_contained = 4
+ contains = list(
+ /obj/item/clothing/suit/storage/teshari/beltcloak/standard/orange_grey,
+ /obj/item/clothing/suit/storage/teshari/beltcloak/standard/rainbow,
+ /obj/item/clothing/suit/storage/teshari/beltcloak/standard/lightgrey_grey,
+ /obj/item/clothing/suit/storage/teshari/beltcloak/standard/white_grey,
+ /obj/item/clothing/suit/storage/teshari/beltcloak/standard/red_grey,
+ /obj/item/clothing/suit/storage/teshari/beltcloak/standard/orange,
+ /obj/item/clothing/suit/storage/teshari/beltcloak/standard/yellow_grey,
+ /obj/item/clothing/suit/storage/teshari/beltcloak/standard/green_grey,
+ /obj/item/clothing/suit/storage/teshari/beltcloak/standard/blue_grey,
+ /obj/item/clothing/suit/storage/teshari/beltcloak/standard/purple_grey,
+ /obj/item/clothing/suit/storage/teshari/beltcloak/standard/pink_grey,
+ /obj/item/clothing/suit/storage/teshari/beltcloak/standard/brown_grey
+ )
+ cost = 40
+ containertype = /obj/structure/closet/crate
+ containername = "Teshari cloaks crate"
+
+/datum/supply_pack/randomised/costumes/tesh_beltcloaks_b_vr
+ name = "Teshari cloaks (belted, black)"
+ num_contained = 4
+ contains = list(
+ /obj/item/clothing/suit/storage/teshari/beltcloak,
+ /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_orange,
+ /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_grey,
+ /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_midgrey,
+ /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_lightgrey,
+ /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_white,
+ /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_red,
+ /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black,
+ /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_yellow,
+ /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_green,
+ /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_blue,
+ /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_purple,
+ /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_pink,
+ /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_brown
+ )
+ cost = 40
+ containertype = /obj/structure/closet/crate
+ containername = "Teshari cloaks crate"
+
+/datum/supply_pack/randomised/costumes/tesh_hoodcloaks_vr
+ name = "Teshari cloaks (hooded)"
+ num_contained = 4
+ contains = list(
+ /obj/item/clothing/suit/storage/hooded/teshari/standard/orange_grey,
+ /obj/item/clothing/suit/storage/hooded/teshari/standard/lightgrey_grey,
+ /obj/item/clothing/suit/storage/hooded/teshari/standard/white_grey,
+ /obj/item/clothing/suit/storage/hooded/teshari/standard/red_grey,
+ /obj/item/clothing/suit/storage/hooded/teshari/standard/orange,
+ /obj/item/clothing/suit/storage/hooded/teshari/standard/yellow_grey,
+ /obj/item/clothing/suit/storage/hooded/teshari/standard/green_grey,
+ /obj/item/clothing/suit/storage/hooded/teshari/standard/blue_grey,
+ /obj/item/clothing/suit/storage/hooded/teshari/standard/purple_grey,
+ /obj/item/clothing/suit/storage/hooded/teshari/standard/pink_grey,
+ /obj/item/clothing/suit/storage/hooded/teshari/standard/brown_grey
+ )
+ cost = 40
+ containertype = /obj/structure/closet/crate
+ containername = "Teshari cloaks crate"
+
+/datum/supply_pack/randomised/costumes/tesh_hoodcloaks_b_vr
+ name = "Teshari cloaks (hooded, black)"
+ num_contained = 4
+ contains = list(
+ /obj/item/clothing/suit/storage/hooded/teshari,
+ /obj/item/clothing/suit/storage/hooded/teshari/standard/black_orange,
+ /obj/item/clothing/suit/storage/hooded/teshari/standard/black_grey,
+ /obj/item/clothing/suit/storage/hooded/teshari/standard/black_midgrey,
+ /obj/item/clothing/suit/storage/hooded/teshari/standard/black_lightgrey,
+ /obj/item/clothing/suit/storage/hooded/teshari/standard/black_white,
+ /obj/item/clothing/suit/storage/hooded/teshari/standard/black_red,
+ /obj/item/clothing/suit/storage/hooded/teshari/standard/black,
+ /obj/item/clothing/suit/storage/hooded/teshari/standard/black_yellow,
+ /obj/item/clothing/suit/storage/hooded/teshari/standard/black_green,
+ /obj/item/clothing/suit/storage/hooded/teshari/standard/black_blue,
+ /obj/item/clothing/suit/storage/hooded/teshari/standard/black_purple,
+ /obj/item/clothing/suit/storage/hooded/teshari/standard/black_pink,
+ /obj/item/clothing/suit/storage/hooded/teshari/standard/black_brown
+ )
+ cost = 40
+ containertype = /obj/structure/closet/crate
+ containername = "Teshari cloaks crate"
+
+/datum/supply_pack/costumes/utility_vr
+ name = "Utility uniforms"
+ contains = list(
+ /obj/item/clothing/under/utility,
+ /obj/item/clothing/under/utility/blue,
+ /obj/item/clothing/under/utility/grey
+ )
+ cost = 30
+ containertype = /obj/structure/closet/crate
+ containername = "Utility uniforms crate"
+
+/datum/supply_pack/costumes/skirts_vr
+ name = "Skirts crate"
+ contains = list(
+ /obj/item/clothing/under/skirt,
+ /obj/item/clothing/under/skirt/blue,
+ /obj/item/clothing/under/skirt/denim,
+ /obj/item/clothing/under/skirt/khaki,
+ /obj/item/clothing/under/skirt/outfit,
+ /obj/item/clothing/under/skirt/red,
+ /obj/item/clothing/under/skirt/swept,
+ /obj/item/clothing/under/skirt/outfit/plaid_blue,
+ /obj/item/clothing/under/skirt/outfit/plaid_purple,
+ /obj/item/clothing/under/skirt/outfit/plaid_red
+ )
+ cost = 40
+ containertype = /obj/structure/closet/crate
+ containername = "Skirts crate"
+
+/datum/supply_pack/costumes/varsity_vr
+ name = "Varsity jackets"
+ contains = list(
+ /obj/item/clothing/suit/varsity,
+ /obj/item/clothing/suit/varsity/blue,
+ /obj/item/clothing/suit/varsity/brown,
+ /obj/item/clothing/suit/varsity/green,
+ /obj/item/clothing/suit/varsity/purple,
+ /obj/item/clothing/suit/varsity/red
+ )
+ cost = 60
+ containertype = /obj/structure/closet/crate
+ containername = "Varsity jackets crate"
+
+/datum/supply_pack/randomised/costumes/leathergear_vr
+ name = "Leather gear"
+ num_contained = 5
+ contains = list(
+ /obj/item/clothing/suit/leathercoat,
+ /obj/item/clothing/suit/storage/leather_jacket_alt,
+ /obj/item/clothing/suit/storage/toggle/leather_jacket,
+ /obj/item/clothing/suit/storage/toggle/leather_jacket/sleeveless,
+ /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen,
+ /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen/sleeveless,
+ /obj/item/clothing/under/pants/chaps,
+ /obj/item/clothing/under/pants/chaps/black,
+ /obj/item/clothing/under/harness,
+ /obj/item/clothing/shoes/laceup/brown,
+ /obj/item/clothing/shoes/boots/jungle,
+ /obj/item/clothing/shoes/boots/jackboots,
+ /obj/item/clothing/shoes/boots/cowboy,
+ /obj/item/clothing/shoes/boots/cowboy/classic,
+ /obj/item/clothing/shoes/boots/cowboy/snakeskin,
+ /obj/item/clothing/accessory/chaps,
+ /obj/item/clothing/accessory/chaps/black,
+ /obj/item/clothing/accessory/collar/spike,
+ /obj/item/clothing/gloves/fingerless,
+ /obj/item/clothing/gloves/botanic_leather,
+ /obj/item/clothing/head/cowboy,
+ /obj/item/clothing/head/cowboy/bandit,
+ /obj/item/clothing/accessory/cowboy_vest/brown,
+ /obj/item/clothing/accessory/cowboy_vest/grey
+ )
+ cost = 50
+ containertype = /obj/structure/closet/crate
+ containername = "Leather gear crate"
+
+/datum/supply_pack/costumes/eyewear_vr
+ name = "Eyewear crate"
+ contains = list(
+ /obj/item/clothing/glasses/eyepatch,
+ /obj/item/clothing/glasses/fakesunglasses,
+ /obj/item/clothing/glasses/fakesunglasses/aviator,
+ /obj/item/clothing/glasses/fluff/science_proper,
+ /obj/item/clothing/glasses/fluff/spiffygogs,
+ /obj/item/clothing/glasses/gglasses,
+ /obj/item/clothing/glasses/monocle,
+ /obj/item/clothing/glasses/regular,
+ /obj/item/clothing/glasses/regular/hipster,
+ /obj/item/clothing/glasses/regular/scanners,
+ /obj/item/clothing/glasses/threedglasses
+ )
+ cost = 50
+ containertype = /obj/structure/closet/crate
+ containername = "Eyewear crate"
+
+/datum/supply_pack/randomised/costumes/gloves_vr
+ name = "Gloves crate"
+ num_contained = 4
+ contains = list(
+ /obj/item/clothing/gloves/black,
+ /obj/item/clothing/gloves/blue,
+ /obj/item/clothing/gloves/botanic_leather,
+ /obj/item/clothing/gloves/brown,
+ /obj/item/clothing/gloves/evening,
+ /obj/item/clothing/gloves/fingerless,
+ /obj/item/clothing/gloves/fyellow,
+ /obj/item/clothing/gloves/green,
+ /obj/item/clothing/gloves/grey,
+ /obj/item/clothing/gloves/light_brown,
+ /obj/item/clothing/gloves/orange,
+ /obj/item/clothing/gloves/purple,
+ /obj/item/clothing/gloves/rainbow,
+ /obj/item/clothing/gloves/red,
+ /obj/item/clothing/gloves/white
+ )
+ cost = 40
+ containertype = /obj/structure/closet/crate
+ containername = "Gloves crate"
+
+/datum/supply_pack/randomised/costumes/boots_vr
+ name = "Boots crate"
+ num_contained = 3
+ contains = list(
+ /obj/item/clothing/shoes/boots/workboots,
+ /obj/item/clothing/shoes/boots/cowboy,
+ /obj/item/clothing/shoes/boots/cowboy/classic,
+ /obj/item/clothing/shoes/boots/cowboy/snakeskin,
+ /obj/item/clothing/shoes/boots/duty,
+ /obj/item/clothing/shoes/boots/jackboots,
+ /obj/item/clothing/shoes/boots/jungle,
+ /obj/item/clothing/shoes/boots/winter
+ )
+ cost = 60
+ containertype = /obj/structure/closet/crate
+ containername = "Boots crate"
+
+/datum/supply_pack/costumes/taurbags
+ name = "Saddlebags crate"
+ contains = list(
+ /obj/item/weapon/storage/backpack/saddlebag_common,
+ /obj/item/weapon/storage/backpack/saddlebag_common/robust,
+ /obj/item/weapon/storage/backpack/saddlebag_common/vest
+ )
+ cost = 60
+ containertype = /obj/structure/closet/crate
+ containername = "Saddlebags crate"
+
+/datum/supply_pack/costumes/knights_gear
+ name = "Knights Gear"
+ contains = list(
+ /obj/item/clothing/suit/storage/hooded/knight_costume,
+ /obj/item/clothing/suit/storage/hooded/knight_costume/galahad,
+ /obj/item/clothing/suit/storage/hooded/knight_costume/lancelot,
+ /obj/item/clothing/suit/storage/hooded/knight_costume/robin,
+ /obj/item/clothing/suit/armor/combat/crusader_costume,
+ /obj/item/clothing/suit/armor/combat/crusader_costume/bedevere,
+ /obj/item/clothing/head/helmet/combat/crusader_costume,
+ /obj/item/clothing/head/helmet/combat/bedevere_costume,
+ /obj/item/clothing/gloves/combat/knight_costume,
+ /obj/item/clothing/gloves/combat/knight_costume/brown,
+ /obj/item/clothing/shoes/knight_costume,
+ /obj/item/clothing/shoes/knight_costume/black
+ )
+ cost = 10
+ containertype = /obj/structure/closet/crate
+ containername = "Knights Gear Crate"
+
+/datum/supply_pack/costumes/christmas
+ name = "Christmas costume pack"
+ contains = list(
+ /obj/item/clothing/head/santa,
+ /obj/item/clothing/head/santa/green,
+ /obj/item/clothing/suit/storage/hooded/wintercoat/christmasred,
+ /obj/item/clothing/suit/storage/hooded/wintercoat/christmasgreen,
+ /obj/item/clothing/under/christmas/red,
+ /obj/item/clothing/under/christmas/green,
+ /obj/item/clothing/under/christmas/croptop/red,
+ /obj/item/clothing/under/christmas/croptop/green,
+ /obj/item/clothing/shoes/boots/winter/christmasred,
+ /obj/item/clothing/shoes/boots/winter/christmasgreen
+ )
+ cost = 20
+ containertype = /obj/structure/closet/crate
+ containername = "Christmas costume pack"
diff --git a/code/datums/supplypacks/costumes_vr.dm b/code/datums/supplypacks/costumes_vr.dm
deleted file mode 100644
index 951f58fc8b9..00000000000
--- a/code/datums/supplypacks/costumes_vr.dm
+++ /dev/null
@@ -1,415 +0,0 @@
-/datum/supply_pack/costumes/xenowear_vr
- name = "Xenowear crate"
- contains = list(
- /obj/item/clothing/shoes/footwraps,
- /obj/item/clothing/shoes/boots/jackboots/toeless,
- /obj/item/clothing/shoes/boots/workboots/toeless,
- /obj/item/clothing/suit/tajaran/furs,
- /obj/item/clothing/head/tajaran/scarf,
- /obj/item/clothing/suit/unathi/robe,
- /obj/item/clothing/suit/unathi/mantle,
- /obj/item/clothing/under/permit,
- /obj/item/clothing/under/vox/vox_casual,
- /obj/item/clothing/under/vox/vox_robes,
- /obj/item/clothing/under/harness,
- /obj/item/clothing/under/skirt/loincloth,
- /obj/item/clothing/gloves/vox
- )
- cost = 100
- containertype = /obj/structure/closet/crate
- containername = "Xenowear crate"
-
-/datum/supply_pack/costumes/tesh_smocks_vr
- name = "Teshari smocks"
- num_contained = 4
- contains = list(
- /obj/item/clothing/under/teshari/smock,
- /obj/item/clothing/under/teshari/smock/white,
- /obj/item/clothing/under/teshari/smock/red,
- /obj/item/clothing/under/teshari/smock/yellow,
- /obj/item/clothing/under/teshari/smock/rainbow,
- /obj/item/clothing/under/teshari/smock/dress,
- /obj/item/clothing/under/teshari/smock/blackutilitysmock,
- /obj/item/clothing/under/teshari/smock/greydress,
- /obj/item/clothing/under/teshari/smock/blackutility,
- /obj/item/clothing/under/teshari/smock/bluegreydress
- )
- cost = 20
- containertype = /obj/structure/closet/crate
- containername = "Teshari smocks crate"
-
-/datum/supply_pack/randomised/costumes/tesh_coats_vr
- name = "Teshari undercoats"
- num_contained = 4
- contains = list(
- /obj/item/clothing/under/teshari/undercoat/standard/orange_grey,
- /obj/item/clothing/under/teshari/undercoat/standard/rainbow,
- /obj/item/clothing/under/teshari/undercoat/standard/lightgrey_grey,
- /obj/item/clothing/under/teshari/undercoat/standard/white_grey,
- /obj/item/clothing/under/teshari/undercoat/standard/red_grey,
- /obj/item/clothing/under/teshari/undercoat/standard/orange,
- /obj/item/clothing/under/teshari/undercoat/standard/yellow_grey,
- /obj/item/clothing/under/teshari/undercoat/standard/green_grey,
- /obj/item/clothing/under/teshari/undercoat/standard/blue_grey,
- /obj/item/clothing/under/teshari/undercoat/standard/purple_grey,
- /obj/item/clothing/under/teshari/undercoat/standard/pink_grey,
- /obj/item/clothing/under/teshari/undercoat/standard/brown_grey
- )
- cost = 20
- containertype = /obj/structure/closet/crate
- containername = "Teshari undercoats crate"
-
-/datum/supply_pack/randomised/costumes/tesh_coats_b_vr
- name = "Teshari undercoats (black)"
- num_contained = 4
- contains = list(
- /obj/item/clothing/under/teshari/undercoat,
- /obj/item/clothing/under/teshari/undercoat/standard/black_orange,
- /obj/item/clothing/under/teshari/undercoat/standard/black_grey,
- /obj/item/clothing/under/teshari/undercoat/standard/black_white,
- /obj/item/clothing/under/teshari/undercoat/standard/black_red,
- /obj/item/clothing/under/teshari/undercoat/standard/black,
- /obj/item/clothing/under/teshari/undercoat/standard/black_yellow,
- /obj/item/clothing/under/teshari/undercoat/standard/black_green,
- /obj/item/clothing/under/teshari/undercoat/standard/black_blue,
- /obj/item/clothing/under/teshari/undercoat/standard/black_purple,
- /obj/item/clothing/under/teshari/undercoat/standard/black_pink,
- /obj/item/clothing/under/teshari/undercoat/standard/black_brown
- )
- cost = 20
- containertype = /obj/structure/closet/crate
- containername = "Teshari undercoats crate"
-
-/datum/supply_pack/randomised/costumes/tesh_cloaks_vr
- name = "Teshari cloaks"
- num_contained = 4
- contains = list(
- /obj/item/clothing/suit/storage/teshari/cloak/standard/white,
- /obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey,
- /obj/item/clothing/suit/storage/teshari/cloak/standard/red_grey,
- /obj/item/clothing/suit/storage/teshari/cloak/standard/orange_grey,
- /obj/item/clothing/suit/storage/teshari/cloak/standard/yellow_grey,
- /obj/item/clothing/suit/storage/teshari/cloak/standard/green_grey,
- /obj/item/clothing/suit/storage/teshari/cloak/standard/blue_grey,
- /obj/item/clothing/suit/storage/teshari/cloak/standard/purple_grey,
- /obj/item/clothing/suit/storage/teshari/cloak/standard/pink_grey,
- /obj/item/clothing/suit/storage/teshari/cloak/standard/brown_grey,
- /obj/item/clothing/suit/storage/teshari/cloak/standard/rainbow,
- /obj/item/clothing/suit/storage/teshari/cloak/standard/orange
- )
- cost = 40
- containertype = /obj/structure/closet/crate
- containername = "Teshari cloaks crate"
-
-/datum/supply_pack/randomised/costumes/tesh_cloaks_b_vr
- name = "Teshari cloaks (black)"
- num_contained = 4
- contains = list(
- /obj/item/clothing/suit/storage/teshari/cloak,
- /obj/item/clothing/suit/storage/teshari/cloak/standard/black_red,
- /obj/item/clothing/suit/storage/teshari/cloak/standard/black_orange,
- /obj/item/clothing/suit/storage/teshari/cloak/standard/black_yellow,
- /obj/item/clothing/suit/storage/teshari/cloak/standard/black_green,
- /obj/item/clothing/suit/storage/teshari/cloak/standard/black_blue,
- /obj/item/clothing/suit/storage/teshari/cloak/standard/black_purple,
- /obj/item/clothing/suit/storage/teshari/cloak/standard/black_pink,
- /obj/item/clothing/suit/storage/teshari/cloak/standard/black_brown,
- /obj/item/clothing/suit/storage/teshari/cloak/standard/black_grey,
- /obj/item/clothing/suit/storage/teshari/cloak/standard/black_white,
- /obj/item/clothing/suit/storage/teshari/cloak/standard/black_glow,
- /obj/item/clothing/suit/storage/teshari/cloak/standard/dark_retrowave
- )
- cost = 40
- containertype = /obj/structure/closet/crate
- containername = "Teshari cloaks crate"
-
-/datum/supply_pack/costumes/tesh_worksuits_vr
- name = "Teshari worksuits"
- num_contained = 4
- contains = list(
- /obj/item/clothing/under/teshari/undercoat/standard/worksuit,
- /obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackpurple,
- /obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackorange,
- /obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackblue,
- /obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackgreen,
- /obj/item/clothing/under/teshari/undercoat/standard/worksuit/whitered,
- /obj/item/clothing/under/teshari/undercoat/standard/worksuit/whitepurple,
- /obj/item/clothing/under/teshari/undercoat/standard/worksuit/whiteorange,
- /obj/item/clothing/under/teshari/undercoat/standard/worksuit/whiteblue,
- /obj/item/clothing/under/teshari/undercoat/standard/worksuit/whitegreen
- )
- cost = 20
- containertype = /obj/structure/closet/crate
- containername = "Teshari worksuits crate"
-
-/datum/supply_pack/randomised/costumes/tesh_beltcloaks_vr
- name = "Teshari cloaks (belted)"
- num_contained = 4
- contains = list(
- /obj/item/clothing/suit/storage/teshari/beltcloak/standard/orange_grey,
- /obj/item/clothing/suit/storage/teshari/beltcloak/standard/rainbow,
- /obj/item/clothing/suit/storage/teshari/beltcloak/standard/lightgrey_grey,
- /obj/item/clothing/suit/storage/teshari/beltcloak/standard/white_grey,
- /obj/item/clothing/suit/storage/teshari/beltcloak/standard/red_grey,
- /obj/item/clothing/suit/storage/teshari/beltcloak/standard/orange,
- /obj/item/clothing/suit/storage/teshari/beltcloak/standard/yellow_grey,
- /obj/item/clothing/suit/storage/teshari/beltcloak/standard/green_grey,
- /obj/item/clothing/suit/storage/teshari/beltcloak/standard/blue_grey,
- /obj/item/clothing/suit/storage/teshari/beltcloak/standard/purple_grey,
- /obj/item/clothing/suit/storage/teshari/beltcloak/standard/pink_grey,
- /obj/item/clothing/suit/storage/teshari/beltcloak/standard/brown_grey
- )
- cost = 40
- containertype = /obj/structure/closet/crate
- containername = "Teshari cloaks crate"
-
-/datum/supply_pack/randomised/costumes/tesh_beltcloaks_b_vr
- name = "Teshari cloaks (belted, black)"
- num_contained = 4
- contains = list(
- /obj/item/clothing/suit/storage/teshari/beltcloak,
- /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_orange,
- /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_grey,
- /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_midgrey,
- /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_lightgrey,
- /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_white,
- /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_red,
- /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black,
- /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_yellow,
- /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_green,
- /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_blue,
- /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_purple,
- /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_pink,
- /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_brown
- )
- cost = 40
- containertype = /obj/structure/closet/crate
- containername = "Teshari cloaks crate"
-
-/datum/supply_pack/randomised/costumes/tesh_hoodcloaks_vr
- name = "Teshari cloaks (hooded)"
- num_contained = 4
- contains = list(
- /obj/item/clothing/suit/storage/hooded/teshari/standard/orange_grey,
- /obj/item/clothing/suit/storage/hooded/teshari/standard/lightgrey_grey,
- /obj/item/clothing/suit/storage/hooded/teshari/standard/white_grey,
- /obj/item/clothing/suit/storage/hooded/teshari/standard/red_grey,
- /obj/item/clothing/suit/storage/hooded/teshari/standard/orange,
- /obj/item/clothing/suit/storage/hooded/teshari/standard/yellow_grey,
- /obj/item/clothing/suit/storage/hooded/teshari/standard/green_grey,
- /obj/item/clothing/suit/storage/hooded/teshari/standard/blue_grey,
- /obj/item/clothing/suit/storage/hooded/teshari/standard/purple_grey,
- /obj/item/clothing/suit/storage/hooded/teshari/standard/pink_grey,
- /obj/item/clothing/suit/storage/hooded/teshari/standard/brown_grey
- )
- cost = 40
- containertype = /obj/structure/closet/crate
- containername = "Teshari cloaks crate"
-
-/datum/supply_pack/randomised/costumes/tesh_hoodcloaks_b_vr
- name = "Teshari cloaks (hooded, black)"
- num_contained = 4
- contains = list(
- /obj/item/clothing/suit/storage/hooded/teshari,
- /obj/item/clothing/suit/storage/hooded/teshari/standard/black_orange,
- /obj/item/clothing/suit/storage/hooded/teshari/standard/black_grey,
- /obj/item/clothing/suit/storage/hooded/teshari/standard/black_midgrey,
- /obj/item/clothing/suit/storage/hooded/teshari/standard/black_lightgrey,
- /obj/item/clothing/suit/storage/hooded/teshari/standard/black_white,
- /obj/item/clothing/suit/storage/hooded/teshari/standard/black_red,
- /obj/item/clothing/suit/storage/hooded/teshari/standard/black,
- /obj/item/clothing/suit/storage/hooded/teshari/standard/black_yellow,
- /obj/item/clothing/suit/storage/hooded/teshari/standard/black_green,
- /obj/item/clothing/suit/storage/hooded/teshari/standard/black_blue,
- /obj/item/clothing/suit/storage/hooded/teshari/standard/black_purple,
- /obj/item/clothing/suit/storage/hooded/teshari/standard/black_pink,
- /obj/item/clothing/suit/storage/hooded/teshari/standard/black_brown
- )
- cost = 40
- containertype = /obj/structure/closet/crate
- containername = "Teshari cloaks crate"
-
-/datum/supply_pack/costumes/utility_vr
- name = "Utility uniforms"
- contains = list(
- /obj/item/clothing/under/utility,
- /obj/item/clothing/under/utility/blue,
- /obj/item/clothing/under/utility/grey
- )
- cost = 30
- containertype = /obj/structure/closet/crate
- containername = "Utility uniforms crate"
-
-/datum/supply_pack/costumes/skirts_vr
- name = "Skirts crate"
- contains = list(
- /obj/item/clothing/under/skirt,
- /obj/item/clothing/under/skirt/blue,
- /obj/item/clothing/under/skirt/denim,
- /obj/item/clothing/under/skirt/khaki,
- /obj/item/clothing/under/skirt/outfit,
- /obj/item/clothing/under/skirt/red,
- /obj/item/clothing/under/skirt/swept,
- /obj/item/clothing/under/skirt/outfit/plaid_blue,
- /obj/item/clothing/under/skirt/outfit/plaid_purple,
- /obj/item/clothing/under/skirt/outfit/plaid_red
- )
- cost = 40
- containertype = /obj/structure/closet/crate
- containername = "Skirts crate"
-
-/datum/supply_pack/costumes/varsity_vr
- name = "Varsity jackets"
- contains = list(
- /obj/item/clothing/suit/varsity,
- /obj/item/clothing/suit/varsity/blue,
- /obj/item/clothing/suit/varsity/brown,
- /obj/item/clothing/suit/varsity/green,
- /obj/item/clothing/suit/varsity/purple,
- /obj/item/clothing/suit/varsity/red
- )
- cost = 60
- containertype = /obj/structure/closet/crate
- containername = "Varsity jackets crate"
-
-/datum/supply_pack/randomised/costumes/leathergear_vr
- name = "Leather gear"
- num_contained = 5
- contains = list(
- /obj/item/clothing/suit/leathercoat,
- /obj/item/clothing/suit/storage/leather_jacket_alt,
- /obj/item/clothing/suit/storage/toggle/leather_jacket,
- /obj/item/clothing/suit/storage/toggle/leather_jacket/sleeveless,
- /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen,
- /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen/sleeveless,
- /obj/item/clothing/under/pants/chaps,
- /obj/item/clothing/under/pants/chaps/black,
- /obj/item/clothing/under/harness,
- /obj/item/clothing/shoes/laceup/brown,
- /obj/item/clothing/shoes/boots/jungle,
- /obj/item/clothing/shoes/boots/jackboots,
- /obj/item/clothing/shoes/boots/cowboy,
- /obj/item/clothing/shoes/boots/cowboy/classic,
- /obj/item/clothing/shoes/boots/cowboy/snakeskin,
- /obj/item/clothing/accessory/chaps,
- /obj/item/clothing/accessory/chaps/black,
- /obj/item/clothing/accessory/collar/spike,
- /obj/item/clothing/gloves/fingerless,
- /obj/item/clothing/gloves/botanic_leather,
- /obj/item/clothing/head/cowboy,
- /obj/item/clothing/head/cowboy/bandit,
- /obj/item/clothing/accessory/cowboy_vest/brown,
- /obj/item/clothing/accessory/cowboy_vest/grey
- )
- cost = 50
- containertype = /obj/structure/closet/crate
- containername = "Leather gear crate"
-
-/datum/supply_pack/costumes/eyewear_vr
- name = "Eyewear crate"
- contains = list(
- /obj/item/clothing/glasses/eyepatch,
- /obj/item/clothing/glasses/fakesunglasses,
- /obj/item/clothing/glasses/fakesunglasses/aviator,
- /obj/item/clothing/glasses/fluff/science_proper,
- /obj/item/clothing/glasses/fluff/spiffygogs,
- /obj/item/clothing/glasses/gglasses,
- /obj/item/clothing/glasses/monocle,
- /obj/item/clothing/glasses/regular,
- /obj/item/clothing/glasses/regular/hipster,
- /obj/item/clothing/glasses/regular/scanners,
- /obj/item/clothing/glasses/threedglasses
- )
- cost = 50
- containertype = /obj/structure/closet/crate
- containername = "Eyewear crate"
-
-/datum/supply_pack/randomised/costumes/gloves_vr
- name = "Gloves crate"
- num_contained = 4
- contains = list(
- /obj/item/clothing/gloves/black,
- /obj/item/clothing/gloves/blue,
- /obj/item/clothing/gloves/botanic_leather,
- /obj/item/clothing/gloves/brown,
- /obj/item/clothing/gloves/evening,
- /obj/item/clothing/gloves/fingerless,
- /obj/item/clothing/gloves/fyellow,
- /obj/item/clothing/gloves/green,
- /obj/item/clothing/gloves/grey,
- /obj/item/clothing/gloves/light_brown,
- /obj/item/clothing/gloves/orange,
- /obj/item/clothing/gloves/purple,
- /obj/item/clothing/gloves/rainbow,
- /obj/item/clothing/gloves/red,
- /obj/item/clothing/gloves/white
- )
- cost = 40
- containertype = /obj/structure/closet/crate
- containername = "Gloves crate"
-
-/datum/supply_pack/randomised/costumes/boots_vr
- name = "Boots crate"
- num_contained = 3
- contains = list(
- /obj/item/clothing/shoes/boots/workboots,
- /obj/item/clothing/shoes/boots/cowboy,
- /obj/item/clothing/shoes/boots/cowboy/classic,
- /obj/item/clothing/shoes/boots/cowboy/snakeskin,
- /obj/item/clothing/shoes/boots/duty,
- /obj/item/clothing/shoes/boots/jackboots,
- /obj/item/clothing/shoes/boots/jungle,
- /obj/item/clothing/shoes/boots/winter
- )
- cost = 60
- containertype = /obj/structure/closet/crate
- containername = "Boots crate"
-
-/datum/supply_pack/costumes/taurbags
- name = "Saddlebags crate"
- contains = list(
- /obj/item/weapon/storage/backpack/saddlebag_common,
- /obj/item/weapon/storage/backpack/saddlebag_common/robust,
- /obj/item/weapon/storage/backpack/saddlebag_common/vest
- )
- cost = 60
- containertype = /obj/structure/closet/crate
- containername = "Saddlebags crate"
-
-/datum/supply_pack/costumes/knights_gear
- name = "Knights Gear"
- contains = list(
- /obj/item/clothing/suit/storage/hooded/knight_costume,
- /obj/item/clothing/suit/storage/hooded/knight_costume/galahad,
- /obj/item/clothing/suit/storage/hooded/knight_costume/lancelot,
- /obj/item/clothing/suit/storage/hooded/knight_costume/robin,
- /obj/item/clothing/suit/armor/combat/crusader_costume,
- /obj/item/clothing/suit/armor/combat/crusader_costume/bedevere,
- /obj/item/clothing/head/helmet/combat/crusader_costume,
- /obj/item/clothing/head/helmet/combat/bedevere_costume,
- /obj/item/clothing/gloves/combat/knight_costume,
- /obj/item/clothing/gloves/combat/knight_costume/brown,
- /obj/item/clothing/shoes/knight_costume,
- /obj/item/clothing/shoes/knight_costume/black
- )
- cost = 10
- containertype = /obj/structure/closet/crate
- containername = "Knights Gear Crate"
-
-/datum/supply_pack/costumes/christmas
- name = "Christmas costume pack"
- contains = list(
- /obj/item/clothing/head/santa,
- /obj/item/clothing/head/santa/green,
- /obj/item/clothing/suit/storage/hooded/wintercoat/christmasred,
- /obj/item/clothing/suit/storage/hooded/wintercoat/christmasgreen,
- /obj/item/clothing/under/christmas/red,
- /obj/item/clothing/under/christmas/green,
- /obj/item/clothing/under/christmas/croptop/red,
- /obj/item/clothing/under/christmas/croptop/green,
- /obj/item/clothing/shoes/boots/winter/christmasred,
- /obj/item/clothing/shoes/boots/winter/christmasgreen
- )
- cost = 20
- containertype = /obj/structure/closet/crate
- containername = "Christmas costume pack"
\ No newline at end of file
diff --git a/code/datums/supplypacks/engineering.dm b/code/datums/supplypacks/engineering.dm
index 0529f5aedd4..a8f763c7a2f 100644
--- a/code/datums/supplypacks/engineering.dm
+++ b/code/datums/supplypacks/engineering.dm
@@ -336,3 +336,60 @@
containername = "Tritium crate"
containertype = /obj/structure/closet/crate/einstein
contains = list(/obj/fiftyspawner/tritium)
+
+/datum/supply_pack/eng/modern_shield
+ name = "Modern Shield Construction Kit"
+ contains = list(
+ /obj/item/weapon/circuitboard/shield_generator,
+ /obj/item/weapon/stock_parts/capacitor,
+ /obj/item/weapon/stock_parts/micro_laser,
+ /obj/item/weapon/smes_coil,
+ /obj/item/weapon/stock_parts/console_screen,
+ /obj/item/weapon/stock_parts/subspace/amplifier
+ )
+ cost = 80
+ containertype = /obj/structure/closet/crate/focalpoint
+ containername = "shield generator construction kit crate"
+
+/datum/supply_pack/eng/thermoregulator
+ contains = list(/obj/machinery/power/thermoregulator)
+ name = "Thermal Regulator"
+ cost = 30
+ containertype = /obj/structure/closet/crate/large
+ containername = "thermal regulator crate"
+ access = access_atmospherics
+
+/datum/supply_pack/eng/radsuit
+ contains = list(
+ /obj/item/clothing/suit/radiation = 3,
+ /obj/item/clothing/head/radiation = 3
+ )
+
+/datum/supply_pack/eng/dosimeter
+ contains = list(/obj/item/weapon/storage/box/dosimeter = 6)
+ name = "Dosimeters"
+ cost = 10
+ containertype = /obj/structure/closet/crate
+ containername = "dosimeter crate"
+
+/datum/supply_pack/eng/algae
+ contains = list(/obj/item/stack/material/algae/ten)
+ name = "Algae Sheets (10)"
+ cost = 20
+ containertype = /obj/structure/closet/crate
+ containername = "algae sheets crate"
+
+/datum/supply_pack/eng/engine/tesla_gen
+ name = "Tesla Generator crate"
+ contains = list(/obj/machinery/the_singularitygen/tesla)
+ containertype = /obj/structure/closet/crate/secure/engineering
+ containername = "Tesla Generator crate"
+ access = access_ce
+
+/datum/supply_pack/eng/inducer
+ contains = list(/obj/item/weapon/inducer = 3)
+ name = "inducer"
+ cost = 90 //Relatively expensive
+ containertype = /obj/structure/closet/crate/xion
+ containername = "Inducers crate"
+ access = access_engine
diff --git a/code/datums/supplypacks/engineering_vr.dm b/code/datums/supplypacks/engineering_vr.dm
deleted file mode 100644
index 6bf6899628d..00000000000
--- a/code/datums/supplypacks/engineering_vr.dm
+++ /dev/null
@@ -1,56 +0,0 @@
-/datum/supply_pack/eng/modern_shield
- name = "Modern Shield Construction Kit"
- contains = list(
- /obj/item/weapon/circuitboard/shield_generator,
- /obj/item/weapon/stock_parts/capacitor,
- /obj/item/weapon/stock_parts/micro_laser,
- /obj/item/weapon/smes_coil,
- /obj/item/weapon/stock_parts/console_screen,
- /obj/item/weapon/stock_parts/subspace/amplifier
- )
- cost = 80
- containertype = /obj/structure/closet/crate/focalpoint
- containername = "shield generator construction kit crate"
-
-/datum/supply_pack/eng/thermoregulator
- contains = list(/obj/machinery/power/thermoregulator)
- name = "Thermal Regulator"
- cost = 30
- containertype = /obj/structure/closet/crate/large
- containername = "thermal regulator crate"
- access = access_atmospherics
-
-/datum/supply_pack/eng/radsuit
- contains = list(
- /obj/item/clothing/suit/radiation = 3,
- /obj/item/clothing/head/radiation = 3
- )
-
-/datum/supply_pack/eng/dosimeter
- contains = list(/obj/item/weapon/storage/box/dosimeter = 6)
- name = "Dosimeters"
- cost = 10
- containertype = /obj/structure/closet/crate
- containername = "dosimeter crate"
-
-/datum/supply_pack/eng/algae
- contains = list(/obj/item/stack/material/algae/ten)
- name = "Algae Sheets (10)"
- cost = 20
- containertype = /obj/structure/closet/crate
- containername = "algae sheets crate"
-
-/datum/supply_pack/eng/engine/tesla_gen
- name = "Tesla Generator crate"
- contains = list(/obj/machinery/the_singularitygen/tesla)
- containertype = /obj/structure/closet/crate/secure/engineering
- containername = "Tesla Generator crate"
- access = access_ce
-
-/datum/supply_pack/eng/inducer
- contains = list(/obj/item/weapon/inducer = 3)
- name = "inducer"
- cost = 90 //Relatively expensive
- containertype = /obj/structure/closet/crate/xion
- containername = "Inducers crate"
- access = access_engine
diff --git a/code/datums/supplypacks/hospitality.dm b/code/datums/supplypacks/hospitality.dm
index 021463e9e5b..baef23eb1a8 100644
--- a/code/datums/supplypacks/hospitality.dm
+++ b/code/datums/supplypacks/hospitality.dm
@@ -59,7 +59,9 @@
name = "Surprise pack of five pizzas"
contains = list(
/obj/random/pizzabox/supplypack = 5,
- /obj/item/weapon/material/knife/plastic
+ /obj/item/weapon/material/knife/plastic,
+ /obj/item/clothing/under/pizzaguy,
+ /obj/item/clothing/head/pizzaguy
)
cost = 15
containertype = /obj/structure/closet/crate/freezer/centauri
@@ -107,3 +109,117 @@
/datum/supply_pack/randomised/hospitality/
group = "Hospitality"
+
+/datum/supply_pack/randomised/hospitality/burgers_vr
+ num_contained = 5
+ contains = list(
+ /obj/item/weapon/reagent_containers/food/snacks/bigbiteburger,
+ /obj/item/weapon/reagent_containers/food/snacks/cheeseburger,
+ /obj/item/weapon/reagent_containers/food/snacks/jellyburger,
+ /obj/item/weapon/reagent_containers/food/snacks/tofuburger,
+ /obj/item/weapon/reagent_containers/food/snacks/fries
+ )
+ name = "Burger crate"
+ cost = 25
+ containertype = /obj/structure/closet/crate/freezer
+ containername = "Burger crate"
+/*
+/datum/supply_pack/randomised/hospitality/bakery_vr
+ num_contained = 5
+ contains = list(
+ /obj/item/weapon/reagent_containers/food/snacks/baguette,
+ /obj/item/weapon/reagent_containers/food/snacks/appletart,
+ /obj/item/weapon/reagent_containers/food/snacks/berrymuffin,
+ /obj/item/weapon/reagent_containers/food/snacks/bunbun,
+ /obj/item/weapon/reagent_containers/food/snacks/cherrypie,
+ /obj/item/weapon/reagent_containers/food/snacks/cookie,
+ /obj/item/weapon/reagent_containers/food/snacks/croissant,
+ /obj/item/weapon/reagent_containers/food/snacks/donut/normal,
+ /obj/item/weapon/reagent_containers/food/snacks/donut/jelly,
+ /obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly,
+ /obj/item/weapon/reagent_containers/food/snacks/muffin,
+ /obj/item/weapon/reagent_containers/food/snacks/pie,
+ /obj/item/weapon/reagent_containers/food/snacks/plump_pie,
+ /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit,
+ /obj/item/weapon/reagent_containers/food/snacks/poppypretzel,
+ /obj/item/weapon/reagent_containers/food/snacks/sugarcookie,
+ /obj/item/weapon/reagent_containers/food/snacks/waffles
+ )
+ name = "Bakery products crate"
+ cost = 25
+ containertype = /obj/structure/closet/crate/freezer
+ containername = "Bakery products crate"
+
+/datum/supply_pack/randomised/hospitality/cakes_vr
+ num_contained = 2
+ contains = list(
+ /obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake,
+ /obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake,
+ /obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake,
+ /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake,
+ /obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake,
+ /obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake,
+ /obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake,
+ /obj/item/weapon/reagent_containers/food/snacks/sliceable/orangecake,
+ /obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake
+ )
+ name = "Cake crate"
+ cost = 100
+ containertype = /obj/structure/closet/crate/freezer
+ containername = "Cake crate"
+
+/datum/supply_pack/randomised/hospitality/mexican_vr
+ num_contained = 5
+ contains = list(
+ /obj/item/weapon/reagent_containers/food/snacks/cheeseburrito,
+ /obj/item/weapon/reagent_containers/food/snacks/enchiladas,
+ /obj/item/weapon/reagent_containers/food/snacks/meatburrito,
+ /obj/item/weapon/reagent_containers/food/snacks/taco
+ )
+ name = "Mexican takeout crate"
+ cost = 50
+ containertype = /obj/structure/closet/crate/freezer
+ containername = "Mexican takeout crate"
+*/
+/datum/supply_pack/randomised/hospitality/asian_vr
+ num_contained = 5
+ contains = list(
+ /obj/item/weapon/reagent_containers/food/snacks/generalschicken,
+ /obj/item/weapon/reagent_containers/food/snacks/hotandsoursoup
+ )
+ name = "Chinese takeout crate"
+ cost = 50
+ containertype = /obj/structure/closet/crate/freezer
+ containername = "Chinese takeout crate"
+
+/datum/supply_pack/randomised/hospitality/jaffacake
+ contains = list(
+ /obj/item/weapon/storage/box/jaffacake,
+ /obj/item/weapon/storage/box/jaffacake,
+ /obj/item/weapon/storage/box/jaffacake,
+ /obj/item/weapon/storage/box/jaffacake,
+ /obj/item/weapon/storage/box/jaffacake,
+ /obj/item/weapon/storage/box/jaffacake,
+ /obj/item/weapon/storage/box/jaffacake,
+ /obj/item/weapon/storage/box/jaffacake,
+ /obj/item/weapon/storage/box/jaffacake,
+ /obj/item/weapon/storage/box/jaffacake
+ )
+ name = "Desatti jaffa cake crate"
+ cost = 25
+ containertype = /obj/structure/closet/crate/freezer
+ containername = "Desatti jaffa cake crate"
+
+/datum/supply_pack/randomised/hospitality/sweets
+ num_contained = 5
+ contains = list(
+ /obj/item/weapon/storage/box/jaffacake,
+ /obj/item/weapon/storage/box/winegum,
+ /obj/item/weapon/storage/box/saucer,
+ /obj/item/weapon/storage/box/shrimpsandbananas,
+ /obj/item/weapon/storage/box/rhubarbcustard
+ )
+ name = "Sweets crate"
+ cost = 25
+ containertype = /obj/structure/closet/crate/freezer
+ containername = "Sweets crate"
diff --git a/code/datums/supplypacks/hospitality_vr.dm b/code/datums/supplypacks/hospitality_vr.dm
deleted file mode 100644
index ceb35b6c5d6..00000000000
--- a/code/datums/supplypacks/hospitality_vr.dm
+++ /dev/null
@@ -1,122 +0,0 @@
-/datum/supply_pack/randomised/hospitality/pizza
- cost = 50
- contains = list(
- /obj/random/pizzabox/supplypack = 5,
- /obj/item/weapon/material/knife/plastic,
- /obj/item/clothing/under/pizzaguy,
- /obj/item/clothing/head/pizzaguy
- )
-
-/datum/supply_pack/randomised/hospitality/burgers_vr
- num_contained = 5
- contains = list(
- /obj/item/weapon/reagent_containers/food/snacks/bigbiteburger,
- /obj/item/weapon/reagent_containers/food/snacks/cheeseburger,
- /obj/item/weapon/reagent_containers/food/snacks/jellyburger,
- /obj/item/weapon/reagent_containers/food/snacks/tofuburger,
- /obj/item/weapon/reagent_containers/food/snacks/fries
- )
- name = "Burger crate"
- cost = 25
- containertype = /obj/structure/closet/crate/freezer
- containername = "Burger crate"
-/*
-/datum/supply_pack/randomised/hospitality/bakery_vr
- num_contained = 5
- contains = list(
- /obj/item/weapon/reagent_containers/food/snacks/baguette,
- /obj/item/weapon/reagent_containers/food/snacks/appletart,
- /obj/item/weapon/reagent_containers/food/snacks/berrymuffin,
- /obj/item/weapon/reagent_containers/food/snacks/bunbun,
- /obj/item/weapon/reagent_containers/food/snacks/cherrypie,
- /obj/item/weapon/reagent_containers/food/snacks/cookie,
- /obj/item/weapon/reagent_containers/food/snacks/croissant,
- /obj/item/weapon/reagent_containers/food/snacks/donut/normal,
- /obj/item/weapon/reagent_containers/food/snacks/donut/jelly,
- /obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly,
- /obj/item/weapon/reagent_containers/food/snacks/muffin,
- /obj/item/weapon/reagent_containers/food/snacks/pie,
- /obj/item/weapon/reagent_containers/food/snacks/plump_pie,
- /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit,
- /obj/item/weapon/reagent_containers/food/snacks/poppypretzel,
- /obj/item/weapon/reagent_containers/food/snacks/sugarcookie,
- /obj/item/weapon/reagent_containers/food/snacks/waffles
- )
- name = "Bakery products crate"
- cost = 25
- containertype = /obj/structure/closet/crate/freezer
- containername = "Bakery products crate"
-
-/datum/supply_pack/randomised/hospitality/cakes_vr
- num_contained = 2
- contains = list(
- /obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake,
- /obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake,
- /obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake,
- /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake,
- /obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake,
- /obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake,
- /obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake,
- /obj/item/weapon/reagent_containers/food/snacks/sliceable/orangecake,
- /obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake
- )
- name = "Cake crate"
- cost = 100
- containertype = /obj/structure/closet/crate/freezer
- containername = "Cake crate"
-
-/datum/supply_pack/randomised/hospitality/mexican_vr
- num_contained = 5
- contains = list(
- /obj/item/weapon/reagent_containers/food/snacks/cheeseburrito,
- /obj/item/weapon/reagent_containers/food/snacks/enchiladas,
- /obj/item/weapon/reagent_containers/food/snacks/meatburrito,
- /obj/item/weapon/reagent_containers/food/snacks/taco
- )
- name = "Mexican takeout crate"
- cost = 50
- containertype = /obj/structure/closet/crate/freezer
- containername = "Mexican takeout crate"
-*/
-/datum/supply_pack/randomised/hospitality/asian_vr
- num_contained = 5
- contains = list(
- /obj/item/weapon/reagent_containers/food/snacks/generalschicken,
- /obj/item/weapon/reagent_containers/food/snacks/hotandsoursoup
- )
- name = "Chinese takeout crate"
- cost = 50
- containertype = /obj/structure/closet/crate/freezer
- containername = "Chinese takeout crate"
-
-/datum/supply_pack/randomised/hospitality/jaffacake
- contains = list(
- /obj/item/weapon/storage/box/jaffacake,
- /obj/item/weapon/storage/box/jaffacake,
- /obj/item/weapon/storage/box/jaffacake,
- /obj/item/weapon/storage/box/jaffacake,
- /obj/item/weapon/storage/box/jaffacake,
- /obj/item/weapon/storage/box/jaffacake,
- /obj/item/weapon/storage/box/jaffacake,
- /obj/item/weapon/storage/box/jaffacake,
- /obj/item/weapon/storage/box/jaffacake,
- /obj/item/weapon/storage/box/jaffacake
- )
- name = "Desatti jaffa cake crate"
- cost = 25
- containertype = /obj/structure/closet/crate/freezer
- containername = "Desatti jaffa cake crate"
-
-/datum/supply_pack/randomised/hospitality/sweets
- num_contained = 5
- contains = list(
- /obj/item/weapon/storage/box/jaffacake,
- /obj/item/weapon/storage/box/winegum,
- /obj/item/weapon/storage/box/saucer,
- /obj/item/weapon/storage/box/shrimpsandbananas,
- /obj/item/weapon/storage/box/rhubarbcustard
- )
- name = "Sweets crate"
- cost = 25
- containertype = /obj/structure/closet/crate/freezer
- containername = "Sweets crate"
diff --git a/code/datums/supplypacks/hydroponics.dm b/code/datums/supplypacks/hydroponics.dm
index 66b3207b2f4..d2e55469af1 100644
--- a/code/datums/supplypacks/hydroponics.dm
+++ b/code/datums/supplypacks/hydroponics.dm
@@ -163,3 +163,82 @@
contains = list(/obj/machinery/portable_atmospherics/hydroponics{anchored = FALSE} = 3)
access = access_hydroponics
+/datum/supply_pack/hydro/birds
+ name = "Birds Crate"
+ cost = 200 //You're getting 22 birds. Of course it's going to be a lot!
+ containertype = /obj/structure/largecrate/birds
+ containername = "Bird crate"
+ access = access_hydroponics
+
+/datum/supply_pack/hydro/sobaka
+ name = "Sobaka crate"
+ contains = list (/obj/item/weapon/storage/box/monkeycubes/sobakacubes)
+ cost = 20
+ containertype = /obj/structure/closet/crate/freezer
+ containername = "Sobaka crate"
+
+/datum/supply_pack/hydro/saru
+ name = "Saru crate"
+ contains = list (/obj/item/weapon/storage/box/monkeycubes/sarucubes)
+ cost = 20
+ containertype = /obj/structure/closet/crate/freezer
+ containername = "Saru crate"
+
+/datum/supply_pack/hydro/sparra
+ name = "Sparra crate"
+ contains = list (/obj/item/weapon/storage/box/monkeycubes/sparracubes)
+ cost = 20
+ containertype = /obj/structure/closet/crate/freezer
+ containername = "Sparra crate"
+
+/datum/supply_pack/hydro/wolpin
+ name = "Wolpin crate"
+ contains = list (/obj/item/weapon/storage/box/monkeycubes/wolpincubes)
+ cost = 20
+ containertype = /obj/structure/closet/crate/freezer
+ containername = "Wolpin crate"
+
+/datum/supply_pack/hydro/fennec
+ name = "Fennec crate"
+ cost = 60 //considering a corgi crate is 50, and you get two fennecs
+ containertype = /obj/structure/largecrate/animal/fennec
+ containername = "Fennec crate"
+
+/datum/supply_pack/hydro/fish
+ name = "Fish supply crate"
+ contains = list(
+ /obj/item/weapon/reagent_containers/food/snacks/lobster = 6,
+ /obj/item/weapon/reagent_containers/food/snacks/cuttlefish = 8,
+ /obj/item/weapon/reagent_containers/food/snacks/sliceable/monkfish = 1
+ )
+ cost = 20
+ containertype = /obj/structure/closet/crate/freezer
+ containername = "Fish crate"
+
+/datum/supply_pack/hydro/fennec_food
+ name = "Fennec treats crate"
+ contains = list(
+ /obj/item/weapon/reagent_containers/food/snacks/locust = 6,
+ /obj/item/weapon/storage/box/wings/bucket = 2,
+ /obj/item/weapon/reagent_containers/food/snacks/grub_pink = 2,
+ /obj/item/weapon/reagent_containers/food/snacks/grub_blue = 2,
+ /obj/item/weapon/reagent_containers/food/snacks/grub_purple = 2,
+ /obj/item/weapon/reagent_containers/food/snacks/honey_candy = 4,
+ /obj/item/weapon/reagent_containers/food/snacks/scorpion = 4,
+ /obj/item/weapon/reagent_containers/food/snacks/ant = 4
+ )
+ cost = 20
+ containertype = /obj/structure/closet/crate/fennec
+ containername = "Fennec treats crate"
+
+/datum/supply_pack/hydro/jerboa
+ name = "Jerboa crate"
+ cost = 10
+ containertype = /obj/structure/largecrate/animal/jerboa
+ containername = "Jerboa crate"
+
+/datum/supply_pack/hydro/tits
+ name = "A pair of great tits"
+ cost = 10
+ containertype = /obj/structure/largecrate/tits
+ containername = "A pair of great tits"
diff --git a/code/datums/supplypacks/hydroponics_vr.dm b/code/datums/supplypacks/hydroponics_vr.dm
deleted file mode 100644
index fa912852e72..00000000000
--- a/code/datums/supplypacks/hydroponics_vr.dm
+++ /dev/null
@@ -1,79 +0,0 @@
-/datum/supply_pack/hydro/birds
- name = "Birds Crate"
- cost = 200 //You're getting 22 birds. Of course it's going to be a lot!
- containertype = /obj/structure/largecrate/birds
- containername = "Bird crate"
- access = access_hydroponics
-
-/datum/supply_pack/hydro/sobaka
- name = "Sobaka crate"
- contains = list (/obj/item/weapon/storage/box/monkeycubes/sobakacubes)
- cost = 20
- containertype = /obj/structure/closet/crate/freezer
- containername = "Sobaka crate"
-
-/datum/supply_pack/hydro/saru
- name = "Saru crate"
- contains = list (/obj/item/weapon/storage/box/monkeycubes/sarucubes)
- cost = 20
- containertype = /obj/structure/closet/crate/freezer
- containername = "Saru crate"
-
-/datum/supply_pack/hydro/sparra
- name = "Sparra crate"
- contains = list (/obj/item/weapon/storage/box/monkeycubes/sparracubes)
- cost = 20
- containertype = /obj/structure/closet/crate/freezer
- containername = "Sparra crate"
-
-/datum/supply_pack/hydro/wolpin
- name = "Wolpin crate"
- contains = list (/obj/item/weapon/storage/box/monkeycubes/wolpincubes)
- cost = 20
- containertype = /obj/structure/closet/crate/freezer
- containername = "Wolpin crate"
-
-/datum/supply_pack/hydro/fennec
- name = "Fennec crate"
- cost = 60 //considering a corgi crate is 50, and you get two fennecs
- containertype = /obj/structure/largecrate/animal/fennec
- containername = "Fennec crate"
-
-/datum/supply_pack/hydro/fish
- name = "Fish supply crate"
- contains = list(
- /obj/item/weapon/reagent_containers/food/snacks/lobster = 6,
- /obj/item/weapon/reagent_containers/food/snacks/cuttlefish = 8,
- /obj/item/weapon/reagent_containers/food/snacks/sliceable/monkfish = 1
- )
- cost = 20
- containertype = /obj/structure/closet/crate/freezer
- containername = "Fish crate"
-
-/datum/supply_pack/hydro/fennec_food
- name = "Fennec treats crate"
- contains = list(
- /obj/item/weapon/reagent_containers/food/snacks/locust = 6,
- /obj/item/weapon/storage/box/wings/bucket = 2,
- /obj/item/weapon/reagent_containers/food/snacks/grub_pink = 2,
- /obj/item/weapon/reagent_containers/food/snacks/grub_blue = 2,
- /obj/item/weapon/reagent_containers/food/snacks/grub_purple = 2,
- /obj/item/weapon/reagent_containers/food/snacks/honey_candy = 4,
- /obj/item/weapon/reagent_containers/food/snacks/scorpion = 4,
- /obj/item/weapon/reagent_containers/food/snacks/ant = 4
- )
- cost = 20
- containertype = /obj/structure/closet/crate/fennec
- containername = "Fennec treats crate"
-
-/datum/supply_pack/hydro/jerboa
- name = "Jerboa crate"
- cost = 10
- containertype = /obj/structure/largecrate/animal/jerboa
- containername = "Jerboa crate"
-
-/datum/supply_pack/hydro/tits
- name = "A pair of great tits"
- cost = 10
- containertype = /obj/structure/largecrate/tits
- containername = "A pair of great tits"
diff --git a/code/datums/supplypacks/medical.dm b/code/datums/supplypacks/medical.dm
index eb7d350c5f6..e958f8133fe 100644
--- a/code/datums/supplypacks/medical.dm
+++ b/code/datums/supplypacks/medical.dm
@@ -21,7 +21,7 @@
/obj/item/weapon/storage/box/syringes,
/obj/item/weapon/storage/box/autoinjectors
)
- cost = 10
+ cost = 15
containertype = /obj/structure/closet/crate/zenghu
containername = "Medical crate"
@@ -377,3 +377,54 @@
cost = 175
containertype = /obj/structure/closet/crate/large/nanotrasen
containername = "Portable stabilizer crate"
+
+/datum/supply_pack/med/medicalbiosuits
+ contains = list(
+ /obj/item/clothing/head/bio_hood/scientist = 3,
+ /obj/item/clothing/suit/bio_suit/scientist = 3,
+ /obj/item/clothing/suit/bio_suit/virology = 3,
+ /obj/item/clothing/head/bio_hood/virology = 3,
+ /obj/item/clothing/suit/bio_suit/cmo,
+ /obj/item/clothing/head/bio_hood/cmo,
+ /obj/item/clothing/shoes/white = 7,
+ /obj/item/clothing/mask/gas = 7,
+ /obj/item/weapon/tank/oxygen = 7,
+ /obj/item/weapon/storage/box/masks,
+ /obj/item/weapon/storage/box/gloves
+ )
+ cost = 40
+
+/datum/supply_pack/med/virologybiosuits
+ name = "Virology biohazard gear"
+ contains = list(
+ /obj/item/clothing/suit/bio_suit/virology = 3,
+ /obj/item/clothing/head/bio_hood/virology = 3,
+ /obj/item/clothing/mask/gas = 3,
+ /obj/item/weapon/tank/oxygen = 3,
+ /obj/item/weapon/storage/box/masks,
+ /obj/item/weapon/storage/box/gloves
+ )
+ cost = 40
+ containertype = /obj/structure/closet/crate/secure
+ containername = "Virology biohazard equipment"
+ access = access_medical_equip
+
+/datum/supply_pack/med/virus
+ name = "Virus sample crate"
+ contains = list(/obj/item/weapon/virusdish/random = 4)
+ cost = 25
+ containertype = /obj/structure/closet/crate/secure
+ containername = "Virus sample crate"
+ access = access_medical_equip
+
+
+/datum/supply_pack/med/bloodpack
+ containertype = /obj/structure/closet/crate/medical/blood
+
+/datum/supply_pack/med/compactdefib
+ name = "Compact Defibrillator crate"
+ contains = list(/obj/item/device/defib_kit/compact = 1)
+ cost = 90
+ containertype = /obj/structure/closet/crate/secure
+ containername = "Compact Defibrillator crate"
+ access = access_medical_equip
diff --git a/code/datums/supplypacks/medical_vr.dm b/code/datums/supplypacks/medical_vr.dm
deleted file mode 100644
index 4f2dc7e8fe3..00000000000
--- a/code/datums/supplypacks/medical_vr.dm
+++ /dev/null
@@ -1,53 +0,0 @@
-/datum/supply_pack/med/medical
- cost = 15
-
-/datum/supply_pack/med/medicalbiosuits
- contains = list(
- /obj/item/clothing/head/bio_hood/scientist = 3,
- /obj/item/clothing/suit/bio_suit/scientist = 3,
- /obj/item/clothing/suit/bio_suit/virology = 3,
- /obj/item/clothing/head/bio_hood/virology = 3,
- /obj/item/clothing/suit/bio_suit/cmo,
- /obj/item/clothing/head/bio_hood/cmo,
- /obj/item/clothing/shoes/white = 7,
- /obj/item/clothing/mask/gas = 7,
- /obj/item/weapon/tank/oxygen = 7,
- /obj/item/weapon/storage/box/masks,
- /obj/item/weapon/storage/box/gloves
- )
- cost = 40
-
-/datum/supply_pack/med/virologybiosuits
- name = "Virology biohazard gear"
- contains = list(
- /obj/item/clothing/suit/bio_suit/virology = 3,
- /obj/item/clothing/head/bio_hood/virology = 3,
- /obj/item/clothing/mask/gas = 3,
- /obj/item/weapon/tank/oxygen = 3,
- /obj/item/weapon/storage/box/masks,
- /obj/item/weapon/storage/box/gloves
- )
- cost = 40
- containertype = /obj/structure/closet/crate/secure
- containername = "Virology biohazard equipment"
- access = access_medical_equip
-
-/datum/supply_pack/med/virus
- name = "Virus sample crate"
- contains = list(/obj/item/weapon/virusdish/random = 4)
- cost = 25
- containertype = /obj/structure/closet/crate/secure
- containername = "Virus sample crate"
- access = access_medical_equip
-
-
-/datum/supply_pack/med/bloodpack
- containertype = /obj/structure/closet/crate/medical/blood
-
-/datum/supply_pack/med/compactdefib
- name = "Compact Defibrillator crate"
- contains = list(/obj/item/device/defib_kit/compact = 1)
- cost = 90
- containertype = /obj/structure/closet/crate/secure
- containername = "Compact Defibrillator crate"
- access = access_medical_equip
\ No newline at end of file
diff --git a/code/datums/supplypacks/misc.dm b/code/datums/supplypacks/misc.dm
index 9257908d171..6d6734b2619 100644
--- a/code/datums/supplypacks/misc.dm
+++ b/code/datums/supplypacks/misc.dm
@@ -200,3 +200,108 @@
cost = 60
containertype = /obj/structure/closet/crate/large/xion
containername = "pump crate"
+
+/datum/supply_pack/misc/beltminer
+ name = "Belt-miner gear crate"
+ contains = list(
+ /obj/item/weapon/gun/energy/particle = 2,
+ /obj/item/weapon/cell/device/weapon = 2,
+ /obj/item/weapon/storage/firstaid/regular = 1,
+ /obj/item/device/gps = 2,
+ /obj/item/weapon/storage/box/traumainjectors = 1,
+ /obj/item/device/binoculars = 1
+ )
+ cost = 60
+ containertype = /obj/structure/closet/crate/secure/gear
+ containername = "Belt-miner gear crate"
+ access = list(access_mining,
+ access_xenoarch)
+ one_access = TRUE
+
+/datum/supply_pack/misc/jetpack
+ name = "jetpack (empty)"
+ contains = list(
+ /obj/item/weapon/tank/jetpack = 1
+ )
+ cost = 75
+ containertype = /obj/structure/closet/crate/secure/gear
+ containername = "jetpack crate"
+ access = list(access_mining,
+ access_xenoarch,
+ access_eva,
+ access_pilot)
+ one_access = TRUE
+
+/datum/supply_pack/randomised/misc/explorer_shield
+ name = "Away Team shield"
+ num_contained = 2
+ contains = list(
+ /obj/item/weapon/shield/riot/explorer,
+ /obj/item/weapon/shield/riot/explorer/purple
+ )
+ cost = 75
+ containertype = /obj/structure/closet/crate/secure/gear
+ containername = "exploration shield crate"
+ access = list(access_eva,
+ access_pilot)
+ one_access = TRUE
+
+/datum/supply_pack/misc/music_players
+ name = "music players (3)"
+ contains = list(
+ /obj/item/device/walkpod = 3
+ )
+ cost = 150
+ containertype = /obj/structure/closet/crate
+ containername = "portable music players crate"
+
+/datum/supply_pack/misc/juke_remotes
+ name = "jukebox remote speakers (2)"
+ contains = list(
+ /obj/item/device/juke_remote = 2
+ )
+ cost = 300
+ containertype = /obj/structure/closet/crate
+ containername = "cordless jukebox speakers crate"
+
+/datum/supply_pack/misc/explorer_headsets
+ name = "shortwave-capable headsets (x4)"
+ contains = list(
+ /obj/item/device/radio/headset/explorer = 4
+ )
+ cost = 20
+ containertype = /obj/structure/closet/crate/secure/gear
+ containername = "exploration radio headsets crate"
+ access = list(
+ access_explorer,
+ access_eva,
+ access_pilot
+ )
+ one_access = TRUE
+
+/datum/supply_pack/misc/emergency_beacons
+ name = "emergency locator beacons (x4)"
+ contains = list(
+ /obj/item/device/emergency_beacon = 4
+ )
+ cost = 20
+ containertype = /obj/structure/closet/crate
+ containername = "emergency beacons crate"
+
+/datum/supply_pack/misc/random_corpo
+ name = "random corporate supply crate"
+ contains = list(
+ /obj/random/multiple/corp_crate_supply
+ )
+ cost = 50 //moderately expensive, since it can occasionally drop useful kit but not *too* pricey a lot of it is also fluffy tat
+ containertype = null
+
+/datum/supply_pack/misc/random_corpo_special
+ name = "special corporate supply crate"
+ contains = list(
+ /obj/random/multiple/corp_crate
+ )
+ cost = 125 //this is the 'fun' version of the above, which can spawn useful ores/materials, tech components, and even guns
+ //but it can still spawn a lot of fluffy tat, at a higher rate than the dedicated contraband boxes, so it costs less than them
+ containertype = null
+ contraband = 1 //so it gets contraband status too
diff --git a/code/datums/supplypacks/misc_vr.dm b/code/datums/supplypacks/misc_vr.dm
deleted file mode 100644
index e493233db8b..00000000000
--- a/code/datums/supplypacks/misc_vr.dm
+++ /dev/null
@@ -1,87 +0,0 @@
-
-/datum/supply_pack/misc/beltminer
- name = "Belt-miner gear crate"
- contains = list(
- /obj/item/weapon/gun/energy/particle = 2,
- /obj/item/weapon/cell/device/weapon = 2,
- /obj/item/weapon/storage/firstaid/regular = 1,
- /obj/item/device/gps = 2,
- /obj/item/weapon/storage/box/traumainjectors = 1,
- /obj/item/device/binoculars = 1
- )
- cost = 60
- containertype = /obj/structure/closet/crate/secure/gear
- containername = "Belt-miner gear crate"
- access = list(access_mining,
- access_xenoarch)
- one_access = TRUE
-
-/datum/supply_pack/misc/jetpack
- name = "jetpack (empty)"
- contains = list(
- /obj/item/weapon/tank/jetpack = 1
- )
- cost = 75
- containertype = /obj/structure/closet/crate/secure/gear
- containername = "jetpack crate"
- access = list(access_mining,
- access_xenoarch,
- access_eva,
- access_pilot)
- one_access = TRUE
-
-/datum/supply_pack/randomised/misc/explorer_shield
- name = "Away Team shield"
- num_contained = 2
- contains = list(
- /obj/item/weapon/shield/riot/explorer,
- /obj/item/weapon/shield/riot/explorer/purple
- )
- cost = 75
- containertype = /obj/structure/closet/crate/secure/gear
- containername = "exploration shield crate"
- access = list(access_eva,
- access_pilot)
- one_access = TRUE
-
-/datum/supply_pack/misc/music_players
- name = "music players (3)"
- contains = list(
- /obj/item/device/walkpod = 3
- )
- cost = 150
- containertype = /obj/structure/closet/crate
- containername = "portable music players crate"
-
-/datum/supply_pack/misc/juke_remotes
- name = "jukebox remote speakers (2)"
- contains = list(
- /obj/item/device/juke_remote = 2
- )
- cost = 300
- containertype = /obj/structure/closet/crate
- containername = "cordless jukebox speakers crate"
-
-/datum/supply_pack/misc/explorer_headsets
- name = "shortwave-capable headsets (x4)"
- contains = list(
- /obj/item/device/radio/headset/explorer = 4
- )
- cost = 20
- containertype = /obj/structure/closet/crate/secure/gear
- containername = "exploration radio headsets crate"
- access = list(
- access_explorer,
- access_eva,
- access_pilot
- )
- one_access = TRUE
-
-/datum/supply_pack/misc/emergency_beacons
- name = "emergency locator beacons (x4)"
- contains = list(
- /obj/item/device/emergency_beacon = 4
- )
- cost = 20
- containertype = /obj/structure/closet/crate
- containername = "emergency beacons crate"
\ No newline at end of file
diff --git a/code/datums/supplypacks/munitions.dm b/code/datums/supplypacks/munitions.dm
index 46d3c3616b4..f63a5732fd0 100644
--- a/code/datums/supplypacks/munitions.dm
+++ b/code/datums/supplypacks/munitions.dm
@@ -75,7 +75,7 @@
containername = "Shotgun crate"
access = access_armory
/* VOREStation edit -- This is a bad idea. -- So is this.
-
+
/datum/supply_pack/munitions/shotgunsemi
name = "Weapons - Semi-Automatic Shotgun crate"
contains = list(
@@ -269,3 +269,76 @@
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Energy ammunition crate"
access = access_security
+
+/*
+/datum/supply_pack/munitions/expeditionguns
+ name = "Frontier phaser (station-locked) crate"
+ contains = list(
+ /obj/item/weapon/gun/energy/locked/frontier = 2,
+ /obj/item/weapon/gun/energy/locked/frontier/holdout = 2,
+ )
+ cost = 35
+ containertype = /obj/structure/closet/crate/secure
+ containername = "frontier phaser crate"
+ access = access_security
+
+/datum/supply_pack/munitions/expeditionbows
+ name = "Frontier bows (station-locked) crate"
+ contains = list(
+ /obj/item/weapon/gun/energy/locked/frontier/handbow=2
+ )
+ cost = 20
+ containertype = /obj/structure/closet/crate/secure
+ containername = "phaser handbow crate"
+ access = access_security
+*/
+
+/datum/supply_pack/munitions/ofd_charge_emp
+ name = "OFD Charge - EMP"
+ contains = list(
+ /obj/structure/ship_munition/disperser_charge/emp
+ )
+ cost = 35
+ containertype = /obj/structure/closet/crate/large/secure/heph
+ containername = "EMP disperser charge crate"
+ access = access_security
+
+/datum/supply_pack/munitions/ofd_charge_explosive
+ name = "OFD Charge - Explosive"
+ contains = list(
+ /obj/structure/ship_munition/disperser_charge/explosive
+ )
+ cost = 35
+ containertype = /obj/structure/closet/crate/large/secure/heph
+ containername = "Explosive disperser charge crate"
+ access = access_security
+
+/datum/supply_pack/munitions/ofd_charge_incendiary
+ name = "OFD Charge - Incendiary"
+ contains = list(
+ /obj/structure/ship_munition/disperser_charge/fire
+ )
+ cost = 35
+ containertype = /obj/structure/closet/crate/large/secure/heph
+ containername = "Incendiary disperser charge crate"
+ access = access_security
+
+/datum/supply_pack/munitions/ofd_charge_mining
+ name = "OFD Charge - Mining"
+ contains = list(
+ /obj/structure/ship_munition/disperser_charge/mining
+ )
+ cost = 35
+ containertype = /obj/structure/closet/crate/large/secure/heph
+ containername = "Mining disperser charge crate"
+ access = access_security
+
+/datum/supply_pack/munitions/longsword
+ name = "Weapons - Melee -Longsword (Steel)"
+ contains = list(
+ /obj/item/weapon/material/twohanded/longsword=2
+ )
+ cost = 50
+ containertype = /obj/structure/closet/crate/secure
+ containername = "longsword"
+ access = access_armory
diff --git a/code/datums/supplypacks/munitions_vr.dm b/code/datums/supplypacks/munitions_vr.dm
deleted file mode 100644
index 3a25c1b7cef..00000000000
--- a/code/datums/supplypacks/munitions_vr.dm
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-/datum/supply_pack/munitions/expeditionguns
- name = "Frontier phaser (station-locked) crate"
- contains = list(
- /obj/item/weapon/gun/energy/locked/frontier = 2,
- /obj/item/weapon/gun/energy/locked/frontier/holdout = 2,
- )
- cost = 35
- containertype = /obj/structure/closet/crate/secure
- containername = "frontier phaser crate"
- access = access_security
-
-/datum/supply_pack/munitions/expeditionbows
- name = "Frontier bows (station-locked) crate"
- contains = list(
- /obj/item/weapon/gun/energy/locked/frontier/handbow=2
- )
- cost = 20
- containertype = /obj/structure/closet/crate/secure
- containername = "phaser handbow crate"
- access = access_security
-*/
-
-/datum/supply_pack/munitions/ofd_charge_emp
- name = "OFD Charge - EMP"
- contains = list(
- /obj/structure/ship_munition/disperser_charge/emp
- )
- cost = 35
- containertype = /obj/structure/closet/crate/large/secure/heph
- containername = "EMP disperser charge crate"
- access = access_security
-
-/datum/supply_pack/munitions/ofd_charge_explosive
- name = "OFD Charge - Explosive"
- contains = list(
- /obj/structure/ship_munition/disperser_charge/explosive
- )
- cost = 35
- containertype = /obj/structure/closet/crate/large/secure/heph
- containername = "Explosive disperser charge crate"
- access = access_security
-
-/datum/supply_pack/munitions/ofd_charge_incendiary
- name = "OFD Charge - Incendiary"
- contains = list(
- /obj/structure/ship_munition/disperser_charge/fire
- )
- cost = 35
- containertype = /obj/structure/closet/crate/large/secure/heph
- containername = "Incendiary disperser charge crate"
- access = access_security
-
-/datum/supply_pack/munitions/ofd_charge_mining
- name = "OFD Charge - Mining"
- contains = list(
- /obj/structure/ship_munition/disperser_charge/mining
- )
- cost = 35
- containertype = /obj/structure/closet/crate/large/secure/heph
- containername = "Mining disperser charge crate"
- access = access_security
-
-/datum/supply_pack/munitions/longsword
- name = "Weapons - Melee -Longsword (Steel)"
- contains = list(
- /obj/item/weapon/material/twohanded/longsword=2
- )
- cost = 50
- containertype = /obj/structure/closet/crate/secure
- containername = "longsword"
- access = access_armory
\ No newline at end of file
diff --git a/code/datums/supplypacks/recreation.dm b/code/datums/supplypacks/recreation.dm
index e6e0e97b8fc..3b274ff17fb 100644
--- a/code/datums/supplypacks/recreation.dm
+++ b/code/datums/supplypacks/recreation.dm
@@ -146,3 +146,176 @@
contains = list(
/obj/item/weapon/toy/monster_bait
)
+
+/*
+/datum/supply_pack/recreation/rover
+ name = "NT Humvee"
+ contains = list(
+ /obj/vehicle/train/rover/engine
+ )
+ containertype = /obj/structure/largecrate
+ containername = "NT Humvee Crate"
+ cost = 100
+*/
+/datum/supply_pack/recreation/restraints
+ name = "Recreational Restraints"
+ contains = list(
+ /obj/item/clothing/mask/muzzle,
+ /obj/item/clothing/glasses/sunglasses/blindfold,
+ /obj/item/weapon/handcuffs/fuzzy,
+ /obj/item/weapon/tape_roll,
+ /obj/item/stack/cable_coil/random,
+ /obj/item/clothing/accessory/collar/shock,
+ /obj/item/clothing/suit/straight_jacket,
+ /obj/item/weapon/handcuffs/legcuffs/fuzzy,
+ /obj/item/weapon/melee/fluff/holochain/mass,
+ /obj/item/weapon/material/twohanded/riding_crop,
+ /obj/item/clothing/under/fluff/latexmaid
+ )
+ containertype = /obj/structure/closet/crate
+ containername = "Restraints crate"
+ cost = 30
+
+/datum/supply_pack/recreation/wolfgirl_cosplay_crate
+ name = "Wolfgirl Cosplay Crate"
+ contains = list(
+ /obj/item/clothing/head/fluff/wolfgirl = 1,
+ /obj/item/clothing/shoes/fluff/wolfgirl = 1,
+ /obj/item/clothing/under/fluff/wolfgirl = 1,
+ /obj/item/weapon/melee/fluffstuff/wolfgirlsword = 1,
+ /obj/item/weapon/shield/fluff/wolfgirlshield = 1
+ )
+ cost = 50
+ containertype = /obj/structure/closet/crate
+ containername = "wolfgirl cosplay crate"
+
+/datum/supply_pack/randomised/recreation/figures
+ name = "Action figures crate"
+ num_contained = 5
+ contains = list(
+ /obj/random/action_figure/supplypack
+ )
+ cost = 200
+ containertype = /obj/structure/closet/crate
+ containername = "Action figures crate"
+
+/datum/supply_pack/recreation/collars
+ name = "Collar bundle"
+ contains = list(
+ /obj/item/clothing/accessory/collar/shock = 1,
+ /obj/item/clothing/accessory/collar/spike = 1,
+ /obj/item/clothing/accessory/collar/silver = 1,
+ /obj/item/clothing/accessory/collar/gold = 1,
+ /obj/item/clothing/accessory/collar/bell = 1,
+ /obj/item/clothing/accessory/collar/pink = 1,
+ /obj/item/clothing/accessory/collar/holo = 1
+ )
+ cost = 25
+ containertype = /obj/structure/closet/crate
+ containername = "collar crate"
+
+/datum/supply_pack/recreation/shiny
+ name = "Shiny Clothing"
+ contains = list(
+ /obj/item/clothing/mask/muzzle/ballgag = 1,
+ /obj/item/clothing/mask/muzzle/ballgag/ringgag = 1,
+ /obj/item/clothing/head/shiny_hood = 1,
+ /obj/item/clothing/head/shiny_hood/poly = 1,
+ /obj/item/clothing/head/shiny_hood/closed = 1,
+ /obj/item/clothing/head/shiny_hood/closed/poly = 1,
+ /obj/item/clothing/under/shiny/catsuit = 1,
+ /obj/item/clothing/under/shiny/catsuit/poly = 1,
+ /obj/item/clothing/under/shiny/leotard = 1,
+ /obj/item/clothing/under/shiny/leotard/poly = 1,
+ /obj/item/clothing/accessory/shiny/gloves = 1,
+ /obj/item/clothing/accessory/shiny/gloves/poly = 1,
+ /obj/item/clothing/accessory/shiny/socks = 1,
+ /obj/item/clothing/accessory/shiny/socks/poly = 1
+ )
+ containertype = /obj/structure/closet/crate
+ containername = "Shiny clothes crate"
+ cost = 30
+
+//3/19/21
+/datum/supply_pack/recreation/smoleworld
+ name = "Smole Bulding Bricks"
+ contains = list(
+ /obj/item/weapon/storage/smolebrickcase, /obj/item/weapon/storage/smolebrickcase,
+ )
+ cost = 50
+ containertype = /obj/structure/closet/crate
+ containername = "Smole Bulding Brick crate"
+
+/datum/supply_pack/recreation/smolesnackplanets
+ name = "Snack planets pack"
+ num_contained = 4
+ contains = list(
+ /obj/item/weapon/storage/bagoplanets, /obj/item/weapon/storage/bagoplanets
+ )
+ cost = 25
+ containertype = /obj/structure/closet/crate
+ containername = "Snack planets crate"
+
+/datum/supply_pack/recreation/pinkpillows
+ name = "Pillow Crate - Pink"
+ contains = list(
+ /obj/item/weapon/bedsheet/pillow = 6
+ )
+ cost = 10
+ containertype = /obj/structure/closet/crate
+
+/datum/supply_pack/recreation/tealpillows
+ name = "Pillow Crate - Teal"
+ contains = list(
+ /obj/item/weapon/bedsheet/pillow/teal = 6
+ )
+ cost = 10
+ containertype = /obj/structure/closet/crate
+
+/datum/supply_pack/recreation/whitepillows
+ name = "Pillow Crate - White"
+ contains = list(
+ /obj/item/weapon/bedsheet/pillow/white = 6
+ )
+ cost = 10
+ containertype = /obj/structure/closet/crate
+
+/datum/supply_pack/recreation/blackpillows
+ name = "Pillow Crate - Black"
+ contains = list(
+ /obj/item/weapon/bedsheet/pillow/black = 6
+ )
+ cost = 10
+ containertype = /obj/structure/closet/crate
+
+/datum/supply_pack/recreation/redpillows
+ name = "Pillow Crate - Red"
+ contains = list(
+ /obj/item/weapon/bedsheet/pillow/red = 6
+ )
+ cost = 10
+ containertype = /obj/structure/closet/crate
+
+/datum/supply_pack/recreation/greenpillows
+ name = "Pillow Crate - Green"
+ contains = list(
+ /obj/item/weapon/bedsheet/pillow/green = 6
+ )
+ cost = 10
+ containertype = /obj/structure/closet/crate
+
+/datum/supply_pack/recreation/orangepillows
+ name = "Pillow Crate - Orange"
+ contains = list(
+ /obj/item/weapon/bedsheet/pillow/orange = 6
+ )
+ cost = 10
+ containertype = /obj/structure/closet/crate
+
+/datum/supply_pack/recreation/yellowpillows
+ name = "Pillow Crate - Yellow"
+ contains = list(
+ /obj/item/weapon/bedsheet/pillow/yellow = 6
+ )
+ cost = 10
+ containertype = /obj/structure/closet/crate
diff --git a/code/datums/supplypacks/recreation_vr.dm b/code/datums/supplypacks/recreation_vr.dm
deleted file mode 100644
index 8d8ae503dec..00000000000
--- a/code/datums/supplypacks/recreation_vr.dm
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
-/datum/supply_pack/recreation/rover
- name = "NT Humvee"
- contains = list(
- /obj/vehicle/train/rover/engine
- )
- containertype = /obj/structure/largecrate
- containername = "NT Humvee Crate"
- cost = 100
-*/
-/datum/supply_pack/recreation/restraints
- name = "Recreational Restraints"
- contains = list(
- /obj/item/clothing/mask/muzzle,
- /obj/item/clothing/glasses/sunglasses/blindfold,
- /obj/item/weapon/handcuffs/fuzzy,
- /obj/item/weapon/tape_roll,
- /obj/item/stack/cable_coil/random,
- /obj/item/clothing/accessory/collar/shock,
- /obj/item/clothing/suit/straight_jacket,
- /obj/item/weapon/handcuffs/legcuffs/fuzzy,
- /obj/item/weapon/melee/fluff/holochain/mass,
- /obj/item/weapon/material/twohanded/riding_crop,
- /obj/item/clothing/under/fluff/latexmaid
- )
- containertype = /obj/structure/closet/crate
- containername = "Restraints crate"
- cost = 30
-
-/datum/supply_pack/recreation/wolfgirl_cosplay_crate
- name = "Wolfgirl Cosplay Crate"
- contains = list(
- /obj/item/clothing/head/fluff/wolfgirl = 1,
- /obj/item/clothing/shoes/fluff/wolfgirl = 1,
- /obj/item/clothing/under/fluff/wolfgirl = 1,
- /obj/item/weapon/melee/fluffstuff/wolfgirlsword = 1,
- /obj/item/weapon/shield/fluff/wolfgirlshield = 1
- )
- cost = 50
- containertype = /obj/structure/closet/crate
- containername = "wolfgirl cosplay crate"
-
-/datum/supply_pack/randomised/recreation/figures
- name = "Action figures crate"
- num_contained = 5
- contains = list(
- /obj/random/action_figure/supplypack
- )
- cost = 200
- containertype = /obj/structure/closet/crate
- containername = "Action figures crate"
-
-/datum/supply_pack/recreation/collars
- name = "Collar bundle"
- contains = list(
- /obj/item/clothing/accessory/collar/shock = 1,
- /obj/item/clothing/accessory/collar/spike = 1,
- /obj/item/clothing/accessory/collar/silver = 1,
- /obj/item/clothing/accessory/collar/gold = 1,
- /obj/item/clothing/accessory/collar/bell = 1,
- /obj/item/clothing/accessory/collar/pink = 1,
- /obj/item/clothing/accessory/collar/holo = 1
- )
- cost = 25
- containertype = /obj/structure/closet/crate
- containername = "collar crate"
-
-/datum/supply_pack/recreation/shiny
- name = "Shiny Clothing"
- contains = list(
- /obj/item/clothing/mask/muzzle/ballgag = 1,
- /obj/item/clothing/mask/muzzle/ballgag/ringgag = 1,
- /obj/item/clothing/head/shiny_hood = 1,
- /obj/item/clothing/head/shiny_hood/poly = 1,
- /obj/item/clothing/head/shiny_hood/closed = 1,
- /obj/item/clothing/head/shiny_hood/closed/poly = 1,
- /obj/item/clothing/under/shiny/catsuit = 1,
- /obj/item/clothing/under/shiny/catsuit/poly = 1,
- /obj/item/clothing/under/shiny/leotard = 1,
- /obj/item/clothing/under/shiny/leotard/poly = 1,
- /obj/item/clothing/accessory/shiny/gloves = 1,
- /obj/item/clothing/accessory/shiny/gloves/poly = 1,
- /obj/item/clothing/accessory/shiny/socks = 1,
- /obj/item/clothing/accessory/shiny/socks/poly = 1
- )
- containertype = /obj/structure/closet/crate
- containername = "Shiny clothes crate"
- cost = 30
-
-//3/19/21
-/datum/supply_pack/recreation/smoleworld
- name = "Smole Bulding Bricks"
- contains = list(
- /obj/item/weapon/storage/smolebrickcase, /obj/item/weapon/storage/smolebrickcase,
- )
- cost = 50
- containertype = /obj/structure/closet/crate
- containername = "Smole Bulding Brick crate"
-
-/datum/supply_pack/recreation/smolesnackplanets
- name = "Snack planets pack"
- num_contained = 4
- contains = list(
- /obj/item/weapon/storage/bagoplanets, /obj/item/weapon/storage/bagoplanets
- )
- cost = 25
- containertype = /obj/structure/closet/crate
- containername = "Snack planets crate"
-
-/datum/supply_pack/recreation/pinkpillows
- name = "Pillow Crate - Pink"
- contains = list(
- /obj/item/weapon/bedsheet/pillow = 6
- )
- cost = 10
- containertype = /obj/structure/closet/crate
-
-/datum/supply_pack/recreation/tealpillows
- name = "Pillow Crate - Teal"
- contains = list(
- /obj/item/weapon/bedsheet/pillow/teal = 6
- )
- cost = 10
- containertype = /obj/structure/closet/crate
-
-/datum/supply_pack/recreation/whitepillows
- name = "Pillow Crate - White"
- contains = list(
- /obj/item/weapon/bedsheet/pillow/white = 6
- )
- cost = 10
- containertype = /obj/structure/closet/crate
-
-/datum/supply_pack/recreation/blackpillows
- name = "Pillow Crate - Black"
- contains = list(
- /obj/item/weapon/bedsheet/pillow/black = 6
- )
- cost = 10
- containertype = /obj/structure/closet/crate
-
-/datum/supply_pack/recreation/redpillows
- name = "Pillow Crate - Red"
- contains = list(
- /obj/item/weapon/bedsheet/pillow/red = 6
- )
- cost = 10
- containertype = /obj/structure/closet/crate
-
-/datum/supply_pack/recreation/greenpillows
- name = "Pillow Crate - Green"
- contains = list(
- /obj/item/weapon/bedsheet/pillow/green = 6
- )
- cost = 10
- containertype = /obj/structure/closet/crate
-
-/datum/supply_pack/recreation/orangepillows
- name = "Pillow Crate - Orange"
- contains = list(
- /obj/item/weapon/bedsheet/pillow/orange = 6
- )
- cost = 10
- containertype = /obj/structure/closet/crate
-
-/datum/supply_pack/recreation/yellowpillows
- name = "Pillow Crate - Yellow"
- contains = list(
- /obj/item/weapon/bedsheet/pillow/yellow = 6
- )
- cost = 10
- containertype = /obj/structure/closet/crate
diff --git a/code/datums/supplypacks/robotics.dm b/code/datums/supplypacks/robotics.dm
index 1928ee7db68..a5fec8e2bb1 100644
--- a/code/datums/supplypacks/robotics.dm
+++ b/code/datums/supplypacks/robotics.dm
@@ -220,3 +220,77 @@
cost = 250
containertype = /obj/structure/largecrate/vehicle/quadtrailer
containername = "ATV Trailer Crate"
+
+/datum/supply_pack/robotics/mecha_gopher
+ name = "Circuit Crate (\"Gopher\" APLU)"
+ contains = list(
+ /obj/item/weapon/circuitboard/mecha/gopher/main,
+ /obj/item/weapon/circuitboard/mecha/gopher/peripherals
+ )
+ cost = 25
+ containertype = /obj/structure/closet/crate/secure/science
+ containername = "APLU \"Gopher\" Circuit Crate"
+ access = access_robotics
+
+/datum/supply_pack/robotics/mecha_polecat
+ name = "Circuit Crate (\"Polecat\" APLU)"
+ contains = list(
+ /obj/item/weapon/circuitboard/mecha/polecat/main,
+ /obj/item/weapon/circuitboard/mecha/polecat/peripherals,
+ /obj/item/weapon/circuitboard/mecha/polecat/targeting
+ )
+ cost = 25
+ containertype = /obj/structure/closet/crate/secure/science
+ containername = "APLU \"Polecat\" Circuit Crate"
+ access = access_robotics
+
+/datum/supply_pack/robotics/mecha_weasel
+ name = "Circuit Crate (\"Weasel\" APLU)"
+ contains = list(
+ /obj/item/weapon/circuitboard/mecha/weasel/main,
+ /obj/item/weapon/circuitboard/mecha/weasel/peripherals,
+ /obj/item/weapon/circuitboard/mecha/weasel/targeting
+ )
+ cost = 25
+ containertype = /obj/structure/closet/crate/secure/science
+ containername = "APLU \"Weasel\" Circuit Crate"
+ access = access_robotics
+
+/datum/supply_pack/robotics/some_robolimbs
+ name = "Basic Robolimb Blueprints"
+ contains = list(
+ /obj/item/weapon/disk/limb/morpheus,
+ /obj/item/weapon/disk/limb/xion,
+ /obj/item/weapon/disk/limb/talon
+ )
+ cost = 15
+ containertype = /obj/structure/closet/crate/secure
+ containername = "Basic Robolimb Blueprint Crate"
+ access = access_robotics
+
+/datum/supply_pack/robotics/all_robolimbs
+ name = "Advanced Robolimb Blueprints"
+ contains = list(
+ /obj/item/weapon/disk/limb/bishop,
+ /obj/item/weapon/disk/limb/hephaestus,
+ /obj/item/weapon/disk/limb/morpheus,
+ /obj/item/weapon/disk/limb/veymed,
+ /obj/item/weapon/disk/limb/wardtakahashi,
+ /obj/item/weapon/disk/limb/xion,
+ /obj/item/weapon/disk/limb/zenghu,
+ /obj/item/weapon/disk/limb/talon,
+ /obj/item/weapon/disk/limb/dsi_tajaran,
+ /obj/item/weapon/disk/limb/dsi_lizard,
+ /obj/item/weapon/disk/limb/dsi_sergal,
+ /obj/item/weapon/disk/limb/dsi_nevrean,
+ /obj/item/weapon/disk/limb/dsi_vulpkanin,
+ /obj/item/weapon/disk/limb/dsi_akula,
+ /obj/item/weapon/disk/limb/dsi_spider,
+ /obj/item/weapon/disk/limb/dsi_teshari,
+ /obj/item/weapon/disk/limb/eggnerdltd,
+ /obj/item/weapon/disk/limb/eggnerdltdred
+ )
+ cost = 40
+ containertype = /obj/structure/closet/crate/secure
+ containername = "Advanced Robolimb Blueprint Crate"
+ access = access_robotics
diff --git a/code/datums/supplypacks/robotics_vr.dm b/code/datums/supplypacks/robotics_vr.dm
deleted file mode 100644
index 5e06210079d..00000000000
--- a/code/datums/supplypacks/robotics_vr.dm
+++ /dev/null
@@ -1,73 +0,0 @@
-/datum/supply_pack/robotics/mecha_gopher
- name = "Circuit Crate (\"Gopher\" APLU)"
- contains = list(
- /obj/item/weapon/circuitboard/mecha/gopher/main,
- /obj/item/weapon/circuitboard/mecha/gopher/peripherals
- )
- cost = 25
- containertype = /obj/structure/closet/crate/secure/science
- containername = "APLU \"Gopher\" Circuit Crate"
- access = access_robotics
-
-/datum/supply_pack/robotics/mecha_polecat
- name = "Circuit Crate (\"Polecat\" APLU)"
- contains = list(
- /obj/item/weapon/circuitboard/mecha/polecat/main,
- /obj/item/weapon/circuitboard/mecha/polecat/peripherals,
- /obj/item/weapon/circuitboard/mecha/polecat/targeting
- )
- cost = 25
- containertype = /obj/structure/closet/crate/secure/science
- containername = "APLU \"Polecat\" Circuit Crate"
- access = access_robotics
-
-/datum/supply_pack/robotics/mecha_weasel
- name = "Circuit Crate (\"Weasel\" APLU)"
- contains = list(
- /obj/item/weapon/circuitboard/mecha/weasel/main,
- /obj/item/weapon/circuitboard/mecha/weasel/peripherals,
- /obj/item/weapon/circuitboard/mecha/weasel/targeting
- )
- cost = 25
- containertype = /obj/structure/closet/crate/secure/science
- containername = "APLU \"Weasel\" Circuit Crate"
- access = access_robotics
-
-/datum/supply_pack/robotics/some_robolimbs
- name = "Basic Robolimb Blueprints"
- contains = list(
- /obj/item/weapon/disk/limb/morpheus,
- /obj/item/weapon/disk/limb/xion,
- /obj/item/weapon/disk/limb/talon
- )
- cost = 15
- containertype = /obj/structure/closet/crate/secure
- containername = "Basic Robolimb Blueprint Crate"
- access = access_robotics
-
-/datum/supply_pack/robotics/all_robolimbs
- name = "Advanced Robolimb Blueprints"
- contains = list(
- /obj/item/weapon/disk/limb/bishop,
- /obj/item/weapon/disk/limb/hephaestus,
- /obj/item/weapon/disk/limb/morpheus,
- /obj/item/weapon/disk/limb/veymed,
- /obj/item/weapon/disk/limb/wardtakahashi,
- /obj/item/weapon/disk/limb/xion,
- /obj/item/weapon/disk/limb/zenghu,
- /obj/item/weapon/disk/limb/talon,
- /obj/item/weapon/disk/limb/dsi_tajaran,
- /obj/item/weapon/disk/limb/dsi_lizard,
- /obj/item/weapon/disk/limb/dsi_sergal,
- /obj/item/weapon/disk/limb/dsi_nevrean,
- /obj/item/weapon/disk/limb/dsi_vulpkanin,
- /obj/item/weapon/disk/limb/dsi_akula,
- /obj/item/weapon/disk/limb/dsi_spider,
- /obj/item/weapon/disk/limb/dsi_teshari,
- /obj/item/weapon/disk/limb/eggnerdltd,
- /obj/item/weapon/disk/limb/eggnerdltdred
- )
- cost = 40
- containertype = /obj/structure/closet/crate/secure
- containername = "Advanced Robolimb Blueprint Crate"
- access = access_robotics
diff --git a/code/datums/supplypacks/science.dm b/code/datums/supplypacks/science.dm
index c4c03ffd047..729a543a19d 100644
--- a/code/datums/supplypacks/science.dm
+++ b/code/datums/supplypacks/science.dm
@@ -77,4 +77,52 @@
cost = 100
containertype = /obj/structure/closet/crate/secure/xion
containername = "Xenoarchaeology Tech crate"
- access = access_research
\ No newline at end of file
+ access = access_research
+
+/*
+/datum/supply_pack/sci/dune_buggy
+ name = "Exploration Dune Buggy"
+ contains = list(
+ /obj/vehicle/train/rover/engine/dunebuggy
+ )
+ cost = 100
+ containertype = /obj/structure/largecrate
+ containername = "Exploration Dune Buggy Crate"
+*/
+
+/datum/supply_pack/sci/pred
+ name = "Dangerous Predator crate"
+ cost = 40
+ containertype = /obj/structure/largecrate/animal/pred
+ containername = "Dangerous Predator crate"
+ access = access_xenobiology
+
+/datum/supply_pack/sci/pred_doom
+ name = "EXTREMELY Dangerous Predator crate"
+ cost = 200
+ containertype = /obj/structure/largecrate/animal/dangerous
+ containername = "EXTREMELY Dangerous Predator crate"
+ access = access_xenobiology
+ contraband = 1
+
+/datum/supply_pack/sci/weretiger
+ name = "Exotic Weretiger crate"
+ cost = 55
+ containertype = /obj/structure/largecrate/animal/weretiger
+ containername = "Weretiger crate"
+ access = access_xenobiology
+/*
+/datum/supply_pack/sci/otie
+ name = "VARMAcorp adoptable reject (Dangerous!)"
+ cost = 100
+ containertype = /obj/structure/largecrate/animal/otie
+ containername = "VARMAcorp adoptable reject (Dangerous!)"
+ access = access_xenobiology
+
+/datum/supply_pack/sci/phoronotie
+ name = "VARMAcorp adaptive beta subject (Experimental)"
+ cost = 200
+ containertype = /obj/structure/largecrate/animal/otie/phoron
+ containername = "VARMAcorp adaptive beta subject (Experimental)"
+ access = access_xenobiology
+*/ //VORESTATION AI TEMPORARY REMOVAL. Oties commented out cuz broke.
diff --git a/code/datums/supplypacks/science_vr.dm b/code/datums/supplypacks/science_vr.dm
deleted file mode 100644
index 1d9922e7d8c..00000000000
--- a/code/datums/supplypacks/science_vr.dm
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-/datum/supply_pack/sci/dune_buggy
- name = "Exploration Dune Buggy"
- contains = list(
- /obj/vehicle/train/rover/engine/dunebuggy
- )
- cost = 100
- containertype = /obj/structure/largecrate
- containername = "Exploration Dune Buggy Crate"
-*/
-/datum/supply_pack/sci/pred
- name = "Dangerous Predator crate"
- cost = 40
- containertype = /obj/structure/largecrate/animal/pred
- containername = "Dangerous Predator crate"
- access = access_xenobiology
-
-/datum/supply_pack/sci/pred_doom
- name = "EXTREMELY Dangerous Predator crate"
- cost = 200
- containertype = /obj/structure/largecrate/animal/dangerous
- containername = "EXTREMELY Dangerous Predator crate"
- access = access_xenobiology
- contraband = 1
-
-/datum/supply_pack/sci/weretiger
- name = "Exotic Weretiger crate"
- cost = 55
- containertype = /obj/structure/largecrate/animal/weretiger
- containername = "Weretiger crate"
- access = access_xenobiology
-/*
-/datum/supply_pack/sci/otie
- name = "VARMAcorp adoptable reject (Dangerous!)"
- cost = 100
- containertype = /obj/structure/largecrate/animal/otie
- containername = "VARMAcorp adoptable reject (Dangerous!)"
- access = access_xenobiology
-
-/datum/supply_pack/sci/phoronotie
- name = "VARMAcorp adaptive beta subject (Experimental)"
- cost = 200
- containertype = /obj/structure/largecrate/animal/otie/phoron
- containername = "VARMAcorp adaptive beta subject (Experimental)"
- access = access_xenobiology
-*/ //VORESTATION AI TEMPORARY REMOVAL. Oties commented out cuz broke.
diff --git a/code/datums/supplypacks/security.dm b/code/datums/supplypacks/security.dm
index fc8d9b373bd..9e58d74f1cf 100644
--- a/code/datums/supplypacks/security.dm
+++ b/code/datums/supplypacks/security.dm
@@ -31,6 +31,7 @@
cost = 40
containertype = /obj/structure/closet/crate/secure/gear
containername = "Armor crate"
+ access = access_armory
/datum/supply_pack/security/carriersblack
name = "Armor - Black modular armor"
@@ -685,3 +686,57 @@
containertype = /obj/structure/closet/crate/secure/nanotrasen
containername = "Morale Posters"
access = access_maint_tunnels
+
+/*/datum/supply_pack/security/guardbeast //VORESTATION AI TEMPORARY REMOVAL
+ name = "VARMAcorp autoNOMous security solution"
+ cost = 150
+ containertype = /obj/structure/largecrate/animal/guardbeast
+ containername = "VARMAcorp autoNOMous security solution crate"
+ access = list(
+ access_security,
+ access_xenobiology)
+ one_access = TRUE
+
+/datum/supply_pack/security/guardmutant
+ name = "VARMAcorp autoNOMous security solution for hostile environments"
+ cost = 250
+ containertype = /obj/structure/largecrate/animal/guardmutant
+ containername = "VARMAcorp autoNOMous security phoron-proof solution crate"
+ access = list(
+ access_security,
+ access_xenobiology)
+ one_access = TRUE
+*/
+
+/datum/supply_pack/security/biosuit
+ contains = list(
+ /obj/item/clothing/head/bio_hood/security = 3,
+ /obj/item/clothing/under/rank/security = 3,
+ /obj/item/clothing/suit/bio_suit/security = 3,
+ /obj/item/clothing/shoes/white = 3,
+ /obj/item/clothing/mask/gas = 3,
+ /obj/item/weapon/tank/oxygen = 3,
+ /obj/item/clothing/gloves/sterile/latex,
+ /obj/item/weapon/storage/box/gloves
+ )
+ cost = 40
+
+/datum/supply_pack/security/trackingimplant
+ name = "Implants - Tracking"
+ contains = list(
+ /obj/item/weapon/storage/box/trackimp = 1
+ )
+ cost = 25
+ containertype = /obj/structure/closet/crate/secure
+ containername = "Tracking implants"
+ access = access_security
+
+/datum/supply_pack/security/chemicalimplant
+ name = "Implants - Chemical"
+ contains = list(
+ /obj/item/weapon/storage/box/chemimp = 1
+ )
+ cost = 25
+ containertype = /obj/structure/closet/crate/secure
+ containername = "Chemical implants"
+ access = access_security
diff --git a/code/datums/supplypacks/security_vr.dm b/code/datums/supplypacks/security_vr.dm
deleted file mode 100644
index a00556e5287..00000000000
--- a/code/datums/supplypacks/security_vr.dm
+++ /dev/null
@@ -1,56 +0,0 @@
-/*/datum/supply_pack/security/guardbeast //VORESTATION AI TEMPORARY REMOVAL
- name = "VARMAcorp autoNOMous security solution"
- cost = 150
- containertype = /obj/structure/largecrate/animal/guardbeast
- containername = "VARMAcorp autoNOMous security solution crate"
- access = list(
- access_security,
- access_xenobiology)
- one_access = TRUE
-
-/datum/supply_pack/security/guardmutant
- name = "VARMAcorp autoNOMous security solution for hostile environments"
- cost = 250
- containertype = /obj/structure/largecrate/animal/guardmutant
- containername = "VARMAcorp autoNOMous security phoron-proof solution crate"
- access = list(
- access_security,
- access_xenobiology)
- one_access = TRUE
-*/
-
-/datum/supply_pack/randomised/security/armor
- access = access_armory
-
-/datum/supply_pack/security/biosuit
- contains = list(
- /obj/item/clothing/head/bio_hood/security = 3,
- /obj/item/clothing/under/rank/security = 3,
- /obj/item/clothing/suit/bio_suit/security = 3,
- /obj/item/clothing/shoes/white = 3,
- /obj/item/clothing/mask/gas = 3,
- /obj/item/weapon/tank/oxygen = 3,
- /obj/item/clothing/gloves/sterile/latex,
- /obj/item/weapon/storage/box/gloves
- )
- cost = 40
-
-/datum/supply_pack/security/trackingimplant
- name = "Implants - Tracking"
- contains = list(
- /obj/item/weapon/storage/box/trackimp = 1
- )
- cost = 25
- containertype = /obj/structure/closet/crate/secure
- containername = "Tracking implants"
- access = access_security
-
-/datum/supply_pack/security/chemicalimplant
- name = "Implants - Chemical"
- contains = list(
- /obj/item/weapon/storage/box/chemimp = 1
- )
- cost = 25
- containertype = /obj/structure/closet/crate/secure
- containername = "Chemical implants"
- access = access_security
diff --git a/code/datums/supplypacks/supply.dm b/code/datums/supplypacks/supply.dm
index 96d0d282749..091bb16d8ad 100644
--- a/code/datums/supplypacks/supply.dm
+++ b/code/datums/supplypacks/supply.dm
@@ -135,27 +135,26 @@
containertype = /obj/structure/closet/crate/secure/xion
containername = "Shaft miner equipment"
access = access_mining
-/* //VOREStation Edit - Pointless on Tether.
+
+/* //No longer supported on our current maps, as it requires specialized dropoff beacons and the pathfinding doesn't work well on multi-z
+//plus we have the destination tagger
/datum/supply_pack/supply/mule
name = "Mulebot Crate"
contains = list()
cost = 20
containertype = /obj/structure/largecrate/animal/mulebot
containername = "Mulebot Crate"
-*/ //VOREStation Edit
+*/
+
/datum/supply_pack/supply/cargotrain
name = "Cargo Train Tug"
contains = list(/obj/vehicle/train/engine)
cost = 35
- containertype = /obj/structure/closet/crate/large/xion
- containername = "Cargo Train Tug Crate"
/datum/supply_pack/supply/cargotrailer
name = "Cargo Train Trolley"
contains = list(/obj/vehicle/train/trolley)
cost = 15
- containertype = /obj/structure/closet/crate/large/xion
- containername = "Cargo Train Trolley Crate"
/datum/supply_pack/explorergear
name="Away Team gear"
@@ -208,6 +207,14 @@
containername = "Pilot equipment"
access = access_pilot
+/datum/supply_pack/supply/foodcubes
+ name = "Emergency food cubes"
+ contains = list(
+ /obj/machinery/vending/emergencyfood/filled = 1)
+ cost = 75
+ containertype = /obj/structure/closet/crate/freezer
+ containername = "food cubes"
+
/datum/supply_pack/pathfindergear
name="Away Team Leader gear"
contains = list (
@@ -231,7 +238,7 @@
/obj/item/device/mapping_unit,
/obj/item/clothing/gloves/watch/survival
)
- cost=75
+ cost = 75
containertype = /obj/structure/closet/crate/secure/xion
containername = "Away Team Leader equipment"
access = list(access_explorer)
diff --git a/code/datums/supplypacks/supply_vr.dm b/code/datums/supplypacks/supply_vr.dm
deleted file mode 100644
index 4f5354cebb6..00000000000
--- a/code/datums/supplypacks/supply_vr.dm
+++ /dev/null
@@ -1,7 +0,0 @@
-/datum/supply_pack/supply/foodcubes
- name = "Emergency food cubes"
- contains = list(
- /obj/machinery/vending/emergencyfood/filled = 1)
- cost = 75
- containertype = /obj/structure/closet/crate/freezer
- containername = "food cubes"
\ No newline at end of file
diff --git a/code/datums/supplypacks/vending_refills_vr.dm b/code/datums/supplypacks/vending_refills.dm
similarity index 100%
rename from code/datums/supplypacks/vending_refills_vr.dm
rename to code/datums/supplypacks/vending_refills.dm
diff --git a/code/datums/supplypacks/voidsuits.dm b/code/datums/supplypacks/voidsuits.dm
index 667127e79b8..d9768b3de04 100644
--- a/code/datums/supplypacks/voidsuits.dm
+++ b/code/datums/supplypacks/voidsuits.dm
@@ -234,4 +234,157 @@
cost = 30
containertype = /obj/structure/closet/crate/nanotrasen
containername = "Zaddat Shroud crate"
- access = null
\ No newline at end of file
+ access = null
+
+/datum/supply_pack/voidsuits/explorer
+ name = "Away Team voidsuits"
+ contains = list(
+ /obj/item/clothing/suit/space/void/exploration = 2,
+ /obj/item/clothing/head/helmet/space/void/exploration = 2,
+ /obj/item/clothing/mask/breath = 2,
+ /obj/item/clothing/shoes/magboots = 2,
+ /obj/item/weapon/tank/oxygen = 2
+ )
+ cost = 45
+ containertype = /obj/structure/closet/crate/secure
+ containername = "Away Team voidsuit crate"
+ access = list(access_eva, access_explorer)
+
+/datum/supply_pack/voidsuits/explorer_medic
+ name = "Away Team Medic voidsuits"
+ contains = list(
+ /obj/item/clothing/suit/space/void/exploration = 2,
+ /obj/item/clothing/head/helmet/space/void/exploration = 2,
+ /obj/item/clothing/mask/breath = 2,
+ /obj/item/clothing/shoes/magboots = 2,
+ /obj/item/weapon/tank/oxygen = 2
+ )
+ cost = 45
+ containertype = /obj/structure/closet/crate/secure
+ containername = "Away Team Medic voidsuit crate"
+ access = access_medical
+
+/datum/supply_pack/voidsuits/pilot
+ name = "Pilot voidsuits"
+ contains = list(
+ /obj/item/clothing/suit/space/void/pilot = 1,
+ /obj/item/clothing/head/helmet/space/void/pilot = 1,
+ /obj/item/clothing/mask/breath = 1,
+ /obj/item/clothing/shoes/magboots = 1,
+ /obj/item/weapon/tank/oxygen = 1
+ )
+ cost = 20
+ containertype = /obj/structure/closet/crate/secure
+ containername = "Pilot voidsuit crate"
+ access = access_pilot
+
+// Surplus!
+/datum/supply_pack/voidsuits/com_mining
+ name = "Commonwealth mining voidsuit"
+ contains = list(
+ /obj/item/clothing/suit/space/void/mining/alt2,
+ /obj/item/clothing/head/helmet/space/void/mining/alt2
+ )
+ cost = 150
+ containertype = /obj/structure/closet/crate/secure
+ name = "Commonwealth mining voidsuit crate"
+ access = access_mining
+
+/datum/supply_pack/voidsuits/com_anomaly
+ name = "Commonwealth anomaly suit"
+ contains = list(
+ /obj/item/clothing/suit/space/anomaly/alt,
+ /obj/item/clothing/head/helmet/space/anomaly/alt
+ )
+ cost = 150
+ containertype = /obj/structure/closet/crate/secure
+ name = "Commonwealth anomaly suit crate"
+ access = access_xenoarch
+
+/datum/supply_pack/voidsuits/com_riot
+ name = "Commonwealth riot voidsuit"
+ contains = list(
+ /obj/item/clothing/suit/space/void/security/riot/alt,
+ /obj/item/clothing/head/helmet/space/void/security/riot/alt
+ )
+ cost = 150
+ containertype = /obj/structure/closet/crate/secure
+ name = "Commonwealth riot voidsuit crate"
+ access = access_brig
+
+/datum/supply_pack/voidsuits/com_pilot
+ name = "Commonwealth pilot voidsuit"
+ contains = list(
+ /obj/item/clothing/suit/space/void/pilot/alt2,
+ /obj/item/clothing/head/helmet/space/void/pilot/alt2
+ )
+ cost = 150
+ containertype = /obj/structure/closet/crate/secure
+ name = "Commonwealth pilot voidsuit crate"
+ access = access_pilot
+
+/datum/supply_pack/voidsuits/com_medical
+ name = "Commonwealth medical voidsuit"
+ contains = list(
+ /obj/item/clothing/suit/space/void/medical/alt2,
+ /obj/item/clothing/head/helmet/space/void/medical/alt2
+ )
+ cost = 150
+ containertype = /obj/structure/closet/crate/secure
+ name = "Commonwealth medical voidsuit crate"
+
+/datum/supply_pack/voidsuits/com_explore
+
+ name = "Commonwealth exploration voidsuit"
+ contains = list(
+ /obj/item/clothing/suit/space/void/exploration/alt2,
+ /obj/item/clothing/head/helmet/space/void/exploration/alt2
+ )
+ cost = 150
+ containertype = /obj/structure/closet/crate/secure
+ name = "Commonwealth exploration voidsuit crate"
+ access = list(access_eva, access_explorer)
+
+/datum/supply_pack/voidsuits/com_engineer
+ name = "Commonwealth engineering voidsuit"
+ contains = list(
+ /obj/item/clothing/suit/space/void/engineering/alt2,
+ /obj/item/clothing/head/helmet/space/void/engineering/alt2
+ )
+ cost = 150
+ containertype = /obj/structure/closet/crate/secure
+ name = "Commonwealth engineering voidsuit crate"
+ access = access_engine
+
+/datum/supply_pack/voidsuits/com_atmos
+ name = "Commonwealth atmos voidsuit"
+ contains = list(
+ /obj/item/clothing/suit/space/void/atmos/alt2,
+ /obj/item/clothing/head/helmet/space/void/atmos/alt2
+ )
+ cost = 150
+ containertype = /obj/structure/closet/crate/secure
+ name = "Commonwealth atmos voidsuit crate"
+ access = access_atmospherics
+
+/datum/supply_pack/voidsuits/com_captain
+ name = "Commonwealth captain voidsuit"
+ contains = list(
+ /obj/item/clothing/suit/space/void/captain/alt,
+ /obj/item/clothing/head/helmet/space/void/captain/alt
+ )
+ cost = 150
+ containertype = /obj/structure/closet/crate/secure
+ name = "Commonwealth captain voidsuit crate"
+ access = access_captain
+
+/datum/supply_pack/voidsuits/csc_breaker
+ name = "Shipbreaker's Industrial Suit (inc. jetpack)"
+ contains = list(
+ /obj/item/clothing/suit/space/void/salvagecorp_shipbreaker,
+ /obj/item/clothing/head/helmet/space/void/salvagecorp_shipbreaker,
+ /obj/item/weapon/tank/jetpack/breaker
+ )
+ cost = 100
+ containertype = /obj/structure/closet/crate/coyote_salvage
+ name = "CSC voidsuit crate"
diff --git a/code/datums/supplypacks/voidsuits_vr.dm b/code/datums/supplypacks/voidsuits_vr.dm
deleted file mode 100644
index 54e813c4034..00000000000
--- a/code/datums/supplypacks/voidsuits_vr.dm
+++ /dev/null
@@ -1,152 +0,0 @@
-/datum/supply_pack/voidsuits/explorer
- name = "Away Team voidsuits"
- contains = list(
- /obj/item/clothing/suit/space/void/exploration = 2,
- /obj/item/clothing/head/helmet/space/void/exploration = 2,
- /obj/item/clothing/mask/breath = 2,
- /obj/item/clothing/shoes/magboots = 2,
- /obj/item/weapon/tank/oxygen = 2
- )
- cost = 45
- containertype = /obj/structure/closet/crate/secure
- containername = "Away Team voidsuit crate"
- access = list(access_eva, access_explorer)
-
-/datum/supply_pack/voidsuits/explorer_medic
- name = "Away Team Medic voidsuits"
- contains = list(
- /obj/item/clothing/suit/space/void/exploration = 2,
- /obj/item/clothing/head/helmet/space/void/exploration = 2,
- /obj/item/clothing/mask/breath = 2,
- /obj/item/clothing/shoes/magboots = 2,
- /obj/item/weapon/tank/oxygen = 2
- )
- cost = 45
- containertype = /obj/structure/closet/crate/secure
- containername = "Away Team Medic voidsuit crate"
- access = access_medical
-
-/datum/supply_pack/voidsuits/pilot
- name = "Pilot voidsuits"
- contains = list(
- /obj/item/clothing/suit/space/void/pilot = 1,
- /obj/item/clothing/head/helmet/space/void/pilot = 1,
- /obj/item/clothing/mask/breath = 1,
- /obj/item/clothing/shoes/magboots = 1,
- /obj/item/weapon/tank/oxygen = 1
- )
- cost = 20
- containertype = /obj/structure/closet/crate/secure
- containername = "Pilot voidsuit crate"
- access = access_pilot
-
-
-// Surplus!
-/datum/supply_pack/voidsuits/com_mining
- name = "Commonwealth mining voidsuit"
- contains = list(
- /obj/item/clothing/suit/space/void/mining/alt2,
- /obj/item/clothing/head/helmet/space/void/mining/alt2
- )
- cost = 150
- containertype = /obj/structure/closet/crate/secure
- name = "Commonwealth mining voidsuit crate"
- access = access_mining
-
-/datum/supply_pack/voidsuits/com_anomaly
- name = "Commonwealth anomaly suit"
- contains = list(
- /obj/item/clothing/suit/space/anomaly/alt,
- /obj/item/clothing/head/helmet/space/anomaly/alt
- )
- cost = 150
- containertype = /obj/structure/closet/crate/secure
- name = "Commonwealth anomaly suit crate"
- access = access_xenoarch
-
-/datum/supply_pack/voidsuits/com_riot
- name = "Commonwealth riot voidsuit"
- contains = list(
- /obj/item/clothing/suit/space/void/security/riot/alt,
- /obj/item/clothing/head/helmet/space/void/security/riot/alt
- )
- cost = 150
- containertype = /obj/structure/closet/crate/secure
- name = "Commonwealth riot voidsuit crate"
- access = access_brig
-
-/datum/supply_pack/voidsuits/com_pilot
- name = "Commonwealth pilot voidsuit"
- contains = list(
- /obj/item/clothing/suit/space/void/pilot/alt2,
- /obj/item/clothing/head/helmet/space/void/pilot/alt2
- )
- cost = 150
- containertype = /obj/structure/closet/crate/secure
- name = "Commonwealth pilot voidsuit crate"
- access = access_pilot
-
-/datum/supply_pack/voidsuits/com_medical
- name = "Commonwealth medical voidsuit"
- contains = list(
- /obj/item/clothing/suit/space/void/medical/alt2,
- /obj/item/clothing/head/helmet/space/void/medical/alt2
- )
- cost = 150
- containertype = /obj/structure/closet/crate/secure
- name = "Commonwealth medical voidsuit crate"
-/datum/supply_pack/voidsuits/com_explore
-
- name = "Commonwealth exploration voidsuit"
- contains = list(
- /obj/item/clothing/suit/space/void/exploration/alt2,
- /obj/item/clothing/head/helmet/space/void/exploration/alt2
- )
- cost = 150
- containertype = /obj/structure/closet/crate/secure
- name = "Commonwealth exploration voidsuit crate"
- access = list(access_eva, access_explorer)
-
-/datum/supply_pack/voidsuits/com_engineer
- name = "Commonwealth engineering voidsuit"
- contains = list(
- /obj/item/clothing/suit/space/void/engineering/alt2,
- /obj/item/clothing/head/helmet/space/void/engineering/alt2
- )
- cost = 150
- containertype = /obj/structure/closet/crate/secure
- name = "Commonwealth engineering voidsuit crate"
- access = access_engine
-
-/datum/supply_pack/voidsuits/com_atmos
- name = "Commonwealth atmos voidsuit"
- contains = list(
- /obj/item/clothing/suit/space/void/atmos/alt2,
- /obj/item/clothing/head/helmet/space/void/atmos/alt2
- )
- cost = 150
- containertype = /obj/structure/closet/crate/secure
- name = "Commonwealth atmos voidsuit crate"
- access = access_atmospherics
-
-/datum/supply_pack/voidsuits/com_captain
- name = "Commonwealth captain voidsuit"
- contains = list(
- /obj/item/clothing/suit/space/void/captain/alt,
- /obj/item/clothing/head/helmet/space/void/captain/alt
- )
- cost = 150
- containertype = /obj/structure/closet/crate/secure
- name = "Commonwealth captain voidsuit crate"
- access = access_captain
-
-/datum/supply_pack/voidsuits/csc_breaker
- name = "Shipbreaker's Industrial Suit (inc. jetpack)"
- contains = list(
- /obj/item/clothing/suit/space/void/salvagecorp_shipbreaker,
- /obj/item/clothing/head/helmet/space/void/salvagecorp_shipbreaker,
- /obj/item/weapon/tank/jetpack/breaker
- )
- cost = 100
- containertype = /obj/structure/closet/crate/secure
- name = "Coyote Salvage Corp industrial voidsuit crate"
diff --git a/code/game/objects/random/mapping.dm b/code/game/objects/random/mapping.dm
index 39d26b69cde..2c93fa99edd 100644
--- a/code/game/objects/random/mapping.dm
+++ b/code/game/objects/random/mapping.dm
@@ -167,6 +167,38 @@
prob(10);/obj/effect/decal/remains/posi
)
+/obj/random/nukies_can_legal
+ name = "Random Legal Nukies Can"
+ desc = "This is a random can of (legal) Nukies Energy Drink."
+
+/obj/random/nukies_can_legal/item_to_spawn()
+ return pick(/obj/item/weapon/reagent_containers/food/drinks/cans/nukie_peach,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_pear,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_cherry,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_melon,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_banana,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_rose,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_lemon,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_fruit,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_special)
+
+/obj/random/desatti_snacks
+ name = "Random Desatti Snacks"
+ desc = "This is a random Desatti Catering snack."
+
+/obj/random/desatti_snacks/item_to_spawn()
+ return pick(/obj/item/weapon/storage/box/jaffacake,
+ /obj/item/weapon/storage/box/winegum,
+ /obj/item/weapon/storage/box/saucer,
+ /obj/item/weapon/storage/box/shrimpsandbananas,
+ /obj/item/weapon/storage/box/rhubarbcustard,
+ /obj/item/weapon/storage/box/custardcream,
+ /obj/item/weapon/storage/box/bourbon,
+ /obj/item/weapon/reagent_containers/food/snacks/packaged/sausageroll,
+ /obj/item/weapon/reagent_containers/food/snacks/packaged/pasty,
+ /obj/item/weapon/reagent_containers/food/snacks/packaged/scotchegg,
+ /obj/item/weapon/reagent_containers/food/snacks/packaged/porkpie)
+
/obj/random_multi/single_item/captains_spare_id
name = "Multi Point - Captain's Spare"
id = "Captain's spare id"
@@ -825,6 +857,12 @@
/obj/item/clothing/mask/breath,
/obj/structure/closet/crate/xion //XION SUIT
),
+ prob(5);list(
+ /obj/item/clothing/suit/space/void/salvagecorp_shipbreaker,
+ /obj/item/clothing/head/helmet/space/void/salvagecorp_shipbreaker,
+ /obj/item/weapon/tank/jetpack/breaker,
+ /obj/structure/closet/crate/coyote_salvage //CSC SUIT
+ ),
prob(10);list(
/obj/random/firstaid,
/obj/random/medical,
@@ -936,6 +974,24 @@
/obj/item/weapon/reagent_containers/food/snacks/candy/gummy,
/obj/structure/closet/crate/allico //GUMMIES
),
+ prob(5);list(
+ /obj/random/nukies_can_legal,
+ /obj/random/nukies_can_legal,
+ /obj/random/nukies_can_legal,
+ /obj/random/nukies_can_legal,
+ /obj/random/nukies_can_legal,
+ /obj/random/nukies_can_legal,
+ /obj/structure/closet/crate/nukies // NUKIES DRANKS
+ ),
+ prob(5);list(
+ /obj/random/desatti_snacks,
+ /obj/random/desatti_snacks,
+ /obj/random/desatti_snacks,
+ /obj/random/desatti_snacks,
+ /obj/random/desatti_snacks,
+ /obj/random/desatti_snacks,
+ /obj/structure/closet/crate/desatti //DESATTI SNACKI
+ ),
prob(2);list(
/obj/item/weapon/tank/phoron/pressurized,
/obj/item/weapon/tank/phoron/pressurized,
@@ -1104,6 +1160,12 @@
/obj/item/clothing/mask/breath,
/obj/structure/closet/crate/xion //XION SUIT
),
+ prob(5);list(
+ /obj/item/clothing/suit/space/void/salvagecorp_shipbreaker,
+ /obj/item/clothing/head/helmet/space/void/salvagecorp_shipbreaker,
+ /obj/item/weapon/tank/jetpack/breaker,
+ /obj/structure/closet/crate/coyote_salvage //CSC SUIT
+ ),
prob(10);list(
/obj/random/firstaid,
/obj/random/medical,
@@ -1215,6 +1277,24 @@
/obj/item/weapon/reagent_containers/food/snacks/candy/gummy,
/obj/structure/closet/crate/allico //GUMMIES
),
+ prob(5);list(
+ /obj/random/nukies_can_legal,
+ /obj/random/nukies_can_legal,
+ /obj/random/nukies_can_legal,
+ /obj/random/nukies_can_legal,
+ /obj/random/nukies_can_legal,
+ /obj/random/nukies_can_legal,
+ /obj/structure/closet/crate/nukies // NUKIES DRANKS
+ ),
+ prob(5);list(
+ /obj/random/desatti_snacks,
+ /obj/random/desatti_snacks,
+ /obj/random/desatti_snacks,
+ /obj/random/desatti_snacks,
+ /obj/random/desatti_snacks,
+ /obj/random/desatti_snacks,
+ /obj/structure/closet/crate/desatti //DESATTI SNACKI
+ ),
prob(2);list(
/obj/item/weapon/tank/phoron/pressurized,
/obj/item/weapon/tank/phoron/pressurized,
@@ -1682,3 +1762,240 @@
prob(1);list(/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill),
)
//VOREStation Add End
+
+/obj/random/multiple/corp_crate_supply
+ name = "random corporate supply crate"
+ desc = "A random corporate crate with thematic contents. No weapons."
+ icon = 'icons/obj/storage.dmi'
+ icon_state = "crate"
+
+/obj/random/multiple/corp_crate_supply/item_to_spawn()
+ return pick(
+ prob(10);list(
+ /obj/random/tank,
+ /obj/random/tank,
+ /obj/random/tank,
+ /obj/item/clothing/mask/breath,
+ /obj/item/clothing/mask/breath,
+ /obj/item/clothing/mask/breath,
+ /obj/structure/closet/crate/aether //AETHER AIRSUPPLY
+ ),
+ prob(5);list(
+ /obj/random/multiple/voidsuit/vintage,
+ /obj/random/multiple/voidsuit/vintage,
+ /obj/random/tank,
+ /obj/random/tank,
+ /obj/item/clothing/mask/breath,
+ /obj/item/clothing/mask/breath,
+ /obj/structure/closet/crate/aether //AETHER OLDSUITS
+ ),
+ prob(10);list(
+ /obj/random/mre,
+ /obj/random/mre,
+ /obj/random/mre,
+ /obj/random/mre,
+ /obj/random/mre,
+ /obj/structure/closet/crate/centauri //CENTAURI MRES
+ ),
+ prob(10);list(
+ /obj/random/drinksoft,
+ /obj/random/drinksoft,
+ /obj/random/drinksoft,
+ /obj/random/drinksoft,
+ /obj/random/drinksoft,
+ /obj/structure/closet/crate/freezer/centauri //CENTAURI SODA
+ ),
+ prob(10);list(
+ /obj/random/snack,
+ /obj/random/snack,
+ /obj/random/snack,
+ /obj/random/snack,
+ /obj/random/snack,
+ /obj/structure/closet/crate/freezer/centauri //CENTAURI SNACKS
+ ),
+ prob(10);list(
+ /obj/random/powercell,
+ /obj/random/powercell,
+ /obj/random/powercell,
+ /obj/random/powercell,
+ /obj/structure/closet/crate/einstein //EINSTEIN BATTERYPACK
+ ),
+ prob(5);list(
+ /obj/item/weapon/circuitboard/smes,
+ /obj/random/smes_coil,
+ /obj/random/smes_coil,
+ /obj/structure/closet/crate/focalpoint //FOCAL SMES
+ ),
+ prob(10);list(
+ /obj/item/weapon/module/power_control,
+ /obj/item/stack/cable_coil,
+ /obj/item/frame/apc,
+ /obj/item/weapon/cell/apc,
+ /obj/structure/closet/crate/focalpoint //FOCAL APC
+ ),
+ prob(5);list(
+ /obj/random/drinkbottle,
+ /obj/random/drinkbottle,
+ /obj/random/drinkbottle,
+ /obj/random/cigarettes,
+ /obj/random/cigarettes,
+ /obj/random/cigarettes,
+ /obj/structure/closet/crate/gilthari //GILTHARI LUXURY
+ ),
+ prob(5);list(
+ /obj/random/multiple/voidsuit/security,
+ /obj/random/tank,
+ /obj/item/clothing/mask/breath,
+ /obj/structure/closet/crate/secure/nanotrasen //NTSEC SUIT
+ ),
+ prob(5);list(
+ /obj/random/multiple/voidsuit/medical,
+ /obj/random/tank,
+ /obj/item/clothing/mask/breath,
+ /obj/structure/closet/crate/secure/veymed //VM SUIT
+ ),
+ prob(5);list(
+ /obj/random/multiple/voidsuit/mining,
+ /obj/random/tank,
+ /obj/item/clothing/mask/breath,
+ /obj/structure/closet/crate/grayson //GRAYSON SUIT
+ ),
+ prob(5);list(
+ /obj/random/multiple/voidsuit/engineering,
+ /obj/random/tank,
+ /obj/item/clothing/mask/breath,
+ /obj/structure/closet/crate/xion //XION SUIT
+ ),
+ prob(5);list(
+ /obj/item/clothing/suit/space/void/salvagecorp_shipbreaker,
+ /obj/item/clothing/head/helmet/space/void/salvagecorp_shipbreaker,
+ /obj/item/weapon/tank/jetpack/breaker,
+ /obj/structure/closet/crate/coyote_salvage //CSC SUIT
+ ),
+ prob(10);list(
+ /obj/random/firstaid,
+ /obj/random/medical,
+ /obj/random/medical,
+ /obj/random/medical,
+ /obj/random/medical/lite,
+ /obj/random/medical/lite,
+ /obj/structure/closet/crate/freezer/veymed //VM GRABBAG
+ ),
+ prob(10);list(
+ /obj/random/firstaid,
+ /obj/random/firstaid,
+ /obj/random/firstaid,
+ /obj/random/firstaid,
+ /obj/random/unidentified_medicine/fresh_medicine,
+ /obj/random/unidentified_medicine/fresh_medicine,
+ /obj/structure/closet/crate/freezer/veymed //VM FAKS
+ ),
+ prob(5);list(
+ /obj/random/internal_organ,
+ /obj/random/internal_organ,
+ /obj/random/internal_organ,
+ /obj/random/internal_organ,
+ /obj/structure/closet/crate/freezer/veymed //VM ORGANSES
+ ),
+ prob(10);list(
+ /obj/random/firstaid,
+ /obj/random/medical,
+ /obj/random/medical/pillbottle,
+ /obj/random/medical/pillbottle,
+ /obj/random/medical/lite,
+ /obj/random/medical/lite,
+ /obj/structure/closet/crate/freezer/zenghu //ZENGHU GRABBAG
+ ),
+ prob(10);list(
+ /obj/random/medical/pillbottle,
+ /obj/random/medical/pillbottle,
+ /obj/random/medical/pillbottle,
+ /obj/random/medical/pillbottle,
+ /obj/random/unidentified_medicine/fresh_medicine,
+ /obj/random/unidentified_medicine/fresh_medicine,
+ /obj/structure/closet/crate/freezer/zenghu //ZENGHU PILLS
+ ),
+ prob(10);list(
+ /obj/item/device/toner,
+ /obj/item/device/toner,
+ /obj/item/device/toner,
+ /obj/item/weapon/clipboard,
+ /obj/item/weapon/clipboard,
+ /obj/item/weapon/pen/red,
+ /obj/item/weapon/pen/blue,
+ /obj/item/weapon/pen/blue,
+ /obj/item/device/camera_film,
+ /obj/item/weapon/folder/blue,
+ /obj/item/weapon/folder/red,
+ /obj/item/weapon/folder/yellow,
+ /obj/item/weapon/hand_labeler,
+ /obj/item/weapon/tape_roll,
+ /obj/item/weapon/paper_bin,
+ /obj/item/sticky_pad/random,
+ /obj/structure/closet/crate/ummarcar //UMMARCAR OFFICE TRASH
+ ),
+ prob(5);list(
+ /obj/item/weapon/reagent_containers/food/snacks/unajerky,
+ /obj/item/weapon/reagent_containers/food/snacks/unajerky,
+ /obj/item/weapon/reagent_containers/food/snacks/unajerky,
+ /obj/item/weapon/reagent_containers/food/snacks/unajerky,
+ /obj/item/weapon/reagent_containers/food/snacks/unajerky,
+ /obj/item/weapon/reagent_containers/food/snacks/unajerky,
+ /obj/item/weapon/reagent_containers/food/snacks/unajerky,
+ /obj/item/weapon/reagent_containers/food/snacks/unajerky,
+ /obj/structure/closet/crate/unathi //UNAJERKY
+ ),
+ prob(10);list(
+ /obj/item/weapon/reagent_containers/glass/bucket,
+ /obj/item/weapon/mop,
+ /obj/item/clothing/under/rank/janitor,
+ /obj/item/weapon/cartridge/janitor,
+ /obj/item/clothing/gloves/black,
+ /obj/item/clothing/head/soft/purple,
+ /obj/item/weapon/storage/belt/janitor,
+ /obj/item/clothing/shoes/galoshes,
+ /obj/item/clothing/glasses/hud/janitor,
+ /obj/item/weapon/storage/bag/trash,
+ /obj/item/device/lightreplacer,
+ /obj/item/weapon/reagent_containers/spray/cleaner,
+ /obj/item/weapon/reagent_containers/glass/rag,
+ /obj/item/weapon/grenade/chem_grenade/cleaner,
+ /obj/item/weapon/grenade/chem_grenade/cleaner,
+ /obj/item/weapon/grenade/chem_grenade/cleaner,
+ /obj/structure/closet/crate/galaksi //GALAKSI JANITOR SUPPLIES
+ ),
+ prob(5);list(
+ /obj/item/weapon/reagent_containers/food/snacks/candy/gummy,
+ /obj/item/weapon/reagent_containers/food/snacks/candy/gummy,
+ /obj/item/weapon/reagent_containers/food/snacks/candy/gummy,
+ /obj/item/weapon/reagent_containers/food/snacks/candy/gummy,
+ /obj/item/weapon/reagent_containers/food/snacks/candy/gummy,
+ /obj/item/weapon/reagent_containers/food/snacks/candy/gummy,
+ /obj/item/weapon/reagent_containers/food/snacks/candy/gummy,
+ /obj/item/weapon/reagent_containers/food/snacks/candy/gummy,
+ /obj/structure/closet/crate/allico //GUMMIES
+ ),
+ prob(5);list(
+ /obj/random/nukies_can_legal,
+ /obj/random/nukies_can_legal,
+ /obj/random/nukies_can_legal,
+ /obj/random/nukies_can_legal,
+ /obj/random/nukies_can_legal,
+ /obj/random/nukies_can_legal,
+ /obj/structure/closet/crate/nukies // NUKIES DRANKS
+ ),
+ prob(5);list(
+ /obj/random/desatti_snacks,
+ /obj/random/desatti_snacks,
+ /obj/random/desatti_snacks,
+ /obj/random/desatti_snacks,
+ /obj/random/desatti_snacks,
+ /obj/random/desatti_snacks,
+ /obj/structure/closet/crate/desatti //DESATTI SNACKI
+ ),
+ prob(2);list(
+ /obj/item/weapon/tank/phoron/pressurized,
+ /obj/item/weapon/tank/phoron/pressurized,
+ /obj/structure/closet/crate/secure/phoron //HQ FUEL TANKS
+ ),
+ )
diff --git a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm
index 25554e9b4c0..a6bd2fa1f36 100644
--- a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm
+++ b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm
@@ -17,7 +17,7 @@
/// Length of time (ds) to animate the door transform
var/door_anim_time = 2.0
/// Amount to 'squish' the full width of the door by
- var/door_anim_squish = 0.30
+ var/door_anim_squish = 0.730
/// Virtual angle at which the door is opened to (136 by default, so not a full 180)
var/door_anim_angle = 136
/// Offset for the door hinge location from centerline
@@ -1810,4 +1810,136 @@
"stripe_vertical_left_full" = COLOR_BEASTY_BROWN,
"stripe_vertical_right_full" = COLOR_BEASTY_BROWN,
"cargo_upper" = COLOR_CLOSET_GOLD
+ )
+
+/decl/closet_appearance/wall_double/autolok
+ color = COLOR_GRAY20
+ decals = null
+ extra_decals = list(
+ "stripe_outer" = COLOR_BLUE_GRAY,
+ "stripe_inner" = COLOR_OFF_WHITE
+ )
+
+//TALON
+
+/decl/closet_appearance/secure_closet/talon
+ color = COLOR_GRAY80
+ decals = list(
+ "lower_holes"
+ )
+
+/decl/closet_appearance/secure_closet/talon/engineer
+ extra_decals = list(
+ "stripes_horizontal" = COLOR_BEASTY_BROWN
+ )
+
+/decl/closet_appearance/secure_closet/talon/guard
+ extra_decals = list(
+ "stripes_horizontal" = COLOR_NT_RED
+ )
+
+/decl/closet_appearance/secure_closet/talon/pilot
+ extra_decals = list(
+ "stripes_horizontal" = COLOR_PURPLE
+ )
+
+/decl/closet_appearance/secure_closet/talon/doctor
+ extra_decals = list(
+ "stripes_horizontal" = COLOR_SKY_BLUE
+ )
+
+/decl/closet_appearance/secure_closet/talon/miner
+ extra_decals = list(
+ "stripes_horizontal" = COLOR_BEASTY_BROWN
+ )
+
+/decl/closet_appearance/secure_closet/talon/captain
+ extra_decals = list(
+ "stripes_horizontal" = COLOR_GOLD
+ )
+
+//END TALON
+
+/decl/closet_appearance/secure_closet/nanotrasen
+ color = COLOR_BOTTLE_GREEN
+ decals = list(
+ "lower_holes"
+ )
+
+/decl/closet_appearance/secure_closet/nanotrasen/security
+ extra_decals = list(
+ "stripe_vertical_mid_full" = COLOR_NAVY_BLUE,
+ "nanotrasen" = COLOR_GOLD
+ )
+
+/decl/closet_appearance/secure_closet/nanotrasen/warden
+ extra_decals = list(
+ "stripe_vertical_left_full" = COLOR_NAVY_BLUE,
+ "stripe_vertical_right_full" = COLOR_NAVY_BLUE,
+ "nanotrasen" = COLOR_GOLD
+ )
+
+/decl/closet_appearance/secure_closet/nanotrasen/commander
+ extra_decals = list(
+ "stripe_vertical_left_full" = COLOR_NAVY_BLUE,
+ "stripe_vertical_mid_full" = COLOR_GOLD,
+ "stripe_vertical_right_full" = COLOR_NAVY_BLUE,
+ "nanotrasen" = COLOR_GOLD
+ )
+
+/decl/closet_appearance/secure_closet/expedition
+ color = COLOR_OLIVE
+ decals = list(
+ "lower_side_vent"
+ )
+
+/decl/closet_appearance/secure_closet/expedition/pilot
+ extra_decals = list(
+ "stripe_vertical_mid_full" = COLOR_DARK_ORANGE,
+ "exped" = COLOR_DARK_ORANGE
+ )
+
+/decl/closet_appearance/secure_closet/expedition/sar
+ extra_decals = list(
+ "stripe_vertical_mid_full" = COLOR_SAN_MARINO_BLUE,
+ "exped" = COLOR_SAN_MARINO_BLUE
+ )
+
+/decl/closet_appearance/secure_closet/expedition/explorer
+ extra_decals = list(
+ "stripe_vertical_mid_full" = COLOR_GRAY40,
+ "exped" = COLOR_GRAY40
+ )
+
+/decl/closet_appearance/secure_closet/expedition/pathfinder
+ extra_decals = list(
+ "stripe_vertical_left_full" = COLOR_GRAY20,
+ "stripe_vertical_right_full" = COLOR_GRAY20,
+ "exped" = COLOR_GRAY20
+ )
+
+/decl/closet_appearance/crate/fennec
+ base_icon = 'icons/obj/closets/bases/fencrate_vr.dmi'
+ decal_icon = 'icons/obj/closets/decals/crate.dmi'
+ color = "#ffffff"
+
+/decl/closet_appearance/crate/coyotesalvage
+ color = COLOR_GOLD
+ extra_decals = list(
+ "full_lid" = COLOR_BLACK,
+ "crate_stripe_left" = COLOR_WALL_GUNMETAL,
+ "crate_stripe_right" = COLOR_WALL_GUNMETAL
+ )
+
+/decl/closet_appearance/crate/nukies
+ color = COLOR_NUKIES_GREEN
+ extra_decals = list(
+ "lid_stripes" = COLOR_NUKIES_YELLOW,
+ "hazard" = COLOR_NUKIES_YELLOW
+ )
+
+/decl/closet_appearance/crate/desatti
+ color = COLOR_DESATTI_PRPLOW
+ extra_decals = list(
+ "lid_stripes" = COLOR_DESATTI_PRPHI
)
\ No newline at end of file
diff --git a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm
deleted file mode 100644
index 0f85ed63c81..00000000000
--- a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm
+++ /dev/null
@@ -1,106 +0,0 @@
-/decl/closet_appearance/wall_double/autolok
- color = COLOR_GRAY20
- decals = null
- extra_decals = list(
- "stripe_outer" = COLOR_BLUE_GRAY,
- "stripe_inner" = COLOR_OFF_WHITE
- )
-
-/decl/closet_appearance/secure_closet/talon
- color = COLOR_GRAY80
- decals = list(
- "lower_holes"
- )
-
-/decl/closet_appearance/secure_closet/talon/engineer
- extra_decals = list(
- "stripes_horizontal" = COLOR_BEASTY_BROWN
- )
-
-/decl/closet_appearance/secure_closet/talon/guard
- extra_decals = list(
- "stripes_horizontal" = COLOR_NT_RED
- )
-
-/decl/closet_appearance/secure_closet/talon/pilot
- extra_decals = list(
- "stripes_horizontal" = COLOR_PURPLE
- )
-
-/decl/closet_appearance/secure_closet/talon/doctor
- extra_decals = list(
- "stripes_horizontal" = COLOR_SKY_BLUE
- )
-
-/decl/closet_appearance/secure_closet/talon/miner
- extra_decals = list(
- "stripes_horizontal" = COLOR_BEASTY_BROWN
- )
-
-/decl/closet_appearance/secure_closet/talon/captain
- extra_decals = list(
- "stripes_horizontal" = COLOR_GOLD
- )
-
-/decl/closet_appearance/secure_closet/nanotrasen
- color = COLOR_BOTTLE_GREEN
- decals = list(
- "lower_holes"
- )
-
-/decl/closet_appearance/secure_closet/nanotrasen/security
- extra_decals = list(
- "stripe_vertical_mid_full" = COLOR_NAVY_BLUE,
- "nanotrasen" = COLOR_GOLD
- )
-
-/decl/closet_appearance/secure_closet/nanotrasen/warden
- extra_decals = list(
- "stripe_vertical_left_full" = COLOR_NAVY_BLUE,
- "stripe_vertical_right_full" = COLOR_NAVY_BLUE,
- "nanotrasen" = COLOR_GOLD
- )
-
-/decl/closet_appearance/secure_closet/nanotrasen/commander
- extra_decals = list(
- "stripe_vertical_left_full" = COLOR_NAVY_BLUE,
- "stripe_vertical_mid_full" = COLOR_GOLD,
- "stripe_vertical_right_full" = COLOR_NAVY_BLUE,
- "nanotrasen" = COLOR_GOLD
- )
-
-/decl/closet_appearance/secure_closet/expedition
- color = COLOR_OLIVE
- decals = list(
- "lower_side_vent"
- )
-
-/decl/closet_appearance/secure_closet/expedition/pilot
- extra_decals = list(
- "stripe_vertical_mid_full" = COLOR_DARK_ORANGE,
- "exped" = COLOR_DARK_ORANGE
- )
-
-/decl/closet_appearance/secure_closet/expedition/sar
- extra_decals = list(
- "stripe_vertical_mid_full" = COLOR_SAN_MARINO_BLUE,
- "exped" = COLOR_SAN_MARINO_BLUE
- )
-
-/decl/closet_appearance/secure_closet/expedition/explorer
- extra_decals = list(
- "stripe_vertical_mid_full" = COLOR_GRAY40,
- "exped" = COLOR_GRAY40
- )
-
-/decl/closet_appearance/secure_closet/expedition/pathfinder
- extra_decals = list(
- "stripe_vertical_left_full" = COLOR_GRAY20,
- "stripe_vertical_right_full" = COLOR_GRAY20,
- "exped" = COLOR_GRAY20
- )
-
-/decl/closet_appearance/crate/fennec
- base_icon = 'icons/obj/closets/bases/fencrate_vr.dmi'
- decal_icon = 'icons/obj/closets/decals/crate.dmi'
- color = "#ffffff"
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index 1e1fcbbbcfc..c92fb624dd7 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -440,6 +440,18 @@
desc = "A sterile crate marked with the logo of Zeng-Hu Pharmaceuticals."
closet_appearance = /decl/closet_appearance/crate/zenghu
+/obj/structure/closet/crate/coyote_salvage
+ desc = "A supply crate marked with Coyote Salvage Corp colours."
+ closet_appearance = /decl/closet_appearance/crate/coyotesalvage
+
+/obj/structure/closet/crate/nukies
+ desc = "A luridly-coloured supply crate with Nukies! branding. Is it legal to have this here?"
+ closet_appearance = /decl/closet_appearance/crate/nukies
+
+/obj/structure/closet/crate/desatti
+ desc = "A strikingly-coloured supply crate with Desatti Catering branding."
+ closet_appearance = /decl/closet_appearance/crate/desatti
+
// Brands/subsidiaries
/obj/structure/closet/crate/allico
diff --git a/icons/obj/closets/decals/crate.dmi b/icons/obj/closets/decals/crate.dmi
index a1e76faf3299b230c184921249d7a6de7ec9eb0b..ea1973f51962072b31910dc9b5a526dc3cc70864 100644
GIT binary patch
delta 4218
zcmZ8k2UOEbvnL?|1OzFfS5SJ1QdFw+CcSs?N>zFn0YUgDGzCIeKsrd3-fJi#B1L))
zRS-l7B}TvyLLR<%edm7PoZT}sTh5vJ&Fs$ZC$>XQ-e?0o^^4TksL9C4E^2D18j+EK
zy3cza75VuHHN86PIh#o06?TY-h^V8b-QMOL9u|cara4+nGlV|5kN{Vc>@>ZGIr`++16GBScmr3KoI!9pZ4o
zJY?-{GhpKbTIAK7!)WN
z%PnqS(mV9T(xPx=aN`mbQsP}J5E~_>_r=(YQ_()L@r$bLdhevRBs1iNlWPD(`D!Y)((&{*Ns-@?K6gUe=E($;kIp
zZYiT6ZUB=s$%;;5qS1+oKg&Clll7t}BXpXA={*-I`(kHl;=kX)z|dp-wa(0$6m;?qZJfKSf6MK*U+W+!
z36_8MBoewv6p6YHQ2U%X9WpXHe@#^-lfbOqY~Z3pmIPx|KCiQn0^>q-w);|j=GP!S
zg^3x@?XPIQ))^uR_zr1rvQrYRv67F-bz+^}VL+y){iVqvWC%IO`@iW6Lw~!V1UPqY
z_VcI*20=(r&_!!7@#pH9_E6@^zMNS5=6}>pY&Iz_8X?E!eF3KX
zjWN=#QcsYM$B*4fw-ym%I+(!1xu?E9n^!;Y4b7dIw>-X9e26|1v*c%S3LVFEB6mqq
zmB!BdXQ2PK7DeXjvH?ZfD0`bIJlzd0Tu190dha(19uRu7HBu$7X&o-nepddSD&3
z*}A@bDuQuK+bG_)c>vTB;}?V$w?={X>%mnbZ{Wb4$-}nJO5@tS#Q;*@Nbtjz8EVen
zpRZ5(HdYdHW}6$!5Ucsk7#U7dC$g*4gHlu486c67dGEh0M?Sp1HMlL|m{B}jPEKZF
zSBG@JdY9^|)SJf`X*lJ%(5{_d{>3ht2g#KAaz~7%^mHanY-nO>D$%E)T|hRY6sHuQQk9lLI~JFkw(qYFch_=-9uvxVGhcm_$Ja^mv>?HI&F
ze_F`f{#aL?E_8z?u_d%*vgp21yW$NO
z3%&({%7B}?(+{sTY=)$=h)h>*^t*|B?ep7?(OyOvM!-?GlJ)zm4!rZ3@1zh9bz>rxGy(EX!q
zW%Zvc59uITuK)<`q5_y=j~zsQoB&4(y+k^W!Uq2f5Gu!P{=yS{$~k|FqQuKi73Jic2-i1BdvW*V2=W
z-dn;bf@NC~ICN^{PW8TJnL|W?ki^^_l~G_#hj2VU`*no%-86f!_`^*7g~wSXN$Sr_
zMi+@>huJ3Y#IJ?kcrp#d>bFly)I5Rs2S~X?=tOL%9aeIi27*iSGL{$5TrNoAB`$$V
zHvago-rY?MVDS#xS@8E!4-Ghb!E!q~Y9Bw60jnyBq=U$#&hJZ#2nlX);0FPAto@{_lo%2l<1uW=c>QU`eIXTvy9%|mzyotYp3!%xGz=($J6$g(Ph6V@H@;SL`HCO
zDgKb^AiYVd7Gt&UZa?(sCFK64`u`F7UxBs@U9k-$O?&>1{~toErsHK;Z^%EFdIxw6
zRvo`uTZZZ|Vn62EA8puS8MOr*i$XIV%Cr#mE=ca&JJ{>D9z4qWn)K_!@iDvRCeQpz
zT9baV`r28Fs=NwgdG#Y8J?)@ohlWZO8fT?^l-S?QP|y(vCq$Pf+Up%%2HgO7>$+nU
zGrH+_XOfl86nWpH#^|e?P>hI}?t4}*2SD$r3#lrKG=%zG!7kutjU+3`&C0?#ianml
zphiSc%q!!Hn27DjSz2zKwo&m|h@ACLac(;<|oV5vnkRcd&D3{kUs
zF9C>;zaJMLPghd)#aN_XA))VT@M3i+e(KmMnK<9_Wc`6)PGB1|uhDQDvCNl(O_l-r
zO0?AUxK?QG=BrHl3d^|xY!U%fBZtp+3U+LVYxzK39{jQyQ=3yJC-@nA|YB
zD`Fbb2iC8gzZFHFLj^nP)_P>K$Ea_Hz5wtR_U1kjSfG!)cURrBUHlrBR_d7_SF2Yo
zd`tu^ju1oO*jhs*?@z0n&Phi820`6shoQ967UxFZ$XxdQ3e3`Iutw-^VY0(6gS>2V
zyq8~~;QTamS>fE4P4d2C;+o2S;mJfnEUegK>~86zW+YaL<6n>fe`Gk!R&OJkP!e-p
zZ4<+~F)m7Q>NR;JnA3HzXf47eoM$joQdTZ9GSc8gnH@a?E+PID{AS{pCo7}%tR>U%
z2B>uY?N(96Dvf3Sl_X#A^QS)=oz2g;?BtG2y->)$Ff-|eIU;x>kQcq*W^s{NDw9e>
zJ6nwufqHe3K8_%)(eg+?@(ET?
z9sW4^A3RV0XQL=^+r{MYXW7Dv8fo6tqiKC{2=jTM+@xGu
z6Yx7raX2defrq%!FnC=@E77SI?wBwo_zn=}Fkv=2G=)q+j*yDF9J;o;
zT$a`V=ui*Y79pu0#u(G76*Fbz{&j&OsKnr&rYpl%rt$+nB{}n4my?k!P@5Djw{nyZ
z$A5VCe@a7C^ouW|0U!WdbMnOJ87zaI?(}H?G6Em|LI=ANfq#lutLX$R&$b(nS5mtM
zpjFJE>gDq~1SfSkS~7L_xng4
zAd=>lI@HBW@~W=p0dUjP>OFza@MkC6y{}(ACK@@%QkjBPFB<&D;=JIU1Jm@pBN^Jk
zVzkvq*rA`DrKDsplG6a|<;6`J6{gzDEhq}zcZJPR|5DP+--m`&dw@d-*!2gz;BWEf
zA||_q&K)R5Xh#P#xycJ3+fg<)0dUOu-{>Fuo&Q^kZ2d(fCFc)(;@Dl%*8*KyBTa9{
zOw^o~(_!o}Gj!eE&aCjL(LO1EwbX)WRIZ%LLz6N{ZIwMKZT73@CXKi+aSy_L87W%s
zojr9aeBE%%DO@17pzx)LQjee>D^zFQ{nJgAH^VnbC>angAi7=CtcqleZ!D9fIRzj_K}e2c~`(kE_|KJU8d-`GT|kcvpki
zEU40@X}(b}$Ai7p!;W27tQU>xpIa4P%mFFrA^&;j~qW_9Mm
zU+0uovr*A4g)3G)yU<}RVEX3yQad%4%=TZmbs4tmoSMWn>)WyTcagPSkK8~wus?3_
z7Ri{e39+%BDG&f@95pk^M}xJN!+F|UU!%0dFM8y;+obujr%DN-8qn!+zck#(c5-{Z
zOW%T&UmD%@v@=6lEL}p>g)~q7c(C@A*zu(y;{lo4G>(t{SSr23A_LR
delta 3527
zcmZ`*dpy(M|KHrnwTn`=k(3X)R7AA7eq3I2=K*%Q19)=+D(Rxxi-Y_Vyk~Nl76oE6-0&>FS>P>s~>?
znIR2)jAAz7Z_6fc=kbn?j)8#zXZwKcm+*_7OGOisc$880FiDJb{|2IsywsOyH$Mj+_uypEUG4Mf*A>{&MtzI4+4
z6v*z|Xu!JcoTm;p1i+0CgP&Zx7d_taW052G`DIvCe9S%O_x@+K7kz1A=PA?>(FVb(OS;*yr!;TD6WGHLRYx(~=Xhz|xj}
zqx-l1j<VBxMgFZ
zJaaS3Qu6c^4=bFdB=4poAPGAR?;@GwM@h31&Jb<_{|3%9>rkOKOg%mhe<0uxb@o|d
zVN(I606k9GGxqe|F}e>^qg7iN6HxkF!*8MhwTM(gKlBti3pFP3rt!GUGq|+hMEkEc
z3d!vS9{K?;miSZ*-DlSVD#Ws?3R&$)L7CoMF>NS*|9)Cp!X*|!MS|
zq+j;Le5Nu3KX+$*l#%dE+(18_5FXu_*^@{6+oq;V#H5AMKV9E}`Suz4&y&})>KBY3
z3{O%Mx85BquNz-buN&r3MQz$i)>e8Mj~AT3m+x0%3Yi2d=d}mw
z=V^8M{r0$~vZCuI-#l;g`S-CFgmxJ(+CO#;{KdG(mX1pp99Hu$0k7;?wzKcB-z}Gm
z*0APQUF#AxgX6bV!$t_Hl(BGLxT&8(F$S4v7q`AgMy+N>bty&wiBap;Of@sAs4S~h
zt+9e5Ei2+2OP=;r1(heK0@&N9_sW}_BA*0qsD73))>tpNzgo|Y8L0E4Yr=!X9o}GX
zb_SfqnUMu!pDhYaeriY=~OpP
zjLMOQ@{8Wwvl)a?yI=Q9dY6NTR`XwQml&z>16$qTPD2pOGj#xPVob1V;x}ra;Zpwy
z7s13EQ#RRur#r!Nz6**KtR?!3s!9yJp6+*g%7p#hvF!6K$mUlfR%2N^pC($qpPx56
zBkeULoIrp;qkgFKH&kf4XN-HQDVfH!5n0rS*-*otCD6`|vy0we;ZjodncJp7ZC|OM
zxH8P4k-T3HB%p3WzOm3c|NDe^0y)Fo*3ithm?jHbIcLpGcOm`G$5S&GI0dQTNj5&LMg;V_}vK-GX5MBVWX$yyvI(>bFj^y|?xB;~hYwIa&
z`IkJa#|LW#Zi9G^QTQJ|X`Eg9(A!6gxO@K9q^Ocdr>~eEWrIG)&+e^Qh2ACe5R`mRfoEaF&y|*66@8>_hLHi8b9t1#0i)pXipdKH6&qhS`
zh{%C!gX3@UD=IS2|2?>A;H~<=PO0nKVCO8tP8Yk}4eB|ukO4a3_S0kM>ZA)|VL4dH
zfH;8xaFv;&Rdn#itdFr@NaM>7Tci)xib|@G&=-{|Ov`fbr6Vk6T&BwCoH-vS?PpDo;KO?=Xmx^(y<=$uyXY@f^7jz$gD`+w&DWQX>ND`|bTM
zcRl$Ku)n)STUs4EN&z~6MmO!-)qR_*(CLbx5-DPG^IUvz
zWXCZyAj$HEDhrl4P`WWV-IyGQSy4JwHb{RrxT`{xR75aP6L0|P=nI)?JAsY{+BH^#
zn!IJkm}l?aZ@)ups-!GgF4?9*@h#NTr?AxdHgkCImbG0iFn%<^qDZe(yTsZ7=*6#{
zG;QKt8avt-uYR?NYMr(0p!G+^(A3t}mI+5ONH6m!=I;&_;)~qUNQJN}cF2;j|2t53
z>QjE~f*_XBB*b}62M(!q>ua-D)qWH!&iJQ)T9geHU3LkOseHn@%zb4c`seIca1BW9
zx(iZqGdLZ}b~^4}ILvjwa@m~Jtyfgu*vzO5t82bvcc~BBI;dVFKgA#RBF!u4|5$B@e1UNVVgYcx<%F__M~Mi8pAJ$d_?Z
zdv5U3R}-K1!61-gEo}${6Z`i{`s)LNvQIAaD}B|kW0#V=f%=&xK^ek}KC#@Sl>=|x
zGRrX1e2A>so1H;=cJpi1_?)h@Xw(4qt)pY*1a~9RMGeSOgPl=XyCldPN|?3vIRT$Y
zh@4y;{JFe?X_?v_rD6Zmo8Bhkgx%18!a!O-=Mb^@Td<*#41dh-gt+g$Ax#Qj0?BpI
z^0lx%R}AITaB*t;yF{j&E_}hv(cw{+#^2-7_o%mDl?6;s2AA}0L{-cEpWQPGuBK1OEQKU_j2k3e1oLvTLormZCD>IZ}{cG
zi{FW=tnr6)b93z*ey->tusr*j+LmE1zkgch_5!n4;T`I;Vre;bC~s?Epeg&YVN)f>
zq=Joku%H@^6E`nZ_xHsfPBg*LwvHaojMGnV5ayPQ!R<}k*`)S
zBU)KaS}XiZ=yv$$1eqaY!yl;CVG?VSp0=QIJR=ubD2qT{E
z_QCF7`F)D*x#I|Tw$#hzNd8ZD$l*Fa=RB?RQy5SI
f%l{v{^{EnRtW-JR+j&{zKtpm)j0
diff --git a/vorestation.dme b/vorestation.dme
index eb6b632f2c2..e07375a955c 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -501,38 +501,24 @@
#include "code\datums\roundstats\roundstats.dm"
#include "code\datums\supplypacks\atmospherics.dm"
#include "code\datums\supplypacks\contraband.dm"
-#include "code\datums\supplypacks\contraband_vr.dm"
#include "code\datums\supplypacks\costumes.dm"
-#include "code\datums\supplypacks\costumes_vr.dm"
#include "code\datums\supplypacks\engineering.dm"
-#include "code\datums\supplypacks\engineering_vr.dm"
#include "code\datums\supplypacks\hardsuits.dm"
#include "code\datums\supplypacks\hospitality.dm"
-#include "code\datums\supplypacks\hospitality_vr.dm"
#include "code\datums\supplypacks\hydroponics.dm"
-#include "code\datums\supplypacks\hydroponics_vr.dm"
#include "code\datums\supplypacks\materials.dm"
#include "code\datums\supplypacks\medical.dm"
-#include "code\datums\supplypacks\medical_vr.dm"
#include "code\datums\supplypacks\misc.dm"
-#include "code\datums\supplypacks\misc_vr.dm"
#include "code\datums\supplypacks\munitions.dm"
-#include "code\datums\supplypacks\munitions_vr.dm"
#include "code\datums\supplypacks\musical.dm"
#include "code\datums\supplypacks\recreation.dm"
-#include "code\datums\supplypacks\recreation_vr.dm"
#include "code\datums\supplypacks\robotics.dm"
-#include "code\datums\supplypacks\robotics_vr.dm"
#include "code\datums\supplypacks\science.dm"
-#include "code\datums\supplypacks\science_vr.dm"
#include "code\datums\supplypacks\security.dm"
-#include "code\datums\supplypacks\security_vr.dm"
#include "code\datums\supplypacks\supply.dm"
-#include "code\datums\supplypacks\supply_vr.dm"
#include "code\datums\supplypacks\supplypacks.dm"
-#include "code\datums\supplypacks\vending_refills_vr.dm"
+#include "code\datums\supplypacks\vending_refills.dm"
#include "code\datums\supplypacks\voidsuits.dm"
-#include "code\datums\supplypacks\voidsuits_vr.dm"
#include "code\datums\underwear\bottom.dm"
#include "code\datums\underwear\socks.dm"
#include "code\datums\underwear\top.dm"
@@ -1591,7 +1577,6 @@
#include "code\game\objects\structures\alien\resin structures.dm"
#include "code\game\objects\structures\crates_lockers\__closets.dm"
#include "code\game\objects\structures\crates_lockers\_closets_appearance_definitions.dm"
-#include "code\game\objects\structures\crates_lockers\_closets_appearance_definitions_vr.dm"
#include "code\game\objects\structures\crates_lockers\crates.dm"
#include "code\game\objects\structures\crates_lockers\crates_vr.dm"
#include "code\game\objects\structures\crates_lockers\largecrate.dm"
@@ -4341,7 +4326,6 @@
#include "maps\southern_cross\items\clothing\sc_accessory.dm"
#include "maps\southern_cross\items\clothing\sc_suit.dm"
#include "maps\southern_cross\items\clothing\sc_under.dm"
-#include "maps\tether\tether.dm"
#include "maps\submaps\_helpers.dm"
#include "maps\submaps\_readme.dm"
#include "maps\submaps\admin_use_vr\event_autonomous_drone.dm"
@@ -4352,5 +4336,6 @@
#include "maps\submaps\space_submaps\debrisfield\debrisfield.dm"
#include "maps\submaps\surface_submaps\wilderness\wilderness.dm"
#include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm"
+#include "maps\tether\tether.dm"
#include "maps\~map_system\maps.dm"
// END_INCLUDE