mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-29 16:10:02 +01:00
FabianK3andGitHub
77019460cc
# Summary This PR adjust welding packs and fryers. Welding packs now spawn empty [on the Horizon] to encourage the persistent welding tanks and fryers have their optimal oil level adjusted to balance out oil refills. **Depends on https://github.com/Aurorastation/Aurora.3/pull/23005**. ## Changes - Added new sprite for empty welding packs. (Regular vs new low variant) <img width="835" height="108" alt="image" src="https://github.com/user-attachments/assets/a882bff1-901b-4b0e-8d1d-750ed4e1e83c" /> - Welding packs now spawn empty (only on the Horizon and during map load). - Deep fryer no longer contain 9 full tanks of cooking oil. They contain 100u now and make refills using the [persistent cooking oil tanks](https://github.com/Aurorastation/Aurora.3/pull/23005) much more reasonable. Added a wrench to the kitchen for tank handling.
286 lines
12 KiB
Plaintext
286 lines
12 KiB
Plaintext
/obj/random/mre
|
|
name = "random MRE"
|
|
desc = "This is a random single MRE."
|
|
icon_state = "mre_bag"
|
|
spawnlist = list(
|
|
/obj/item/storage/box/fancy/mre,
|
|
/obj/item/storage/box/fancy/mre/menu2,
|
|
/obj/item/storage/box/fancy/mre/menu3,
|
|
/obj/item/storage/box/fancy/mre/menu4,
|
|
/obj/item/storage/box/fancy/mre/menu5,
|
|
/obj/item/storage/box/fancy/mre/menu6,
|
|
/obj/item/storage/box/fancy/mre/menu7,
|
|
/obj/item/storage/box/fancy/mre/menu8,
|
|
/obj/item/storage/box/fancy/mre/menu9,
|
|
/obj/item/storage/box/fancy/mre/menu10
|
|
)
|
|
|
|
/obj/random/mre/main
|
|
name = "random MRE main course"
|
|
desc = "This is a random main course for MREs."
|
|
icon_state = "mre_meal"
|
|
spawnlist = list(
|
|
/obj/item/storage/box/fancy/mrebag,
|
|
/obj/item/storage/box/fancy/mrebag/menu2,
|
|
/obj/item/storage/box/fancy/mrebag/menu3,
|
|
/obj/item/storage/box/fancy/mrebag/menu4,
|
|
/obj/item/storage/box/fancy/mrebag/menu5,
|
|
/obj/item/storage/box/fancy/mrebag/menu6,
|
|
/obj/item/storage/box/fancy/mrebag/menu7,
|
|
/obj/item/storage/box/fancy/mrebag/menu8
|
|
)
|
|
|
|
/obj/random/mre/dessert
|
|
name = "random MRE dessert"
|
|
desc = "This is a random dessert for MREs."
|
|
icon_state = "mre_desert"
|
|
spawnlist = list(
|
|
/obj/item/reagent_containers/food/snacks/candy,
|
|
/obj/item/reagent_containers/food/snacks/proteinbar,
|
|
/obj/item/reagent_containers/food/snacks/donut/normal,
|
|
/obj/item/reagent_containers/food/snacks/donut/cherryjelly,
|
|
/obj/item/reagent_containers/food/snacks/chocolatebar,
|
|
/obj/item/reagent_containers/food/snacks/cookie,
|
|
/obj/item/reagent_containers/food/snacks/poppypretzel,
|
|
/obj/item/reagent_containers/food/snacks/chocolate_bar,
|
|
/obj/item/reagent_containers/food/snacks/chocolate_bar/nuts,
|
|
/obj/item/reagent_containers/food/snacks/chocolate_bar/bubbles,
|
|
/obj/item/reagent_containers/food/snacks/chocolate_bar/kelp,
|
|
/obj/item/reagent_containers/food/snacks/chocolate_bar/cetibar,
|
|
/obj/item/reagent_containers/food/snacks/chocolate_bar/idrisbar,
|
|
/obj/item/reagent_containers/food/snacks/chocolate_bar/lattecrunch = 1,
|
|
/obj/item/reagent_containers/food/snacks/chocolate_bar/marsbar = 1,
|
|
/obj/item/reagent_containers/food/snacks/chocolate_bar/crispbar = 1,
|
|
/obj/item/reagent_containers/food/snacks/chocolate_bar/ohdaddybar = 1,
|
|
/obj/item/reagent_containers/food/snacks/chocolate_bar/laughterbar = 1,
|
|
/obj/item/storage/box/fancy/gum
|
|
)
|
|
|
|
/obj/random/mre/dessert/vegan
|
|
name = "random vegan MRE dessert"
|
|
desc = "This is a random vegan dessert for MREs."
|
|
spawnlist = list(
|
|
/obj/item/reagent_containers/food/snacks/candy,
|
|
/obj/item/reagent_containers/food/snacks/donut/cherryjelly,
|
|
/obj/item/reagent_containers/food/snacks/plumphelmetbiscuit
|
|
)
|
|
|
|
/obj/random/mre/drink
|
|
name = "random MRE drink"
|
|
desc = "This is a random drink for MREs."
|
|
icon_state = "packet_small"
|
|
spawnlist = list(
|
|
/obj/item/reagent_containers/food/condiment/small/packet/coffee,
|
|
/obj/item/reagent_containers/food/condiment/small/packet/tea,
|
|
/obj/item/reagent_containers/food/condiment/small/packet/cocoa,
|
|
/obj/item/reagent_containers/food/condiment/small/packet/grape,
|
|
/obj/item/reagent_containers/food/condiment/small/packet/orange,
|
|
/obj/item/reagent_containers/food/condiment/small/packet/watermelon,
|
|
/obj/item/reagent_containers/food/condiment/small/packet/apple
|
|
)
|
|
|
|
/obj/random/mre/spread
|
|
name = "random MRE spread"
|
|
desc = "This is a random spread packet for MREs."
|
|
icon_state = "packet_medium"
|
|
spawnlist = list(
|
|
/obj/item/reagent_containers/food/condiment/small/packet/jelly,
|
|
/obj/item/reagent_containers/food/condiment/small/packet/honey
|
|
)
|
|
|
|
/obj/random/mre/spread/vegan
|
|
name = "random vegan MRE spread"
|
|
desc = "This is a random vegan spread packet for MREs."
|
|
spawnlist = list(/obj/item/reagent_containers/food/condiment/small/packet/jelly)
|
|
|
|
/obj/random/mre/sauce
|
|
name = "random MRE sauce"
|
|
desc = "This is a random sauce packet for MREs."
|
|
icon_state = "packet_medium"
|
|
spawnlist = list(
|
|
/obj/item/reagent_containers/food/condiment/small/packet/salt,
|
|
/obj/item/reagent_containers/food/condiment/small/packet/pepper,
|
|
/obj/item/reagent_containers/food/condiment/small/packet/sugar,
|
|
/obj/item/reagent_containers/food/condiment/small/packet/capsaicin,
|
|
/obj/item/reagent_containers/food/condiment/small/packet/ketchup,
|
|
/obj/item/reagent_containers/food/condiment/small/packet/mayo,
|
|
/obj/item/reagent_containers/food/condiment/small/packet/soy
|
|
)
|
|
|
|
/obj/random/mre/sauce/vegan
|
|
spawnlist = list(
|
|
/obj/item/reagent_containers/food/condiment/small/packet/salt,
|
|
/obj/item/reagent_containers/food/condiment/small/packet/pepper,
|
|
/obj/item/reagent_containers/food/condiment/small/packet/sugar,
|
|
/obj/item/reagent_containers/food/condiment/small/packet/soy
|
|
)
|
|
|
|
/obj/random/mre/sauce/sugarfree
|
|
spawnlist = list(
|
|
/obj/item/reagent_containers/food/condiment/small/packet/salt,
|
|
/obj/item/reagent_containers/food/condiment/small/packet/pepper,
|
|
/obj/item/reagent_containers/food/condiment/small/packet/capsaicin,
|
|
/obj/item/reagent_containers/food/condiment/small/packet/ketchup,
|
|
/obj/item/reagent_containers/food/condiment/small/packet/mayo,
|
|
/obj/item/reagent_containers/food/condiment/small/packet/soy
|
|
)
|
|
|
|
/obj/random/mre/sauce/crayon
|
|
spawnlist = list(
|
|
/obj/item/reagent_containers/food/condiment/small/packet/crayon,
|
|
/obj/item/reagent_containers/food/condiment/small/packet/crayon/red,
|
|
/obj/item/reagent_containers/food/condiment/small/packet/crayon/orange,
|
|
/obj/item/reagent_containers/food/condiment/small/packet/crayon/yellow,
|
|
/obj/item/reagent_containers/food/condiment/small/packet/crayon/green,
|
|
/obj/item/reagent_containers/food/condiment/small/packet/crayon/blue,
|
|
/obj/item/reagent_containers/food/condiment/small/packet/crayon/purple,
|
|
/obj/item/reagent_containers/food/condiment/small/packet/crayon/grey,
|
|
/obj/item/reagent_containers/food/condiment/small/packet/crayon/brown
|
|
)
|
|
|
|
/obj/random/booze
|
|
name = "random alcohol bottle"
|
|
desc = "This is a random alcohol bottle."
|
|
icon_state = "broken_bottle"
|
|
spawnlist = list(
|
|
/obj/item/reagent_containers/food/drinks/bottle/gin,
|
|
/obj/item/reagent_containers/food/drinks/bottle/whiskey,
|
|
/obj/item/reagent_containers/food/drinks/bottle/vodka,
|
|
/obj/item/reagent_containers/food/drinks/bottle/tequila,
|
|
/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing,
|
|
/obj/item/reagent_containers/food/drinks/bottle/rum,
|
|
/obj/item/reagent_containers/food/drinks/bottle/champagne,
|
|
/obj/item/reagent_containers/food/drinks/bottle/vermouth,
|
|
/obj/item/reagent_containers/food/drinks/bottle/kahlua,
|
|
/obj/item/reagent_containers/food/drinks/bottle/cognac,
|
|
/obj/item/reagent_containers/food/drinks/bottle/wine,
|
|
/obj/item/reagent_containers/food/drinks/bottle/absinthe,
|
|
/obj/item/reagent_containers/food/drinks/bottle/melonliquor,
|
|
/obj/item/reagent_containers/food/drinks/bottle/pwine,
|
|
/obj/item/reagent_containers/food/drinks/bottle/brandy,
|
|
/obj/item/reagent_containers/food/drinks/bottle/guinness,
|
|
/obj/item/reagent_containers/food/drinks/bottle/drambuie,
|
|
/obj/item/reagent_containers/food/drinks/bottle/cremeyvette,
|
|
/obj/item/reagent_containers/food/drinks/bottle/cremewhite,
|
|
/obj/item/reagent_containers/food/drinks/bottle/chartreuseyellow,
|
|
/obj/item/reagent_containers/food/drinks/bottle/chartreusegreen,
|
|
/obj/item/reagent_containers/food/drinks/bottle/grenadine,
|
|
/obj/item/reagent_containers/food/drinks/bottle/bluecuracao,
|
|
/obj/item/reagent_containers/food/drinks/bottle/bitters,
|
|
/obj/item/reagent_containers/food/drinks/bottle/champagne,
|
|
/obj/item/reagent_containers/food/drinks/bottle/mintsyrup,
|
|
/obj/item/reagent_containers/food/drinks/bottle/sarezhiwine,
|
|
/obj/item/reagent_containers/food/drinks/bottle/small/beer,
|
|
/obj/item/reagent_containers/food/drinks/bottle/small/ale,
|
|
/obj/item/reagent_containers/food/drinks/bottle/small/xuizijuice,
|
|
/obj/random/yoke
|
|
)
|
|
|
|
/obj/random/yoke
|
|
name = "random yoke"
|
|
desc = "This is a random yoke of alcoholic cans."
|
|
icon_state = "broken_bottle"
|
|
spawnlist = list(
|
|
/obj/item/storage/box/fancy/yoke/beer,
|
|
/obj/item/storage/box/fancy/yoke/ebisu,
|
|
/obj/item/storage/box/fancy/yoke/shimauma,
|
|
/obj/item/storage/box/fancy/yoke/moonlabor,
|
|
/obj/item/storage/box/fancy/yoke/earthmover,
|
|
/obj/item/storage/box/fancy/yoke/whistlingforest,
|
|
/obj/item/storage/box/fancy/yoke/threetowns,
|
|
/obj/item/storage/box/fancy/yoke/alcoholic/random // one yoke of randomly different cans
|
|
)
|
|
|
|
/obj/random/yoke/soda
|
|
name = "random soda yoke"
|
|
desc = "This is a random yoke of soda cans."
|
|
spawnlist = list(
|
|
/obj/item/storage/box/fancy/yoke/cola,
|
|
/obj/item/storage/box/fancy/yoke/space_mountain_wind,
|
|
/obj/item/storage/box/fancy/yoke/thirteenloko,
|
|
/obj/item/storage/box/fancy/yoke/dr_gibb,
|
|
/obj/item/storage/box/fancy/yoke/starkist,
|
|
/obj/item/storage/box/fancy/yoke/space_up,
|
|
/obj/item/storage/box/fancy/yoke/lemon_lime,
|
|
/obj/item/storage/box/fancy/yoke/iced_tea,
|
|
/obj/item/storage/box/fancy/yoke/grape_juice,
|
|
/obj/item/storage/box/fancy/yoke/tonic,
|
|
/obj/item/storage/box/fancy/yoke/sodawater,
|
|
/obj/item/storage/box/fancy/yoke/root_beer,
|
|
/obj/item/storage/box/fancy/yoke/diet_cola,
|
|
/obj/item/storage/box/fancy/yoke/peach_soda,
|
|
/obj/item/storage/box/fancy/yoke/melon_soda,
|
|
/obj/item/storage/box/fancy/yoke/himeokvass,
|
|
/obj/item/storage/box/fancy/yoke/xanuchai,
|
|
/obj/item/storage/box/fancy/yoke/beetle_milk,
|
|
/obj/item/storage/box/fancy/yoke/random
|
|
)
|
|
|
|
/obj/random/yoke/energy
|
|
name = "random energy yoke"
|
|
desc = "This is a random yoke of energy drink cans."
|
|
spawnlist = list(
|
|
/obj/item/storage/box/fancy/yoke/energy/zoracherry,
|
|
/obj/item/storage/box/fancy/yoke/energy/zoraphoron,
|
|
/obj/item/storage/box/fancy/yoke/energy/zoraklax,
|
|
/obj/item/storage/box/fancy/yoke/energy/zoracthur,
|
|
/obj/item/storage/box/fancy/yoke/energy/zoravenom,
|
|
/obj/item/storage/box/fancy/yoke/energy/zorahozm,
|
|
/obj/item/storage/box/fancy/yoke/energy/zorakois,
|
|
/obj/item/storage/box/fancy/yoke/energy/random
|
|
)
|
|
|
|
/obj/random/keg
|
|
name = "random alcohol keg"
|
|
desc = "Contains a random alcohol keg."
|
|
icon_state = "keg"
|
|
spawnlist = list(
|
|
/obj/structure/reagent_dispensers/keg/beerkeg = 2,
|
|
/obj/structure/reagent_dispensers/keg/beerkeg/rice = 0.5,
|
|
/obj/structure/reagent_dispensers/keg/xuizikeg = 0.5,
|
|
/obj/structure/reagent_dispensers/keg/mead = 0.5,
|
|
/obj/structure/reagent_dispensers/keg/sake = 0.5
|
|
)
|
|
|
|
/obj/random/pizzabox
|
|
name = "random pizzabox"
|
|
desc = "Contains a random pizzabox."
|
|
icon_state = "pizzabox"
|
|
spawnlist = list(
|
|
/obj/item/pizzabox/margherita,
|
|
/obj/item/pizzabox/vegetable,
|
|
/obj/item/pizzabox/mushroom,
|
|
/obj/item/pizzabox/meat,
|
|
/obj/item/pizzabox/pineapple,
|
|
/obj/item/pizzabox/pepperoni,
|
|
)
|
|
|
|
/obj/random/chocolate
|
|
name = "random chocolate"
|
|
desc = "This is a random chocolate."
|
|
icon_state = "mre_desert"
|
|
spawnlist = list(
|
|
/obj/item/reagent_containers/food/snacks/chocolate_bar,
|
|
/obj/item/reagent_containers/food/snacks/chocolate_bar/nuts,
|
|
/obj/item/reagent_containers/food/snacks/chocolate_bar/bubbles,
|
|
/obj/item/reagent_containers/food/snacks/chocolate_bar/kelp,
|
|
/obj/item/reagent_containers/food/snacks/chocolate_bar/cetibar,
|
|
/obj/item/reagent_containers/food/snacks/chocolate_bar/idrisbar,
|
|
/obj/item/reagent_containers/food/snacks/chocolate_bar/lattecrunch = 1,
|
|
/obj/item/reagent_containers/food/snacks/chocolate_bar/marsbar = 1,
|
|
/obj/item/reagent_containers/food/snacks/chocolate_bar/crispbar = 1,
|
|
/obj/item/reagent_containers/food/snacks/chocolate_bar/ohdaddybar = 1,
|
|
/obj/item/reagent_containers/food/snacks/chocolate_bar/laughterbar = 1,
|
|
/obj/item/storage/box/fancy/readies
|
|
)
|
|
|
|
/obj/random/cookingoil
|
|
name = "random cooking oil"
|
|
desc = "Has a 50% chance of spawning a tank of cooking oil, otherwise nothing."
|
|
icon = 'icons/obj/reagent_dispensers.dmi'
|
|
icon_state = "oiltank"
|
|
spawn_nothing_percentage = 50
|
|
spawnlist = list(
|
|
/obj/structure/reagent_dispensers/cookingoil
|
|
)
|