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

code/game/objects/items/storage/belt.dm

@@ -54,9 +54,11 @@
 	preload = TRUE
 
 /obj/item/storage/belt/utility/chief/full/PopulateContents()
-	SSwardrobe.provide_type(/obj/item/screwdriver/power, src)
-	SSwardrobe.provide_type(/obj/item/crowbar/power, src)
-	SSwardrobe.provide_type(/obj/item/weldingtool/experimental, src)
+	SSwardrobe.provide_type(/obj/item/screwdriver, src)
+	SSwardrobe.provide_type(/obj/item/wrench, src)
+	SSwardrobe.provide_type(/obj/item/weldingtool, src)
+	SSwardrobe.provide_type(/obj/item/crowbar, src)
+	SSwardrobe.provide_type(/obj/item/wirecutters, src)
 	SSwardrobe.provide_type(/obj/item/multitool, src)
 	SSwardrobe.provide_type(/obj/item/stack/cable_coil, src)
 	SSwardrobe.provide_type(/obj/item/extinguisher/mini, src)
@@ -65,9 +67,11 @@
 
 /obj/item/storage/belt/utility/chief/full/get_types_to_preload()
 	var/list/to_preload = list() //Yes this is a pain. Yes this is the point
-	to_preload += /obj/item/screwdriver/power
-	to_preload += /obj/item/crowbar/power
-	to_preload += /obj/item/weldingtool/electric // SKYRAT EDIT - Electric welder
+	to_preload += /obj/item/screwdriver
+	to_preload += /obj/item/wrench
+	to_preload += /obj/item/weldingtool
+	to_preload += /obj/item/crowbar
+	to_preload += /obj/item/wirecutters
 	to_preload += /obj/item/multitool
 	to_preload += /obj/item/stack/cable_coil
 	to_preload += /obj/item/extinguisher/mini

code/game/objects/items/storage/boxes/flat_boxes.dm

@@ -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)

code/game/objects/items/storage/boxes/misc.dm

@@ -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)

code/game/objects/items/storage/lockbox.dm

@@ -27,7 +27,7 @@
 /obj/item/storage/lockbox/add_context(atom/source, list/context, obj/item/held_item, mob/user)
 	if(!held_item)
 		return NONE
-	if(src.broken)
+	if(broken)
 		return NONE
 	if(!held_item.GetID())
 		return NONE