cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Supply System Updates (#8814)

Browse Source 
Co-authored-by: Killian <49700375+KillianKirilenko@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2
2024-08-28 06:42:58 -07:00
committed by GitHub
parent 27d4ae0e96
commit 7a5d3341a7
39 changed files with 1973 additions and 1621 deletions
Download Patch File Download Diff File Expand all files Collapse all files

317
code/game/objects/random/mapping.dm
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
),
)