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

This commit is contained in:
xPokee
2025-09-10 14:12:16 -04:00
277 changed files with 8854 additions and 7401 deletions
@@ -20,3 +20,13 @@
flat_box.pixel_y = pixel_y
qdel(src)
/obj/item/storage/box/flat/fentanylpatches
name = "discrete box"
desc = "A small box containing a set of unmarked transdermal patches."
icon_state = "flat"
/obj/item/storage/box/flat/fentanylpatches/Initialize(mapload)
. = ..()
for(var/i = 1 to 3)
new /obj/item/reagent_containers/applicator/patch/fent(src)
@@ -56,3 +56,39 @@
new /obj/item/mecha_parts/mecha_tracking(src)
new /obj/item/mecha_parts/mecha_tracking(src)
new /obj/item/mecha_parts/mecha_tracking(src)
/obj/item/storage/box/methdealer
name = "box"
desc = "A brown box."
icon_state = "blank_package"
/obj/item/storage/box/methdealer/PopulateContents()
var/static/list/items_inside = list(
/obj/item/food/drug/meth_crystal = 4,
/obj/item/cigarette/pipe/crackpipe = 2,
)
generate_items_inside(items_inside, src)
/obj/item/storage/box/opiumdealer
name = "box"
desc = "A brown box."
icon_state = "blank_package"
/obj/item/storage/box/opiumdealer/PopulateContents()
var/static/list/items_inside = list(
/obj/item/food/drug/opium = 4,
/obj/item/cigarette/pipe/cobpipe = 2,
)
generate_items_inside(items_inside, src)
/obj/item/storage/box/kronkdealer
name = "box"
desc = "A brown box."
icon_state = "blank_package"
/obj/item/storage/box/kronkdealer/PopulateContents()
var/static/list/items_inside = list(
/obj/item/food/drug/moon_rock = 4,
/obj/item/cigarette/pipe/crackpipe = 2,
)
generate_items_inside(items_inside, src)