diff --git a/code/game/objects/random/loot.dm b/code/game/objects/random/loot.dm index 46a846daceb..cc90c748a40 100644 --- a/code/game/objects/random/loot.dm +++ b/code/game/objects/random/loot.dm @@ -335,30 +335,35 @@ /obj/item/storage/pill_bottle/mortaphenyl = 3, /obj/item/storage/pill_bottle/happy = 2, /obj/item/storage/pill_bottle/zoom = 2, + /obj/item/reagent_containers/pill/cocaine = 3, + /obj/item/reagent_containers/pill/heroin = 2, + /obj/item/reagent_containers/hypospray/autoinjector/stimpack = 2, + /obj/item/reagent_containers/hypospray/autoinjector/impedrezene = 0.4, + /obj/item/reagent_containers/hypospray/autoinjector/night_juice = 0.3, + /obj/item/storage/box/syndie_kit/syringe_gun = 0.5, + /obj/item/reagent_containers/syringe/drugs = 1, + /obj/item/reagent_containers/inhaler/space_drugs = 2, + /obj/item/storage/box/smokes = 0.7, + /obj/item/grenade/napalm = 0.4, /obj/item/reagent_containers/glass/beaker/vial/random/toxin = 1, - /obj/item/contraband/poster = 5, /obj/item/material/knife/butterfly = 2, /obj/item/material/butterflyblade = 3, /obj/item/material/butterflyhandle = 3, /obj/item/material/wirerod = 3, /obj/item/melee/baton/cattleprod = 1, /obj/item/material/knife/tacknife = 1, + /obj/item/material/knife/bayonet = 2, /obj/item/material/kitchen/utensil/knife/boot = 2, /obj/item/storage/secure/briefcase/money = 1, + /obj/item/gun/projectile/pistol = 0.2, + /obj/item/gun/projectile/revolver/derringer = 0.4, + /obj/item/gun/projectile/shotgun/improvised/sawn = 0.3, + /obj/item/storage/pill_bottle/spotlight = 1, /obj/item/material/knife/butterfly/switchblade = 1, - /obj/item/reagent_containers/syringe/drugs = 1, - /obj/item/reagent_containers/food/snacks/grown/mushroom/libertycap = 2, - /obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris = 2, - /obj/item/reagent_containers/food/snacks/grown/ambrosiadeus = 1, - /obj/item/reagent_containers/food/snacks/grown/mushroom/reishi = 1, - /obj/item/reagent_containers/food/snacks/grown/mushroom/destroyingangel = 1, - /obj/item/reagent_containers/food/snacks/grown/mushroom/ghostmushroom = 0.5, - /obj/item/seeds/ambrosiavulgarisseed = 2, - /obj/item/seeds/ambrosiadeusseed = 1, /obj/item/clothing/mask/gas/voice = 1, /obj/item/clothing/gloves/brassknuckles = 2, - /obj/item/reagent_containers/inhaler/space_drugs = 2, - /obj/item/reagent_containers/inhaler/xuxigas = 1 + /obj/item/reagent_containers/inhaler/xuxigas = 1, + /obj/item/toy/balloon/syndicate = 4 ) /obj/random/coin diff --git a/code/modules/cargo/random_stock/t2_uncommon.dm b/code/modules/cargo/random_stock/t2_uncommon.dm index 6d58d5e9756..3781f46b4e3 100644 --- a/code/modules/cargo/random_stock/t2_uncommon.dm +++ b/code/modules/cargo/random_stock/t2_uncommon.dm @@ -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) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 3b740022cca..f9d91e99f3e 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -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) diff --git a/html/changelogs/changelog.yml b/html/changelogs/changelog.yml new file mode 100644 index 00000000000..fab1b917160 --- /dev/null +++ b/html/changelogs/changelog.yml @@ -0,0 +1,44 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: ReadThisNamePlz + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscdel: "Removes Heroin, Cocaine and Raskara dust from the warehouse spawners." + - rscdel: "Removes Ambrosia and other legal substances from the contraband list." + - rscadd: "Added a variety of new contraband to the contraband spawner to be found around maintenance." + - maptweak: "Added multiple new spawn locations for contraband on the Horizon across all decks." diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm index 92e271b5ea2..d3277a965c1 100644 --- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm +++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm @@ -2551,8 +2551,7 @@ dir = 10 }, /obj/random/pottedplant_small{ - pixel_x = -12; - pixel_y = 0 + pixel_x = -12 }, /turf/simulated/floor/tiled, /area/horizon/custodial) @@ -3776,7 +3775,7 @@ /area/rnd/test_range) "cFo" = ( /obj/effect/floor_decal/industrial/warning, -/obj/item/material/shard, +/obj/random/contraband, /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) "cGd" = ( @@ -6817,6 +6816,7 @@ /obj/structure/table/standard{ no_cargo = 1 }, +/obj/random/contraband, /turf/simulated/floor/tiled, /area/maintenance/wing/starboard/deck1) "eKl" = ( @@ -6933,6 +6933,7 @@ /obj/structure/table/standard{ no_cargo = 1 }, +/obj/random/contraband, /turf/simulated/floor/plating, /area/maintenance/research_port) "eOk" = ( @@ -15083,6 +15084,7 @@ dir = 4 }, /obj/random/loot, +/obj/random/contraband, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "kuQ" = ( @@ -22063,12 +22065,9 @@ /turf/simulated/floor/tiled/full, /area/hallway/primary/aft) "phO" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/lube, -/turf/simulated/floor/tiled{ - dir = 5; - icon_state = "vault" - }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/reinforced, /area/maintenance/wing/starboard/deck1) "phV" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -31148,6 +31147,7 @@ /obj/machinery/light/small/emergency{ dir = 4 }, +/obj/random/contraband, /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "vqU" = ( diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index b82bafcf286..f8c30168a8b 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -7821,6 +7821,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/random/contraband, /turf/simulated/floor/tiled, /area/maintenance/wing/starboard/far) "dFC" = ( @@ -18031,6 +18032,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/random/contraband, /turf/simulated/floor/tiled, /area/maintenance/wing/starboard/far) "imA" = ( @@ -24854,8 +24856,8 @@ /area/maintenance/wing/starboard) "lEe" = ( /obj/structure/closet/crate, -/obj/random/loot, /obj/effect/floor_decal/industrial/warning, +/obj/random/contraband, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "lEv" = ( @@ -31936,6 +31938,10 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) +"oRj" = ( +/obj/random/contraband, +/turf/simulated/floor/tiled/dark, +/area/maintenance/wing/port/far) "oRl" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 @@ -33913,6 +33919,7 @@ pixel_x = -5; pixel_y = 3 }, +/obj/random/contraband, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "pRd" = ( @@ -35808,6 +35815,7 @@ /obj/machinery/shower{ dir = 4 }, +/obj/random/contraband, /turf/simulated/floor/tiled/freezer, /area/operations/break_room) "qKK" = ( @@ -49745,7 +49753,7 @@ dir = 8 }, /obj/structure/table/wood, -/obj/random/loot, +/obj/random/contraband, /turf/simulated/floor/tiled/dark, /area/maintenance/wing/port/far) "xdI" = ( @@ -88318,7 +88326,7 @@ qgN tVu tVu cDU -ueH +oRj fuu upl afe diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index 77bb3ed7b87..994eaeacf37 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -9179,8 +9179,7 @@ }, /obj/structure/table/stone/marble, /obj/random/pottedplant_small{ - pixel_x = -8; - pixel_y = 0 + pixel_x = -8 }, /turf/simulated/floor/tiled/dark/full, /area/horizon/cafeteria) @@ -12675,7 +12674,6 @@ "iSb" = ( /obj/structure/table/wood, /obj/random/pottedplant_small{ - pixel_y = 0; pixel_x = -5 }, /turf/simulated/floor/carpet/art, @@ -14604,8 +14602,7 @@ /obj/structure/table/wood, /obj/machinery/newscaster/east, /obj/random/pottedplant_small{ - pixel_x = 9; - pixel_y = 0 + pixel_x = 9 }, /turf/simulated/floor/wood, /area/lawoffice/consular) @@ -18899,6 +18896,7 @@ pixel_y = 10; pixel_x = -6 }, +/obj/random/contraband, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_three/aft/starboard) "nga" = ( @@ -24047,8 +24045,7 @@ }, /obj/structure/table/wood, /obj/random/pottedplant_small{ - pixel_x = 9; - pixel_y = 0 + pixel_x = 9 }, /turf/simulated/floor/carpet, /area/lawoffice/representative) @@ -34210,8 +34207,7 @@ dir = 4 }, /obj/random/pottedplant_small{ - pixel_x = 9; - pixel_y = 0 + pixel_x = 9 }, /turf/simulated/floor/carpet, /area/lawoffice/representative_two)