cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 13:39:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Supply System Updates (#16161)

Browse Source 
* supply system updates

* supply system updates

* Update vorestation.dme
This commit is contained in:
Killian
2024-08-22 20:00:14 +10:00
committed by GitHub
parent 31677e921d
commit 1e49f4bdb5
38 changed files with 1951 additions and 1600 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/random/mapping.dm
+317
View File
@@ -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
),
)
code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm
+133 -1
View File
@@ -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
)
code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm
-106
View File
@@ -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"
code/game/objects/structures/crates_lockers/crates.dm
+12
View File
@@ -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