cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 21:48:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync

Browse Source
This commit is contained in:
xPokee
2025-10-03 07:05:54 -04:00
parent d9c4fe21be 7ee1cd7c06
commit 5e629dff04
517 changed files with 24339 additions and 21253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/spawners/random/engineering.dm
+112 -2
View File
@@ -118,8 +118,118 @@
/obj/effect/spawner/random/engineering/vending_restock
name = "vending restock spawner"
icon_state = "vending_restock"
loot_subtype_path = /obj/item/vending_refill
loot = list()
loot = list(
/obj/effect/spawner/random/engineering/vending_restock/common = 935,
/obj/effect/spawner/random/engineering/vending_restock/rare = 60,
/obj/effect/spawner/random/engineering/vending_restock/oddity = 5,
)
/obj/effect/spawner/random/engineering/vending_restock/wardrobe
name = "wardrobe vending restock spawner"
icon_state = "vending_restock"
loot = list(
/obj/item/vending_refill/wardrobe/det_wardrobe = 1,
/obj/item/vending_refill/wardrobe/medi_wardrobe = 1,
/obj/item/vending_refill/wardrobe/chem_wardrobe = 1,
/obj/item/vending_refill/wardrobe/viro_wardrobe = 1,
/obj/item/vending_refill/wardrobe/sec_wardrobe = 1,
/obj/item/vending_refill/wardrobe/science_wardrobe = 1,
/obj/item/vending_refill/wardrobe/robo_wardrobe = 1,
/obj/item/vending_refill/wardrobe/gene_wardrobe = 1,
/obj/item/vending_refill/wardrobe/engi_wardrobe = 1,
/obj/item/vending_refill/wardrobe/atmos_wardrobe = 1,
/obj/item/vending_refill/wardrobe/cargo_wardrobe = 1,
/obj/item/vending_refill/wardrobe/hydro_wardrobe = 1,
/obj/item/vending_refill/wardrobe/chap_wardrobe = 1,
/obj/item/vending_refill/wardrobe/chef_wardrobe = 1,
/obj/item/vending_refill/wardrobe/chap_wardrobe = 1,
/obj/item/vending_refill/wardrobe/curator_wardrobe= 1,
/obj/item/vending_refill/wardrobe/jani_wardrobe = 1,
/obj/item/vending_refill/wardrobe/law_wardrobe = 1,
)
/obj/effect/spawner/random/engineering/vending_restock/food_and_drink
name = "food & drink vending restock spawner"
icon_state = "vending_restock"
loot = list(
/obj/item/vending_refill/cigarette = 1,
/obj/item/vending_refill/cola = 1,
/obj/item/vending_refill/coffee = 1,
/obj/item/vending_refill/snack = 1,
/obj/item/vending_refill/boozeomat = 1,
/obj/item/vending_refill/sustenance = 1,
/obj/item/vending_refill/sovietsoda = 1,
/obj/item/vending_refill/cola/shamblers = 1,
)
/obj/effect/spawner/random/engineering/vending_restock/medical
name = "medical vending restock spawner"
icon_state = "vending_restock"
loot = list(
/obj/item/vending_refill/wallmed = 1,
/obj/item/vending_refill/medical = 1,
/obj/item/vending_refill/drugs = 1,
)
/obj/effect/spawner/random/engineering/vending_restock/engineering
name = "engineering vending restock spawner"
icon_state = "vending_restock"
loot = list(
/obj/item/vending_refill/engivend = 1,
/obj/item/vending_refill/engineering = 1,
/obj/item/vending_refill/youtool = 1,
/obj/item/vending_refill/modularpc = 1,
/obj/item/vending_refill/robotics = 1,
/obj/item/vending_refill/assist = 1,
)
//common everyday vendors
/obj/effect/spawner/random/engineering/vending_restock/common
name = "common vending restock spawner"
icon_state = "vending_restock"
loot = list(
/obj/effect/spawner/random/engineering/vending_restock/wardrobe = 8, //roughtly reduced to half weight due to lameness of drobe contents
/obj/effect/spawner/random/engineering/vending_restock/food_and_drink = 8,
/obj/effect/spawner/random/engineering/vending_restock/engineering = 6,
/obj/effect/spawner/random/engineering/vending_restock/medical = 3,
/obj/item/vending_refill/cart = 1,
/obj/item/vending_refill/clothing = 1,
/obj/item/vending_refill/autodrobe = 1,
/obj/item/vending_refill/security = 1,
/obj/item/vending_refill/custom = 1,
/obj/item/vending_refill/dinnerware = 1,
/obj/item/vending_refill/cytopro = 1,
/obj/item/vending_refill/hydronutrients = 1,
/obj/item/vending_refill/hydroseeds = 1,
/obj/item/vending_refill/games = 1,
)
//vendors that should feel rare and special but are unlikely to warp the shift too much
/obj/effect/spawner/random/engineering/vending_restock/rare
name = "rare vending restock spawner"
icon_state = "vending_restock"
loot = list(
/obj/item/vending_refill/syndichem = 1,
/obj/item/vending_refill/cigarette/syndicate = 1,
/obj/item/vending_refill/plasmaresearch = 1,
/obj/item/vending_refill/donksnackvendor = 1,
/obj/item/vending_refill/donksoft = 1,
/obj/item/vending_refill/hotdog = 1,
)
//high chance to derail the shift, use cautiously
/obj/effect/spawner/random/engineering/vending_restock/oddity
name = "oddity vending restock spawner"
icon_state = "vending_restock"
loot = list(
/obj/item/vending_refill/magivend = 1,
/obj/item/vending_refill/liberation = 1,
/obj/item/vending_refill/wardrobe/cent_wardrobe = 1,
)
/obj/effect/spawner/random/engineering/atmospherics_portable
name = "portable atmospherics machine spawner"
code/game/objects/effects/spawners/random/mining_loot.dm
+66
View File
@@ -0,0 +1,66 @@
/// For spawning loot from necropolis chests or other sources, this randomly chooses one of the following entries to spawn.
/obj/effect/spawner/random/mining_loot
name = "random mining loot"
desc = "Spawns one random mining loot."
icon = 'icons/obj/storage/crates.dmi'
icon_state = "necrocrate"
loot = list(
/obj/item/shared_storage/red = 1,
/obj/item/soulstone/anybody/mining = 1,
/obj/item/clothing/glasses/godeye = 1,
/obj/item/reagent_containers/cup/bottle/potion/flight = 1,
/obj/item/clothing/gloves/gauntlets = 1,
/obj/effect/spawner/random/mining_loot/pka_mod = 1,
/obj/item/rod_of_asclepius = 1,
/obj/item/organ/heart/cursed/wizard = 1,
/obj/item/ship_in_a_bottle = 1,
/obj/item/clothing/suit/hooded/berserker = 1,
/obj/item/jacobs_ladder = 1,
/obj/item/guardian_creator/miner = 1,
/obj/item/warp_cube/red = 1,
/obj/item/wisp_lantern = 1,
/obj/item/immortality_talisman = 1,
/obj/item/book/granter/action/spell/summonitem = 1,
/obj/item/book_of_babel = 1,
/obj/item/clothing/neck/necklace/memento_mori = 1,
)
/obj/effect/spawner/random/mining_loot/demonic
name = "random demonic mining loot"
desc = "Spawns one random mining loot from the demonic list."
icon = 'icons/obj/storage/crates.dmi'
icon_state = "necrocrate"
loot = list(
/obj/item/shared_storage/red = 1,
/obj/item/clothing/neck/cloak/wolf_coat = 1,
/obj/item/soulstone/anybody/mining = 1,
/obj/item/clothing/glasses/godeye = 1,
/obj/item/reagent_containers/cup/bottle/potion/flight = 1,
/obj/item/clothing/gloves/gauntlets = 1,
/obj/effect/spawner/random/mining_loot/pka_mod = 1,
/obj/item/rod_of_asclepius = 1,
/obj/item/organ/heart/cursed/wizard = 1,
/obj/item/jacobs_ladder = 1,
/obj/item/guardian_creator/miner = 1,
/obj/item/weldingtool/abductor = 1,
/obj/item/warp_cube/red = 1,
/obj/item/immortality_talisman = 1,
/obj/item/book/granter/action/spell/summonitem = 1,
/obj/item/clothing/neck/necklace/memento_mori = 1,
/obj/item/book/granter/action/spell/sacredflame = 1,
)
/// For spawning a rare PKA modkit
/obj/effect/spawner/random/mining_loot/pka_mod
name = "random rare PKA modkits"
desc = "Spawns one random rare PKA modkits."
icon = 'icons/obj/mining.dmi'
icon_state = "modkit"
loot = list(
/obj/item/borg/upgrade/modkit/aoe/mobs/andturfs = 1,
/obj/item/borg/upgrade/modkit/cooldown/repeater = 1,
/obj/item/borg/upgrade/modkit/resonator_blasts = 1,
/obj/item/borg/upgrade/modkit/bounty = 1,
/obj/item/borg/upgrade/modkit/lifesteal = 1,
)