cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-13 16:13:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Migrate /obj/effect/spawner/lootdrop to /obj/effect/spawner/random. (#27445)

Browse Source 
* refactor: Migrate /obj/effect/spawner/lootdrop to /obj/effect/spawner/random.

* set script PR number

* fix broken updatepaths for three course meal

* make filenames unique

* goddamnit

* redirect incorrect icon states

* ugh

* fix typepath fixes
This commit is contained in:
warriorstar-orion
2024-12-06 10:05:38 -05:00
committed by GitHub
parent 584e6b26d5
commit af2a3daf22
29 changed files with 842 additions and 849 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/spawners/random/traders/trader_department_spawners.dm
+222
View File
@@ -0,0 +1,222 @@
/obj/effect/spawner/random/traders
name = "trader item spawner"
icon = 'icons/effects/random_spawners.dmi'
icon_state = "loot"
spawn_loot_count = 6
/obj/effect/spawner/random/traders/civilian
name = "1. civilian gear"
icon_state = "toolbox"
loot = list(
// General utility gear
/obj/item/clothing/gloves/combat = 10,
/obj/item/clothing/mask/holo_cigar = 10,
/obj/item/reagent_containers/spray/cleaner/advanced = 10,
/obj/item/book_of_babel = 5,
/obj/item/clothing/mask/whistle = 5,
/obj/item/clothing/under/costume/psyjump = 5,
/obj/item/clothing/under/syndicate/combat = 5,
/obj/item/immortality_talisman = 5,
/obj/item/soap = 5,
/obj/item/soap/syndie = 5,
/obj/item/storage/backpack/satchel_flat = 5,
/obj/item/storage/box/syndie_kit/chameleon = 5, //costumes!
)
/obj/effect/spawner/random/traders/minerals
name = "2. minerals"
icon_state = "metal"
loot = list(
// Common stuff you get from mining which isn't already present on the
// station. Note that plasma and derived hybrid materials are NOT
// included in this list because plasma is the trader's objective!
/obj/item/stack/sheet/mineral/silver = 5,
/obj/item/stack/sheet/mineral/gold = 5,
/obj/item/stack/sheet/mineral/uranium = 5,
/obj/item/stack/sheet/mineral/diamond = 5,
/obj/item/stack/sheet/mineral/titanium = 5,
/obj/item/stack/sheet/plasteel = 5,
// Hybrid stuff you could in theory get from mining
/obj/item/stack/sheet/titaniumglass = 5,
// Rare stuff you can't get from mining
/obj/item/stack/sheet/mineral/tranquillite = 5,
/obj/item/stack/sheet/mineral/bananium = 5,
/obj/item/stack/sheet/wood = 5,
/obj/item/stack/sheet/plastic = 5,
/obj/item/stack/sheet/mineral/sandstone = 5,
)
/obj/effect/spawner/random/traders/minerals/make_item(spawn_loc, type_path_to_make)
var/obj/item/stack/sheet/S = ..()
if(istype(S))
S.amount = 25
return S
/obj/effect/spawner/random/traders/donksoft
name = "3. donksoft gear"
icon_state = "stetchkin"
loot = list(
/obj/item/gun/projectile/automatic/c20r/toy = 5,
/obj/item/gun/projectile/automatic/l6_saw/toy = 5,
/obj/item/gun/projectile/automatic/toy/pistol = 10,
/obj/item/gun/projectile/automatic/toy/pistol/enforcer = 5,
/obj/item/gun/projectile/shotgun/toy = 5,
/obj/item/gun/projectile/shotgun/toy/crossbow = 5,
/obj/item/gun/projectile/shotgun/toy/tommygun = 5,
/obj/item/gun/projectile/automatic/sniper_rifle/toy = 5,
)
/obj/effect/spawner/random/traders/science
name = "4. science gear"
// TODO: I know I created an anomaly core random spawner icon but it disappeared in some merge or other
icon = 'icons/obj/assemblies/new_assemblies.dmi'
icon_state = "anomaly_core"
loot = list(
// Robotics
/obj/item/assembly/signaler/anomaly/random = 50, // anomaly core
/obj/item/mecha_parts/mecha_equipment/weapon/energy/xray = 25, // mecha x-ray laser
/obj/item/mecha_parts/mecha_equipment/teleporter/precise = 25, // upgraded mecha teleporter
/obj/item/autosurgeon/organ = 50,
/obj/item/mod/construction/plating/research = 25,
// Research
/obj/item/paper/researchnotes = 125, // papers that give random R&D levels
/obj/item/storage/box/telescience = 25, // Code green or blue. Probably not antags. People haven't touched it in ages. Let us see what happens.
// Xenobio
/obj/item/slimepotion/sentience = 50, // Low-value, but we want to encourage getting more players back in the round.
/obj/item/slimepotion/transference = 50,
// Might as well let AI be interested
/obj/item/surveillance_upgrade = 25,
)
/obj/effect/spawner/random/traders/medical
name = "5. medical gear"
icon_state = "medkit"
loot = list(
// Medchem
/obj/item/storage/pill_bottle/random_meds/labelled = 100, // random medical and other chems
/obj/item/reagent_containers/glass/bottle/reagent/omnizine = 50,
// Surgery
/obj/item/organ/internal/heart/gland/ventcrawling = 50,
/obj/item/organ/internal/heart/gland/heals = 50,
// Genetics Research (should really be under science, but I was stuck for items to put in medical)
/obj/item/dnainjector/regenerate = 50, // regeneration
/obj/item/dnainjector/nobreath = 50,
/obj/item/dnainjector/telemut = 50,
// Medical in general
/obj/item/mod/construction/plating/rescue = 25,
/obj/item/gun/medbeam = 25, //Antags can see this to remove it if a threat, unlikely to happen with another midround
/obj/item/bodyanalyzer = 25,
/obj/item/circuitboard/sleeper/syndicate = 25,
)
/obj/effect/spawner/random/traders/security
name = "6. security gear"
icon_state = "riot_shield"
loot = list(
// Melee
/obj/item/kitchen/knife/combat = 50,
/obj/item/fluff/desolate_baton_kit = 50, // permission granted by Desolate to use their fluff kit in this loot table
// Utility
/obj/item/storage/belt/military/assault = 50,
/obj/item/clothing/mask/gas/sechailer/swat = 50,
/obj/item/clothing/glasses/thermal = 50, // see heat-source mobs through walls. Less powerful than already-available xray.
/obj/item/mod/construction/plating/safeguard = 25,
/obj/item/mod/module/power_kick = 50,
/obj/item/storage/box/syndie_kit/camera_bug = 25, //Camera viewing on the go, planting cameras with detective work? Could be interesting!
// Ranged weapons
/obj/item/storage/box/enforcer_rubber = 50, //Lethal ammo can be printed at an autolathe, so no need for the lethal subtype
/obj/item/gun/projectile/shotgun/automatic/dual_tube = 100, // cycler shotgun, not normally available to crew
/obj/item/weaponcrafting/gunkit/universal_gun_kit/sol_gov = 20
)
/obj/effect/spawner/random/traders/engineering
name = "7. eng gear"
icon_state = "wrench"
spawn_loot_count = 8 //increased due to this pool being a bit more... niche?
loot = list(
/obj/item/clothing/glasses/material, // shows objects, but not mobs, through walls
/obj/item/clothing/glasses/meson/night, // NV mesons
/obj/item/holosign_creator/atmos,
/obj/item/mod/construction/plating/advanced,
/obj/item/mod/module/jetpack/advanced,
/obj/item/rcd/combat,
/obj/item/rpd/bluespace,
/obj/item/slimepotion/oil_slick, //Suggested by discord, moderately common but not as common as most rnd things
/obj/item/storage/backpack/holding,
/obj/item/storage/belt/utility/chief/full,
/obj/item/tank/internals/emergency_oxygen/double,
)
/obj/effect/spawner/random/traders/large_item
name = "8. large item"
icon_state = "durand_old"
spawn_loot_count = 1
loot = list(
/obj/machinery/cooker/cerealmaker,
/obj/machinery/disco,
/obj/machinery/snow_machine,
/obj/mecha/combat/durand/old,
/obj/structure/spirit_board,
)
/obj/effect/spawner/random/traders/vehicle
name = "9. vehicle"
icon_state = "motorcycle"
loot = list(
/obj/vehicle/motorcycle,
/obj/vehicle/snowmobile,
/obj/vehicle/snowmobile/blue,
/obj/vehicle/space/speedbike/red,
/obj/vehicle/space/speedbike,
)
/obj/effect/spawner/random/traders/vehicle/make_item(spawn_loc, type_path_to_make)
var/obj/vehicle/V = ..()
if(istype(V) && V.key_type)
V.inserted_key = new V.key_type(V)
return V
/obj/effect/spawner/random/traders/service
name = "10. service gear"
loot = list(
// Mining
/obj/item/pickaxe/drill/jackhammer = 10,
/obj/item/gun/energy/kinetic_accelerator/experimental = 10,
/obj/item/borg/upgrade/modkit/aoe/turfs/andmobs = 10,
// Botanist
/obj/item/storage/box/botany_labelled_seeds = 10,
// Clown
/obj/item/grenade/clusterbuster/honk = 10,
/obj/item/bikehorn/golden = 10,
/obj/item/gun/throw/piecannon = 10,
// Bartender
/obj/item/storage/box/bartender_rare_ingredients_kit = 10,
// Chef
/obj/item/storage/box/chef_rare_ingredients_kit = 10,
/obj/item/mod/module/dispenser = 5, // Prints burgers. When you want to be space mcdonalds.
// It would be nice to also have items for other service jobs: Mime, Librarian, Chaplain, etc
// Chaplain
/obj/structure/constructshell = 5, //Fuck it we ball what could go wrong
)
code/game/objects/effects/spawners/random/traders/trader_organization_spawners.dm
+322
View File
@@ -0,0 +1,322 @@
/obj/effect/spawner/random/traders/federation_minor
name = "11. trans-solar federation small gear"
loot = list(
/obj/item/storage/box/enforcer_rubber = 5,
/obj/item/lighter/zippo/gonzofist = 5,
/obj/item/clothing/glasses/welding/superior = 5,
/obj/item/clothing/suit/armor/bulletproof = 5,
/obj/item/clothing/mask/gas/explorer/marines = 5,
/obj/item/clothing/gloves/combat = 5,
/obj/item/storage/belt/military/assault = 5,
/obj/item/clothing/under/solgov = 5,
/obj/item/mod/module/dispenser = 5,
/obj/item/flag/solgov = 3
)
/obj/effect/spawner/random/traders/federation_major
name = "12. trans-solar federation large gear"
spawn_loot_count = 3
loot = list(
/obj/item/storage/box/deagle = 2, //One mag
/obj/item/gun/projectile/automatic/pistol/m1911 = 3, //Again, one mag. Don't lose it.
/obj/item/melee/baseball_bat/homerun = 5,
/obj/item/rcd/combat = 5,
/obj/item/weaponcrafting/gunkit/universal_gun_kit/sol_gov = 5,
/obj/item/storage/fancy/shell/buck = 3, //Only seven shots, make them count
/obj/item/mod/module/noslip = 4,
/obj/item/clothing/mask/holo_cigar = 5
)
/obj/effect/spawner/random/traders/cybersun_minor
name = "11. cybersun industries small gear"
loot = list(
/obj/item/storage/box/syndidonkpockets = 5,
/obj/item/clothing/suit/jacket/bomber/syndicate = 5,
/obj/item/storage/box/syndie_kit/space = 5,
/obj/item/clothing/glasses/meson/sunglasses = 5,
/obj/item/storage/pill_bottle/zoom = 5,
/obj/item/clothing/mask/gas/voice_modulator/chameleon = 5,
/obj/item/mecha_parts/mecha_equipment/weapon/energy/xray = 3,
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine = 3,
/obj/item/flag/syndi = 3
)
// Damn near all of this is illegal. Gives officers something to do on a shift quiet enough to spawn traders.
/obj/effect/spawner/random/traders/cybersun_major
name = "12. cybersun industries large gear"
spawn_loot_count = 3
loot = list(
/obj/item/shield/energy = 20,
/obj/item/gun/projectile/automatic/pistol = 50,
/obj/item/bio_chip_implanter/storage = 50,
/obj/item/melee/knuckleduster/syndie = 50,
/obj/item/clothing/glasses/thermal/eyepatch = 50,
/obj/item/toy/syndicateballoon = 60,
/obj/item/organ/internal/cyberimp/arm/razorwire = 30,
/obj/item/organ/internal/cyberimp/arm/shell_launcher = 30,
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/dual = 30,
/obj/item/clothing/mask/holo_cigar = 50,
/obj/mecha/combat/marauder/mauler/trader = 3 //Extremely rare, unloaded so crew need to arm it for it to have any use. Also most definitely needs one helluva permit.
)
spawn_loot_double = FALSE // No double mechs.
/obj/effect/spawner/random/traders/ussp_minor
name = "11. USSP small gear"
spawn_loot_count = 8 //Mostly flavor items
loot = list(
/obj/item/clothing/under/new_soviet = 50,
/obj/item/clothing/suit/sovietcoat = 50,
/obj/item/clothing/head/ushanka = 50,
/obj/item/food/grown/potato = 50,
/obj/item/reagent_containers/drinks/bottle/vodka/badminka = 50,
/obj/item/clothing/head/sovietsidecap = 50,
/obj/item/flag/ussp = 30,
/obj/item/ammo_box/magazine/apsm10mm = 15, //Spare mags for APS pistol. Sometimes you don't get the APS, in which case, soviet logistics.
/obj/item/ammo_box/a762 = 15
)
// Lots of things to write permits for. Gives officers something to do on a shift quiet enough to spawn traders.
/obj/effect/spawner/random/traders/ussp_major
name = "12. USSP large gear"
spawn_loot_count = 2 //Lots of dangerous stuff here - reduced amount
loot = list(
/obj/item/gun/projectile/revolver/nagant = 5,
/obj/item/gun/projectile/automatic/pistol/aps = 3,
/obj/item/gun/projectile/shotgun/boltaction = 5,
/obj/item/clothing/suit/space/hardsuit/soviet = 4,
/obj/item/clothing/glasses/thermal/eyepatch = 5,
/obj/item/clothing/mask/holo_cigar = 1
)
/obj/effect/spawner/random/traders/glintscale_minor
name = "11. glint-scale small gear"
loot = list(
/obj/item/clothing/suit/armor/vest/combat = 50,
/obj/item/clothing/under/syndicate/combat = 50,
/obj/item/claymore/ceremonial = 50,
/obj/item/harpoon = 50,
/obj/item/nullrod/claymore/chainsaw_sword = 50,
/obj/item/whetstone = 50,
/obj/item/flag/species/unathi = 20,
/obj/item/clothing/suit/armor/riot/knight/templar = 40,
/obj/item/clothing/head/helmet/riot/knight/templar = 40,
/obj/item/clothing/suit/unathi/robe = 20
)
/obj/effect/spawner/random/traders/glintscale_major
name = "12. glint-scale large gear"
spawn_loot_count = 3
loot = list(
/obj/item/melee/energy/sword/pirate = 30,
/obj/item/storage/box/breacher = 30,
/obj/item/fireaxe = 50,
/obj/item/fireaxe/boneaxe = 50,
/obj/item/gun/energy/kinetic_accelerator/crossbow/large = 10 //Big ebow.
)
/obj/effect/spawner/random/traders/steadfast_minor
name = "11. steadfast trading co. small gear"
spawn_loot_count = 8 //Since it's a lot of seeds, boosted amount
loot = list(
/obj/item/storage/box/botany_labelled_seeds = 50,
/obj/item/seeds/chili/ice = 20,
/obj/item/seeds/chili/ghost = 20,
/obj/item/seeds/cannabis/ultimate = 10,
/obj/item/seeds/cannabis/white = 20,
/obj/item/seeds/wheat/meat = 20,
/obj/item/seeds/glowshroom = 20,
/obj/item/seeds/glowshroom/glowcap = 20,
/obj/item/seeds/tobacco/space = 20,
/obj/item/storage/box/hydroponics_starter = 40,
/obj/item/mod/module/thermal_regulator = 20,
/obj/item/flag/species/vulp = 20
)
/obj/effect/spawner/random/traders/steadfast_major
name = "12. steadfast trading co. large gear"
spawn_loot_count = 3
loot = list(
/obj/item/mod/construction/plating/research = 3,
/obj/item/assembly/signaler/anomaly/random = 2,
/obj/item/gun/energy/gun = 5,
/obj/item/storage/fancy/shell/dragonsbreath = 3,
/obj/item/storage/box/turbine_kit = 2,
/obj/item/mod/module/firefighting_tank = 4,
/obj/item/mod/module/jetpack/advanced = 4
)
/obj/effect/spawner/random/traders/syntheticunion_minor
name = "11. synthetic union small gear"
spawn_loot_count = 8 //A lot of these are available on station, so the amount of items spawned here is increased
loot = list(
/obj/item/clothing/glasses/meson/sunglasses = 5,
/obj/item/clothing/glasses/thermal/monocle = 5,
/obj/item/organ/internal/cyberimp/arm/toolset = 5,
/obj/item/organ/internal/cyberimp/arm/surgery = 5,
/obj/item/organ/internal/cyberimp/arm/janitorial = 5,
/obj/item/organ/internal/cyberimp/brain/anti_stam = 5,
/obj/item/organ/internal/cyberimp/brain/anti_sleep = 5,
/obj/item/organ/internal/cyberimp/brain/clown_voice = 4,
/obj/item/organ/internal/cyberimp/mouth/breathing_tube = 5,
/obj/item/organ/internal/cyberimp/chest/ipc_repair = 5,
/obj/item/organ/internal/cyberimp/chest/ipc_joints/magnetic_joints = 5,
/obj/item/organ/internal/cyberimp/chest/ipc_joints/sealed = 5,
/obj/item/autosurgeon/organ = 1,
/obj/item/flag/species/machine = 2
)
/obj/effect/spawner/random/traders/syntheticunion_major
name = "12. synthetic union large gear"
spawn_loot_count = 4
loot = list(
/obj/item/organ/internal/cyberimp/arm/toolset_abductor = 20,
/obj/item/organ/internal/cyberimp/arm/esword = 10,
/obj/item/organ/internal/cyberimp/arm/flash = 50,
/obj/item/organ/internal/cyberimp/chest/nutriment/plus/hardened = 50,
/obj/item/organ/internal/cyberimp/arm/telebaton = 25, //Security'll love this one
/obj/item/organ/internal/cyberimp/arm/razorwire = 30,
/obj/item/organ/internal/cyberimp/arm/shell_launcher = 30,
/obj/item/organ/internal/cyberimp/brain/anti_drop/hardened = 20,
/obj/item/organ/internal/cyberimp/brain/anti_stam/hardened = 30,
/obj/item/surveillance_upgrade = 35
)
/obj/effect/spawner/random/traders/skipjack_minor
name = "11. skipjack small gear"
loot = list(
/obj/item/clothing/glasses/meson/gar = 50,
/obj/item/clothing/glasses/thermal/eyepatch = 50,
/obj/item/melee/energy/sword/pirate = 50,
/obj/item/clothing/suit/hooded/vox_robes = 30,
/obj/item/clothing/under/vox/vox_casual = 30,
/obj/item/clothing/gloves/color/yellow/vox = 10, //Species limited - rare item
/obj/item/clothing/shoes/magboots/vox = 10, //Species limited - rare item
/obj/item/organ/internal/cyberimp/mouth/breathing_tube = 50,
/obj/item/mod/module/jetpack/advanced = 50,
/obj/item/gun/energy/plasma_pistol = 50,
/obj/item/mod/control/pre_equipped/standard = 40,
/obj/item/flag/species/vox = 20
)
/obj/effect/spawner/random/traders/skipjack_major //contains a variety of things - raider loot
name = "12. skipjack large gear"
spawn_loot_count = 3
loot = list(
/obj/item/storage/box/vox_spacesuit = 2,
/obj/item/storage/box/syndie_kit/chameleon = 5,
/obj/item/organ/internal/cyberimp/arm/esword = 1,
/obj/item/gun/energy/spikethrower = 2,
/obj/item/organ/internal/cyberimp/arm/medibeam = 5,
/obj/item/organ/internal/cyberimp/arm/toolset_abductor = 5,
/obj/item/organ/internal/cyberimp/brain/anti_stam/hardened = 1,
/obj/item/organ/internal/cyberimp/arm/gun/laser = 1,
/obj/item/fireaxe = 1,
/obj/item/gun/projectile/revolver/nagant = 1,
/obj/item/bio_chip_implanter/storage = 1,
/obj/item/rcd/combat = 1
)
/obj/effect/spawner/random/traders/solarcentral_minor
name = "11. skrellian central authority small gear" //Medical and protection theme - shields, mods, meds, and love
loot = list(
/obj/item/mod/control/pre_equipped/rescue = 6,
/obj/item/pen/sleepy/love = 5,
/obj/item/reagent_containers/glass/bottle/reagent/omnizine = 5,
/obj/item/reagent_containers/glass/bottle/love = 5,
/obj/item/reagent_containers/glass/bottle/reagent/lazarus_reagent = 5,
/obj/item/reagent_containers/applicator/dual = 5,
/obj/item/reagent_containers/hypospray/autoinjector/nanocalcium = 3,
/obj/item/storage/firstaid/surgery = 4,
/obj/item/dnainjector/nobreath = 5,
/obj/item/dnainjector/regenerate = 5,
/obj/item/dnainjector/insulation = 5,
/obj/item/flag/species/skrell = 2
)
/obj/effect/spawner/random/traders/solarcentral_major
name = "12. skrellian central authority large gear"
spawn_loot_count = 3
loot = list(
/obj/item/mod/module/energy_shield = 4,
/obj/item/shield/energy = 4,
/obj/item/reagent_containers/applicator/dual/syndi = 5, //Same as the above but comes emagged
/obj/item/gun/medbeam = 3,
/obj/item/gun/syringe/syndicate = 5,
/obj/item/storage/box/skrell_suit/black = 3,
/obj/item/storage/box/skrell_suit/white = 3,
/obj/item/rod_of_asclepius = 2
)
/obj/effect/spawner/random/traders/technocracy_minor
name = "11. technocracy small gear"
loot = list(
/obj/item/paper/researchnotes = 15, //More research from the smart ones
/obj/item/storage/box/beakers/bluespace = 5,
/obj/item/storage/box/stockparts/deluxe = 5,
/obj/item/clothing/glasses/thermal/monocle = 5,
/obj/item/organ/internal/cyberimp/arm/toolset_abductor = 3,
/obj/item/organ/internal/cyberimp/arm/surgery = 4,
/obj/item/organ/internal/cyberimp/arm/advmop = 3,
/obj/item/organ/internal/cyberimp/brain/anti_stam = 5,
/obj/item/organ/internal/cyberimp/brain/anti_sleep = 5,
/obj/item/organ/internal/cyberimp/brain/anti_drop = 5,
/obj/item/autosurgeon/organ = 1,
/obj/item/flag/species/greys = 2
)
/obj/effect/spawner/random/traders/technocracy_major
name = "12. technocracy large gear"
spawn_loot_count = 3
loot = list(
/obj/item/storage/box/syndie_kit/prescan = 30,
/obj/item/gun/energy/decloner = 50,
/obj/item/organ/internal/cyberimp/brain/anti_drop/hardened = 20,
/obj/item/organ/internal/cyberimp/brain/anti_stam/hardened = 30,
/obj/item/assembly/signaler/anomaly/random = 50,
/obj/item/surveillance_upgrade = 35,
/obj/item/mod/module/storage/bluespace = 40
)
/obj/effect/spawner/random/traders/merchantguild_minor
name = "11. merchant guild small gear"
spawn_loot_count = 12 //Much larger selection due to it being almost all clothes.
loot = list(
/obj/item/flag/species/nian = 2,
/obj/item/clothing/under/suit/really_black = 5,
/obj/item/clothing/under/syndicate/combat = 5,
/obj/item/clothing/under/syndicate/sniper = 5,
/obj/item/clothing/under/new_soviet/sovietofficer = 5,
/obj/item/clothing/under/solgov/elite = 5,
/obj/item/clothing/under/solgov/command = 5,
/obj/item/clothing/under/retro/security = 5,
/obj/item/clothing/under/misc/gimmick_captain_suit = 5,
/obj/item/clothing/under/misc/durathread = 5,
/obj/item/clothing/under/psysuit = 5,
/obj/item/clothing/under/costume/cuban_suit = 5,
/obj/item/clothing/suit/armor/vest/jacket = 5,
/obj/item/clothing/head/collectable/petehat = 2,
/obj/item/clothing/head/collectable/tophat = 5,
/obj/item/clothing/head/collectable/police = 5,
/obj/item/clothing/head/collectable/kitty = 5,
/obj/item/clothing/under/costume/janimaid = 5,
/obj/item/clothing/under/costume/maid = 5,
/obj/item/storage/box/syndie_kit/chameleon = 6
)
/obj/effect/spawner/random/traders/merchantguild_major
name = "12. merchant guild large gear"
spawn_loot_count = 6 //Low-risk items, flavorful knick knacks - higher stock
loot = list(
/obj/item/clothing/suit/pimpcoat = 5,
/obj/item/dualsaber/toy = 5,
/obj/item/toy/sword = 5,
/obj/item/toy/plushie/carpplushie/dragon = 5,
/obj/item/toy/plushie/carpplushie/void = 5,
/obj/item/toy/plushie/ipcplushie = 3,
/obj/item/toy/plushie/nukeplushie = 3,
/obj/item/toy/plushie/nianplushie = 5, //*buzz
/obj/item/toy/windup_toolbox = 5,
/obj/item/toy/ai = 5,
/obj/item/clothing/mask/gas/voice_modulator/chameleon = 5,
/obj/item/storage/box/syndie_kit/chameleon = 5
)