Merge branch 'master' into enginepicker

code/game/objects/items/contraband.dm

@@ -4,6 +4,7 @@
 /obj/item/storage/pill_bottle/happy
 	name = "Happy pills"
 	desc = "Highly illegal drug. When you want to see the rainbow."
+	wrapper_color = COLOR_PINK
 
 /obj/item/storage/pill_bottle/happy/New()
 	..()
@@ -18,6 +19,7 @@
 /obj/item/storage/pill_bottle/zoom
 	name = "Zoom pills"
 	desc = "Highly illegal drug. Trade brain for speed."
+	wrapper_color = COLOR_BLUE
 
 /obj/item/storage/pill_bottle/zoom/New()
 	..()
@@ -49,15 +51,12 @@
 		adulterants--
 		reagents.add_reagent(pick_list("chemistry_tools.json", "CYBERPUNK_drug_adulterants"), 3)
 
-
-
 /obj/item/storage/pill_bottle/random_drug_bottle
 	name = "pill bottle (???)"
 	desc = "Huh."
+	allow_wrap = FALSE
 
 /obj/item/storage/pill_bottle/random_drug_bottle/New()
 	..()
 	for(var/i in 1 to 5)
 		new /obj/item/reagent_containers/food/pill/random_drugs(src)
-
-

code/game/objects/items/devices/scanners.dm

@@ -273,6 +273,8 @@ REAGENT SCANNER
 		user.show_message("<span class='notice'>Subject's genes are stable.</span>")
 	add_fingerprint(user)
 
+/obj/item/healthanalyzer/attack_self(mob/user)
+	toggle_mode()
 
 /obj/item/healthanalyzer/verb/toggle_mode()
 	set name = "Switch Verbosity"

code/game/objects/items/random_items.dm

@@ -123,6 +123,7 @@
 /obj/item/storage/pill_bottle/random_meds
 	name = "unlabelled pillbottle"
 	desc = "The sheer recklessness of this bottle's existence astounds you."
+	allow_wrap = FALSE
 	var/labelled = FALSE
 
 /obj/item/storage/pill_bottle/random_meds/New()

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -178,8 +178,12 @@ var/global/list/datum/stack_recipe/wood_recipes = list(
 	new /datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40),
 	new /datum/stack_recipe("apiary", /obj/structure/beebox, 40, time = 50),
 	new /datum/stack_recipe("honey frame", /obj/item/honey_frame, 5, time = 10),
+	new /datum/stack_recipe("wooden bucket", /obj/item/reagent_containers/glass/bucket/wooden, 3, time = 10),
+	new /datum/stack_recipe("rake", /obj/item/cultivator/rake, 5, time = 10),
+	new /datum/stack_recipe("ore box", /obj/structure/ore_box, 4, time = 50, one_per_turf = TRUE, on_floor = TRUE),
 	new /datum/stack_recipe("baseball bat", /obj/item/melee/baseball_bat, 5, time = 15),
-	new /datum/stack_recipe("fermenting barrel", /obj/structure/fermenting_barrel, 30, time = 50)
+	new /datum/stack_recipe("fermenting barrel", /obj/structure/fermenting_barrel, 30, time = 50),
+	new /datum/stack_recipe("firebrand", /obj/item/match/firebrand, 2, time = 100)
 )
 
 /obj/item/stack/sheet/wood

code/game/objects/items/weapons/dice.dm

@@ -4,6 +4,7 @@
 	icon = 'icons/obj/dice.dmi'
 	icon_state = "dicebag"
 	can_hold = list(/obj/item/dice)
+	allow_wrap = FALSE
 
 /obj/item/storage/pill_bottle/dice/New()
 	..()

code/game/objects/items/weapons/kitchen.dm

@@ -115,7 +115,8 @@
 	throw_range = 6
 	materials = list(MAT_METAL=12000)
 	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
