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

Diverse Traders (#24883)

Browse Source 
* Diverse Traders Types

* Trader Type control, announcements, species spawning

* Trader Outfits

* Posh Moth - Posh Cane

* Landmarks, Trader ID Name Change

* Trader Shuttle Adjustment - Landmarks for Item Pools

* Outfit Survival Kit changes

* Added another refill for the hand labeler due to more cargo

* Trader Shuttle locker fix

* Item Stocks, Item Stock Assignments, Box Kits, Love Bottle

* Mech access, No double mechs, Small box fix

* Removed Solgov Gunkit from General Pool

* Spacing

* Moved traders to not be event subtypes, added documentation to vars

* Boxed spacing, removed improper

* Moved postequip, used box variables

* Lore team requested change - Bolt action instead of AK

* Changed landmark

* Moved soviet ammo to minor gear, increased soviet minor gear to 8.

* Obfuscated Cybersun

* Lootpool Adjustments

* Readded Solgov Kit to general pool at low weight

* Commas!

* Spelling

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Comments

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Re-Nulled After_Equip_Job

* Removed extraneous var spaces

* Relocated space in trader introduction message

* Robomoon is now once again Cybersun

* Impropered Enforcer Kit

* No more ERT box for non-NT boxes

* Fixed turbine kit stock part amount

* Subtyped skrell/unathi suit boxes

* Replaced meson cyber eye (nodrop issue) with meson sunglasses/gar mesons

* Reduced weight on arm/esword implant rare items

* Also reduced arm laser weight

* Added a couple items to skipjack large - more 'random', filled in reduced weights

* Path typo fix

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Removed trailing / in path

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Removed Cheap Breacher suit from inventory

* Apply suggestions from code review

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
PollardTheDragon
2024-04-30 00:51:19 +00:00
committed by GitHub
co-authored by Henri215 DGamerL
parent 417d6fe8cf
commit 3e9c29258e
9 changed files with 667 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/landmarks.dm
+10 -2
View File
@@ -36,10 +36,18 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/newplayer_start) //Without this you sp
spawner_list += loc
return INITIALIZE_HINT_QDEL
/obj/effect/landmark/spawner/soltrader
name = "traderstart_sol"
/obj/effect/landmark/spawner/trader
name = "traderstart"
icon_state = "Trader"
/obj/effect/landmark/spawner/tradergearminor
name = "traderstart_specificgear_minor"
icon_state = "questionmark"
/obj/effect/landmark/spawner/tradergearmajor
name = "traderstart_specificgear_major"
icon_state = "questionmark"
/obj/effect/landmark/spawner/ert
name = "Response Team"
icon_state = "ERT"
code/game/objects/effects/spawners/lootdrop.dm
+322 -3
View File
@@ -218,7 +218,6 @@
/obj/item/soap = 50,
/obj/item/clothing/under/syndicate/combat = 50,
/obj/item/soap/syndie = 50,
/obj/item/lighter/zippo/gonzofist = 50,
/obj/item/clothing/under/costume/psyjump = 50,
/obj/item/immortality_talisman = 50,
/obj/item/clothing/mask/holo_cigar = 100,
@@ -338,8 +337,7 @@
// 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 = 50, //Weapon crafting, lets officers experiment however lets not have it be C class
/obj/item/weaponcrafting/gunkit/universal_gun_kit/sol_gov = 20
)
/obj/effect/spawner/lootdrop/trade_sol/eng
@@ -417,7 +415,328 @@
/obj/structure/constructshell = 50 //Fuck it we ball what could go wrong
)
/obj/effect/spawner/lootdrop/trade_sol/federation_minor
name = "11. trans-solar federation small gear"
loot = list(
/obj/item/storage/box/enforcer_rubber = 50,
/obj/item/lighter/zippo/gonzofist = 50,
/obj/item/clothing/glasses/welding/superior = 50,
/obj/item/clothing/suit/armor/bulletproof = 50,
/obj/item/clothing/mask/gas/explorer/marines = 50,
/obj/item/clothing/gloves/combat = 50,
/obj/item/storage/belt/military/assault = 50,
/obj/item/clothing/under/solgov = 50,
/obj/item/mod/module/dispenser = 50,
/obj/item/flag/solgov = 30
)
/obj/effect/spawner/lootdrop/trade_sol/federation_major
name = "12. trans-solar federation large gear"
lootcount = 3
loot = list(
/obj/item/storage/box/deagle = 20, //One mag
/obj/item/gun/projectile/automatic/pistol/m1911 = 30, //Again, one mag. Don't lose it.
/obj/item/melee/baseball_bat/homerun = 50,
/obj/item/rcd/combat = 50,
/obj/item/weaponcrafting/gunkit/universal_gun_kit/sol_gov = 50,
/obj/item/storage/box/buck = 30, //Only seven shots, make them count
/obj/item/mod/module/noslip = 40,
/obj/item/clothing/mask/holo_cigar = 50
)
/obj/effect/spawner/lootdrop/trade_sol/cybersun_minor
name = "11. cybersun industries small gear"
loot = list(
/obj/item/storage/box/syndidonkpockets = 50,
/obj/item/clothing/suit/jacket/syndicatebomber = 50,
/obj/item/storage/box/syndie_kit/space = 50,
/obj/item/clothing/glasses/meson/sunglasses = 50,
/obj/item/storage/pill_bottle/zoom = 50,
/obj/item/clothing/mask/gas/voice_modulator/chameleon = 50,
/obj/item/mecha_parts/mecha_equipment/weapon/energy/xray = 30,
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine = 30,
/obj/item/flag/syndi = 30
)
// Damn near all of this is illegal. Gives officers something to do on a shift quiet enough to spawn traders.
/obj/effect/spawner/lootdrop/trade_sol/cybersun_major
name = "12. cybersun industries large gear"
lootcount = 3
loot = list(
/obj/item/shield/energy = 20,
/obj/item/gun/projectile/automatic/pistol = 50,
/obj/item/bio_chip/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.
)
lootdoubles = FALSE //No double mechs.
/obj/effect/spawner/lootdrop/trade_sol/ussp_minor
name = "11. USSP small gear"
lootcount = 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/snacks/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/lootdrop/trade_sol/ussp_major
name = "12. USSP large gear"
lootcount = 2 //Lots of dangerous stuff here - reduced amount
loot = list(
/obj/item/gun/projectile/revolver/nagant = 50,
/obj/item/gun/projectile/automatic/pistol/APS = 30,
/obj/item/gun/projectile/shotgun/boltaction = 50,
/obj/item/clothing/suit/space/hardsuit/soviet = 40,
/obj/item/clothing/glasses/thermal/eyepatch = 50,
/obj/item/clothing/mask/holo_cigar = 10
)
/obj/effect/spawner/lootdrop/trade_sol/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/lootdrop/trade_sol/glintscale_major
name = "12. glint-scale large gear"
lootcount = 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/lootdrop/trade_sol/steadfast_minor
name = "11. steadfast trading co. small gear"
lootcount = 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/lootdrop/trade_sol/steadfast_major
name = "12. steadfast trading co. large gear"
lootcount = 3
loot = list(
/obj/item/mod/construction/plating/research = 30,
/obj/item/assembly/signaler/anomaly/random = 20,
/obj/item/gun/energy/gun = 50,
/obj/item/storage/box/dragonsbreath = 30,
/obj/item/storage/box/turbine_kit = 20,
/obj/item/mod/module/firefighting_tank = 40,
/obj/item/mod/module/jetpack/advanced = 40
)
/obj/effect/spawner/lootdrop/trade_sol/syntheticunion_minor
name = "11. synthetic union small gear"
lootcount = 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 = 50,
/obj/item/clothing/glasses/thermal/monocle = 50,
/obj/item/organ/internal/cyberimp/arm/toolset = 50,
/obj/item/organ/internal/cyberimp/arm/surgery = 50,
/obj/item/organ/internal/cyberimp/arm/janitorial = 50,
/obj/item/organ/internal/cyberimp/brain/anti_stam = 50,
/obj/item/organ/internal/cyberimp/brain/anti_sleep = 50,
/obj/item/organ/internal/cyberimp/brain/clown_voice = 40,
/obj/item/organ/internal/cyberimp/mouth/breathing_tube = 50,
/obj/item/organ/internal/cyberimp/chest/ipc_repair = 50,
/obj/item/organ/internal/cyberimp/chest/ipc_joints/magnetic_joints = 50,
/obj/item/organ/internal/cyberimp/chest/ipc_joints/sealed = 50,
/obj/item/autosurgeon/organ = 10,
/obj/item/flag/species/machine = 20
)
/obj/effect/spawner/lootdrop/trade_sol/syntheticunion_major
name = "12. synthetic union large gear"
lootcount = 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/lootdrop/trade_sol/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/lootdrop/trade_sol/skipjack_major //contains a variety of things - raider loot
name = "12. skipjack large gear"
lootcount = 3
loot = list(
/obj/item/storage/box/vox_spacesuit = 20,
/obj/item/storage/box/syndie_kit/chameleon = 50,
/obj/item/organ/internal/cyberimp/arm/esword = 10,
/obj/item/gun/energy/spikethrower = 20,
/obj/item/organ/internal/cyberimp/arm/medibeam = 50,
/obj/item/organ/internal/cyberimp/arm/toolset_abductor = 50,
/obj/item/organ/internal/cyberimp/brain/anti_stam/hardened = 10,
/obj/item/organ/internal/cyberimp/arm/gun/laser = 10,
/obj/item/fireaxe = 10,
/obj/item/gun/projectile/revolver/nagant = 10,
/obj/item/bio_chip/storage = 10,
/obj/item/rcd/combat = 10
)
/obj/effect/spawner/lootdrop/trade_sol/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 = 60,
/obj/item/pen/sleepy/love = 50,
/obj/item/reagent_containers/glass/bottle/reagent/omnizine = 50,
/obj/item/reagent_containers/glass/bottle/love = 50,
/obj/item/reagent_containers/glass/bottle/reagent/lazarus_reagent = 50,
/obj/item/reagent_containers/applicator/dual = 50,
/obj/item/reagent_containers/hypospray/autoinjector/nanocalcium = 30,
/obj/item/storage/firstaid/surgery = 40,
/obj/item/dnainjector/nobreath = 50,
/obj/item/dnainjector/regenerate = 50,
/obj/item/dnainjector/insulation = 50,
/obj/item/flag/species/skrell = 20
)
/obj/effect/spawner/lootdrop/trade_sol/solarcentral_major
name = "12. skrellian central authority large gear"
lootcount = 3
loot = list(
/obj/item/mod/module/energy_shield = 40,
/obj/item/shield/energy = 40,
/obj/item/reagent_containers/applicator/dual/syndi = 50, //Same as the above but comes emagged
/obj/item/gun/medbeam = 30,
/obj/item/gun/syringe/syndicate = 50,
/obj/item/storage/box/skrell_suit/black = 30,
/obj/item/storage/box/skrell_suit/white = 30,
/obj/item/rod_of_asclepius = 20
)
/obj/effect/spawner/lootdrop/trade_sol/technocracy_minor
name = "11. technocracy small gear"
loot = list(
/obj/item/paper/researchnotes = 150, //More research from the smart ones
/obj/item/storage/box/beakers/bluespace = 50,
/obj/item/storage/box/stockparts/deluxe = 50,
/obj/item/clothing/glasses/thermal/monocle = 50,
/obj/item/organ/internal/cyberimp/arm/toolset_abductor = 30,
/obj/item/organ/internal/cyberimp/arm/surgery = 40,
/obj/item/organ/internal/cyberimp/arm/advmop = 30,
/obj/item/organ/internal/cyberimp/brain/anti_stam = 50,
/obj/item/organ/internal/cyberimp/brain/anti_sleep = 50,
/obj/item/organ/internal/cyberimp/brain/anti_drop = 50,
/obj/item/autosurgeon/organ = 10,
/obj/item/flag/species/greys = 20
)
/obj/effect/spawner/lootdrop/trade_sol/technocracy_major
name = "12. technocracy large gear"
lootcount = 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/lootdrop/trade_sol/merchantguild_minor
name = "11. merchant guild small gear"
lootcount = 12 //Much larger selection due to it being almost all clothes.
loot = list(
/obj/item/flag/species/nian = 20,
/obj/item/clothing/under/suit/really_black = 50,
/obj/item/clothing/under/syndicate/combat = 50,
/obj/item/clothing/under/syndicate/sniper = 50,
/obj/item/clothing/under/new_soviet/sovietofficer = 50,
/obj/item/clothing/under/solgov/elite = 50,
/obj/item/clothing/under/solgov/command = 50,
/obj/item/clothing/under/retro/security = 50,
/obj/item/clothing/under/misc/gimmick/rank/captain/suit = 50,
/obj/item/clothing/under/misc/durathread = 50,
/obj/item/clothing/under/psysuit = 50,
/obj/item/clothing/under/costume/cuban_suit = 50,
/obj/item/clothing/suit/armor/vest/jacket = 50,
/obj/item/clothing/head/collectable/petehat = 20,
/obj/item/clothing/head/collectable/tophat = 50,
/obj/item/clothing/head/collectable/police = 50,
/obj/item/clothing/head/collectable/kitty = 50,
/obj/item/clothing/under/costume/janimaid = 50,
/obj/item/clothing/under/costume/maid = 50,
/obj/item/storage/box/syndie_kit/chameleon = 60
)
/obj/effect/spawner/lootdrop/trade_sol/merchantguild_major
name = "12. merchant guild large gear"
lootcount = 6 //Low-risk items, flavorful knick knacks - higher stock
loot = list(
/obj/item/clothing/suit/pimpcoat = 50,
/obj/item/dualsaber/toy = 50,
/obj/item/toy/sword = 50,
/obj/item/toy/plushie/carpplushie/dragon = 50,
/obj/item/toy/plushie/carpplushie/void = 50,
/obj/item/toy/plushie/ipcplushie = 30,
/obj/item/toy/plushie/nukeplushie = 30,
/obj/item/toy/plushie/nianplushie = 50, //*buzz
/obj/item/toy/windup_toolbox = 50,
/obj/item/toy/AI = 50,
/obj/item/clothing/mask/gas/voice_modulator/chameleon = 50,
/obj/item/storage/box/syndie_kit/chameleon = 50
)
/obj/effect/spawner/lootdrop/three_course_meal
name = "three course meal spawner"
code/game/objects/items/weapons/storage/boxes.dm
+72
View File
@@ -777,6 +777,78 @@
new /obj/item/ammo_box/magazine/enforcer/lethal(src)
new /obj/item/ammo_box/magazine/enforcer/lethal(src)
/obj/item/storage/box/hydroponics_starter
name = "hydroponics starter kit"
desc = "Everything you need to start your own botany lab."
/obj/item/storage/box/hydroponics_starter/populate_contents()
for(var/I in 1 to 2)
new /obj/item/circuitboard/hydroponics(src)
new /obj/item/stock_parts/matter_bin(src)
new /obj/item/stock_parts/matter_bin(src)
new /obj/item/stock_parts/manipulator(src)
new /obj/item/reagent_containers/glass/bucket(src)
/obj/item/storage/box/turbine_kit
name = "turbine kit"
desc = "Somehow, they managed to fit almost an entire turbine assembly into this box."
/obj/item/storage/box/turbine_kit/populate_contents()
new /obj/item/circuitboard/turbine_computer(src)
new /obj/item/circuitboard/power_compressor(src)
new /obj/item/circuitboard/power_turbine(src)
for(var/I in 1 to 6)
new /obj/item/stock_parts/capacitor(src)
new /obj/item/stock_parts/manipulator(src)
/obj/item/storage/box/deagle
name = "desert eagle handcannon kit"
desc = "A box marked with pictures of the iconic Desert Eagle pistol, one ammo clip, and the word 'LETHAL'."
icon_state = "doom_box"
/obj/item/storage/box/deagle/populate_contents()
new /obj/item/gun/projectile/automatic/pistol/deagle(src)
new /obj/item/ammo_box/magazine/m50(src)
/obj/item/storage/box/skrell_suit
name = "skrellian suit box"
desc = "A box containing a skrell-designed medical spacesuit."
icon_state = "doom_box"
/obj/item/storage/box/skrell_suit/white
name = "white skrellian suit box"
desc = "A box containing a skrell-designed medical spacesuit. This one is white."
/obj/item/storage/box/skrell_suit/white/populate_contents()
new /obj/item/clothing/head/helmet/space/skrell/white(src)
new /obj/item/clothing/suit/space/skrell/white(src)
/obj/item/storage/box/skrell_suit/black
name = "black skrellian suit box"
desc = "A box containing a skrell-designed medical spacesuit. This one is black."
/obj/item/storage/box/skrell_suit/black/populate_contents()
new /obj/item/clothing/head/helmet/space/skrell/black(src)
new /obj/item/clothing/suit/space/skrell/black(src)
/obj/item/storage/box/breacher
name = "unathi breacher suit box"
desc = "A box containing a bulky unathi battlesuit."
icon_state = "doom_box"
/obj/item/storage/box/breacher/populate_contents()
new /obj/item/clothing/suit/space/unathi/breacher(src)
new /obj/item/clothing/head/helmet/space/unathi/breacher(src)
/obj/item/storage/box/vox_spacesuit
name = "vox voidsuit box"
desc = "A box containing an old, dusty voidsuit fit for vox."
icon_state = "doom_box"
/obj/item/storage/box/vox_spacesuit/populate_contents()
new /obj/item/clothing/head/helmet/space/vox/pressure(src)
new /obj/item/clothing/suit/space/vox/pressure(src)
/obj/item/storage/box/telescience
name = "babies first telescience kit"
desc = "A now restricted kit for those who want to learn about telescience!"