mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-20 19:43:13 +01:00
Random Contraband and Cargo Lists Tweaks (#18799)
This PR does the following.
- Removes Heroin, Cocaine (and it's subtypes), Raskara dust, and all
other Tier-1 drugs in our drug list (excpet from the Cargo reagent
spawner.
- Adds more contraband to the contraband loot table. For example -
- Cocaine, Heroin, 9mm pistol, derringer revolver, sawn off shotgun
(improvised), paralysis pen, and the poison pen. I also added auto
injectors for drugs that are not in pill form, like imprednezene(?),
stimpack, beserk, and nightlife.
- Adds more contraband map spawns in maintenance areas. I believe it
adds 5 or 6 across all three z-levels in areas like the abandoned bar,
the poker table, a table in maintenance by science, the maintenance
under the bar, etc. The map diff bot will show. These are not always
guaranteed to spawn either upon my testing. I'm not sure why, but it
works better this way imo.
- Removes ambrosia and other non-contraband drugs from the loot table
for now.
If requested, I am open to adding one or two custom contraband spawners
for the brig. Just ask in the PR's comments.
---------
Signed-off-by: Avery Marie <98699252+Eyeveri@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
This commit is contained in:
co-authored by
SleepyGemmy
parent
6a6fde5705
commit
fe14d644e4
@@ -91,8 +91,8 @@ STOCK_ITEM_UNCOMMON(chempack, 5)
|
||||
var/list/chems = GET_SINGLETON_SUBTYPE_MAP(/singleton/reagent/)
|
||||
var/list/exclusion = list(/singleton/reagent/drink, /singleton/reagent, /singleton/reagent/adminordrazine, /singleton/reagent/polysomnine/beer2, /singleton/reagent/azoth, /singleton/reagent/elixir,\
|
||||
/singleton/reagent/liquid_fire, /singleton/reagent/philosopher_stone, /singleton/reagent/toxin/undead, /singleton/reagent/love_potion, /singleton/reagent/shapesand, /singleton/reagent/usolve,\
|
||||
/singleton/reagent/sglue, /singleton/reagent/black_matter, /singleton/reagent/bottle_lightning, /singleton/reagent/toxin/hylemnomil, /singleton/reagent/toxin/nanites, /singleton/reagent/nitroglycerin, \
|
||||
/singleton/reagent/aslimetoxin, /singleton/reagent/sanasomnum, /singleton/reagent/rezadone, /singleton/reagent/toxin/carpotoxin)
|
||||
/singleton/reagent/sglue, /singleton/reagent/black_matter, /singleton/reagent/drugs/cocaine, /singleton/reagent/drugs/raskara_dust, /singleton/reagent/drugs/heroin, /singleton/reagent/drugs/joy, /singleton/reagent/toxin/stimm, /singleton/reagent/drugs/impedrezene, /singleton/reagent/bottle_lightning, /singleton/reagent/toxin/hylemnomil, /singleton/reagent/toxin/nanites, /singleton/reagent/nitroglycerin,
|
||||
/singleton/reagent/aslimetoxin, /singleton/reagent/sanasomnum, /singleton/reagent/rezadone, /singleton/reagent/kois/black, /singleton/reagent/toxin/carpotoxin)
|
||||
chems -= exclusion
|
||||
for (var/i in 1 to rand(2, 4))
|
||||
var/obj/item/reagent_containers/chem_disp_cartridge/C = new /obj/item/reagent_containers/chem_disp_cartridge(L)
|
||||
|
||||
@@ -347,3 +347,17 @@
|
||||
volume = 10
|
||||
amount_per_transfer_from_this = 10
|
||||
reagents_to_add = list(/singleton/reagent/peridaxon = 10)
|
||||
|
||||
/obj/item/reagent_containers/hypospray/autoinjector/impedrezene
|
||||
name = "impedrezene autoinjector"
|
||||
desc = "An autoinjector loaded with impedrezene, a narcotic that impairs one's ability to think by impeding the function of brain cells in the cerebral cortex."
|
||||
volume = 5
|
||||
amount_per_transfer_from_this = 5
|
||||
reagents_to_add = list(/singleton/reagent/drugs/impedrezene)
|
||||
|
||||
/obj/item/reagent_containers/hypospray/autoinjector/night_juice
|
||||
name = "night life autoinjector"
|
||||
desc = "An auto injector loaded with night life, a liquid narcotic commonly used by the more wealthy drug-abusing citizens of the Eridani Federation."
|
||||
volume = 10
|
||||
amount_per_transfer_from_this = 10
|
||||
reagents_to_add = list(/singleton/reagent/drugs/night_juice)
|
||||
|
||||
Reference in New Issue
Block a user