-	sharp = 1
+	sharp = TRUE
+	var/bayonet = FALSE	//Can this be attached to a gun?
 
 /obj/item/kitchen/knife/suicide_act(mob/user)
 	user.visible_message(pick("<span class='suicide'>[user] is slitting [user.p_their()] wrists with the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.</span>", \
@@ -164,6 +165,7 @@
 	throwforce = 20
 	origin_tech = "materials=3;combat=4"
 	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "cut")
+	bayonet = TRUE
 
 /obj/item/kitchen/knife/combat/survival
 	name = "survival knife"

code/game/objects/items/weapons/lighters.dm

@@ -224,3 +224,13 @@
 	var/mask_item = M.get_item_by_slot(slot_wear_mask)
 	if(istype(mask_item, /obj/item/clothing/mask/cigarette))
 		return mask_item
+
+
+/obj/item/match/firebrand
+	name = "firebrand"
+	desc = "An unlit firebrand. It makes you wonder why it's not just called a stick."
+	smoketime = 20 //40 seconds
+
+/obj/item/match/firebrand/New()
+	..()
+	matchignite()

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

@@ -113,7 +113,7 @@
 	New()
 		..()
 		contents = list()
-		new /obj/item/clothing/mask/breath(src)
+		new /obj/item/clothing/mask/gas/explorer(src)
 		new /obj/item/tank/emergency_oxygen/engi(src)
 		new /obj/item/crowbar/red(src)
 		new /obj/item/reagent_containers/hypospray/autoinjector(src)
@@ -372,6 +372,20 @@
 		new /obj/item/implantpad(src)
 		new /obj/item/locator(src)
 
+/obj/item/storage/box/minertracker
+	name = "boxed tracking implant kit"
+	desc = "For finding those who have died on the accursed lavaworld."
+	icon_state = "implant"
+
+/obj/item/storage/box/minertracker/New()
+	..()
+	new /obj/item/implantcase/tracking(src)
+	new /obj/item/implantcase/tracking(src)
+	new /obj/item/implantcase/tracking(src)
+	new /obj/item/implanter(src)
+	new /obj/item/implantpad(src)
+	new /obj/item/locator(src)
+
 /obj/item/storage/box/chemimp
 	name = "chemical implant kit"
 	desc = "Box of stuff used to implant chemicals."

code/game/objects/items/weapons/storage/firstaid.dm

@@ -254,10 +254,21 @@
 	var/applying_meds = FALSE //To Prevent spam clicking and generating runtimes from apply a deleting pill multiple times.
 	var/rapid_intake_message = "unscrews the cap on the pill bottle and begins dumping the entire contents down their throat!"
 	var/rapid_post_instake_message = "downs the entire bottle of pills in one go!"
+	var/allow_wrap = TRUE
+	var/wrapper_color = null
 
 /obj/item/storage/pill_bottle/New()
 	..()
 	base_name = name
+	if(allow_wrap)
+		apply_wrap()
+
+/obj/item/storage/pill_bottle/proc/apply_wrap()
+	if(wrapper_color)
+		overlays.Cut()
+		var/image/I = image(icon, "pillbottle_wrap")
+		I.color = wrapper_color
+		overlays += I
 
 /obj/item/storage/pill_bottle/attack(mob/M, mob/user)
 	if(iscarbon(M) && contents.len)
@@ -274,6 +285,9 @@
 	else
 		return ..()
 
+/obj/item/storage/pill_bottle/ert
+	wrapper_color = COLOR_MAROON
+
 /obj/item/storage/pill_bottle/ert/New()
 	..()
 	new /obj/item/reagent_containers/food/pill/salicylic(src)
@@ -319,15 +333,18 @@
 
 /obj/item/storage/pill_bottle/patch_pack
 	name = "Patch Pack"
+	desc = "It's a container for storing medical patches."
 	icon_state = "patch_pack"
 	can_hold = list(/obj/item/reagent_containers/food/pill/patch)
 	cant_hold = list()
 	rapid_intake_message = "flips the lid of the Patch Pack open and begins rapidly stamping patches on themselves!"
 	rapid_post_instake_message = "stamps the entire contents of the Patch Pack all over their entire body!"
+	allow_wrap = FALSE
 
 /obj/item/storage/pill_bottle/charcoal
 	name = "Pill bottle (Charcoal)"
 	desc = "Contains pills used to counter toxins."
+	wrapper_color = COLOR_GREEN
 
 	New()
 		..()
@@ -342,6 +359,7 @@
 /obj/item/storage/pill_bottle/painkillers
 	name = "Pill Bottle (Salicylic Acid)"
 	desc = "Contains various pills for minor pain relief."
+	wrapper_color = COLOR_RED
 
 /obj/item/storage/pill_bottle/painkillers/New()
 	..()
@@ -354,8 +372,11 @@
 	new /obj/item/reagent_containers/food/pill/salicylic(src)
 	new /obj/item/reagent_containers/food/pill/salicylic(src)
 
+/obj/item/storage/pill_bottle/fakedeath
+	allow_wrap = FALSE
+
 /obj/item/storage/pill_bottle/fakedeath/New()
 	..()
 	new /obj/item/reagent_containers/food/pill/fakedeath(src)
 	new /obj/item/reagent_containers/food/pill/fakedeath(src)
-	new /obj/item/reagent_containers/food/pill/fakedeath(src)
+	new /obj/item/reagent_containers/food/pill/fakedeath(src)