Merge branch 'master' of https://github.com/tgstation/-tg-station into clothessec

Conflicts:
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi

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

@@ -39,6 +39,10 @@
 	can_hold = list() // any
 	cant_hold = list(/obj/item/weapon/disk/nuclear)
 
+/obj/item/weapon/storage/bag/trash/suicide_act(mob/user)
+	user.visible_message("<span class='suicide'>[user] puts the [src.name] over their head and starts chomping at the insides! Disgusting!</span>")
+	playsound(loc, 'sound/items/eatfood.ogg', 50, 1, -1)
+	return (TOXLOSS)
 
 /obj/item/weapon/storage/bag/trash/update_icon()
 	if(contents.len == 0)

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

@@ -33,6 +33,7 @@
 	new /obj/item/weapon/weldingtool(src)
 	new /obj/item/weapon/crowbar(src)
 	new /obj/item/weapon/wirecutters(src)
+	new /obj/item/device/multitool(src)
 	new /obj/item/stack/cable_coil(src,30,pick("red","yellow","orange"))
 
 

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

@@ -18,6 +18,10 @@
 	var/mob/affecting = null
 	var/deity_name = "Christ"
 
+/obj/item/weapon/storage/book/bible/suicide_act(mob/user)
+	user.visible_message("<span class='suicide'>[user] is offering \himself to [src.deity_name]! It looks like \he's trying to commit suicide.</span>")
+	return (BRUTELOSS)
+
 /obj/item/weapon/storage/book/bible/booze
 	name = "bible"
 	desc = "To be applied to the head repeatedly."

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

@@ -62,7 +62,7 @@
 	..()
 	contents = list()
 	new /obj/item/clothing/mask/breath(src)
-	new /obj/item/weapon/tank/emergency_oxygen(src)
+	new /obj/item/weapon/tank/internals/emergency_oxygen(src)
 	new /obj/item/weapon/reagent_containers/hypospray/medipen(src)
 	return
 
@@ -72,7 +72,7 @@
 	..()
 	contents = list()
 	new /obj/item/clothing/mask/breath(src)
-	new /obj/item/weapon/tank/emergency_oxygen/engi(src)
+	new /obj/item/weapon/tank/internals/emergency_oxygen/engi(src)
 	new /obj/item/weapon/reagent_containers/hypospray/medipen(src)
 	return
 
@@ -601,4 +601,19 @@
 	new /obj/item/clothing/tie/armband/deputy(src)
 	new /obj/item/clothing/tie/armband/deputy(src)
 	new /obj/item/clothing/tie/armband/deputy(src)
-	new /obj/item/clothing/tie/armband/deputy(src)
+	new /obj/item/clothing/tie/armband/deputy(src)
+
+/obj/item/weapon/storage/box/metalfoam
+	name = "box of metal foam grenades"
+	desc = "To be used to rapidly seal hull breaches"
+	icon_state = "flashbang"
+
+/obj/item/weapon/storage/box/metalfoam/New()
+	..()
+	new /obj/item/weapon/grenade/chem_grenade/metalfoam(src)
+	new /obj/item/weapon/grenade/chem_grenade/metalfoam(src)
+	new /obj/item/weapon/grenade/chem_grenade/metalfoam(src)
+	new /obj/item/weapon/grenade/chem_grenade/metalfoam(src)
+	new /obj/item/weapon/grenade/chem_grenade/metalfoam(src)
+	new /obj/item/weapon/grenade/chem_grenade/metalfoam(src)
+	new /obj/item/weapon/grenade/chem_grenade/metalfoam(src)

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

@@ -16,117 +16,112 @@
 	throw_range = 7
 	var/empty = 0
 
+/obj/item/weapon/storage/firstaid/regular
+	icon_state = "firstaid"
+	desc = "A first aid kit with the ability to heal common types of injuries."
+
+/obj/item/weapon/storage/firstaid/regular/New()
+	..()
+	if(empty) return
+	new /obj/item/stack/medical/gauze(src)
+	new /obj/item/stack/medical/bruise_pack(src)
+	new /obj/item/stack/medical/bruise_pack(src)
+	new /obj/item/stack/medical/ointment(src)
+	new /obj/item/stack/medical/ointment(src)
+	new /obj/item/weapon/reagent_containers/hypospray/medipen(src)
+	new /obj/item/device/healthanalyzer(src)
+	return
 
 /obj/item/weapon/storage/firstaid/fire
-	name = "fire first-aid kit"
-	desc = "It's an emergency medical kit for when the toxins lab <i>-spontaneously-</i> burns down."
+	name = "burn treatment kit"
+	desc = "A specialized medical kit for when the toxins lab <i>-spontaneously-</i> burns down."
 	icon_state = "ointment"
 	item_state = "firstaid-ointment"
 
 /obj/item/weapon/storage/firstaid/fire/New()
 	..()
-	if (empty) return
-
+	if(empty) return
 	icon_state = pick("ointment","firefirstaid")
-
 	new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf(src)
 	new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf(src)
 	new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf(src)
-	new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf(src)
-	new /obj/item/device/healthanalyzer(src)
+	new /obj/item/weapon/reagent_containers/pill/salicyclic(src)
+	new /obj/item/weapon/reagent_containers/pill/salicyclic(src)
 	new /obj/item/weapon/reagent_containers/hypospray/medipen(src)
-	new /obj/item/weapon/reagent_containers/pill/salicyclic(src)
-	return
-
-
-/obj/item/weapon/storage/firstaid/regular
-	icon_state = "firstaid"
-
-/obj/item/weapon/storage/firstaid/regular/New()
-	..()
-	if (empty) return
-	new /obj/item/weapon/reagent_containers/pill/patch/styptic(src)
-	new /obj/item/weapon/reagent_containers/pill/patch/styptic(src)
-	new /obj/item/weapon/reagent_containers/pill/salicyclic(src)
-	new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf(src)
-	new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf(src)
 	new /obj/item/device/healthanalyzer(src)
-	new /obj/item/weapon/reagent_containers/hypospray/medipen( src )
 	return
 
 /obj/item/weapon/storage/firstaid/toxin
-	name = "toxin first aid"
-	desc = "Used to treat when you have a high amoutn of toxins in your body."
+	name = "toxin treatment kit"
+	desc = "Used to treat toxic blood content and radiation poisoning."
 	icon_state = "antitoxin"
 	item_state = "firstaid-toxin"
 
 /obj/item/weapon/storage/firstaid/toxin/New()
 	..()
-	if (empty) return
-
+	if(empty) return
 	icon_state = pick("antitoxin","antitoxfirstaid","antitoxfirstaid2","antitoxfirstaid3")
-
-	new /obj/item/weapon/reagent_containers/syringe/charcoal( src )
-	new /obj/item/weapon/reagent_containers/syringe/charcoal( src )
-	new /obj/item/weapon/reagent_containers/syringe/charcoal( src )
-	new /obj/item/weapon/reagent_containers/pill/charcoal( src )
-	new /obj/item/weapon/reagent_containers/pill/charcoal( src )
-	new /obj/item/weapon/reagent_containers/pill/charcoal( src )
-	new /obj/item/device/healthanalyzer( src )
+	new /obj/item/weapon/reagent_containers/syringe/charcoal(src)
+	new /obj/item/weapon/reagent_containers/syringe/charcoal(src)
+	new /obj/item/weapon/reagent_containers/syringe/charcoal(src)
+	new /obj/item/weapon/reagent_containers/pill/charcoal(src)
+	new /obj/item/weapon/reagent_containers/pill/charcoal(src)
+	new /obj/item/weapon/reagent_containers/pill/charcoal(src)
+	new /obj/item/device/healthanalyzer(src)
 	return
 
 /obj/item/weapon/storage/firstaid/o2
-	name = "oxygen deprivation first aid"
+	name = "oxygen deprivation treatment kit"
 	desc = "A box full of oxygen goodies."
 	icon_state = "o2"
 	item_state = "firstaid-o2"
 
 /obj/item/weapon/storage/firstaid/o2/New()
 	..()
-	if (empty) return
+	if(empty) return
 	new /obj/item/weapon/reagent_containers/pill/salbutamol(src)
 	new /obj/item/weapon/reagent_containers/pill/salbutamol(src)
 	new /obj/item/weapon/reagent_containers/pill/salbutamol(src)
 	new /obj/item/weapon/reagent_containers/pill/salbutamol(src)
 	new /obj/item/weapon/reagent_containers/hypospray/medipen(src)
 	new /obj/item/weapon/reagent_containers/hypospray/medipen(src)
-	new /obj/item/device/healthanalyzer( src )
+	new /obj/item/device/healthanalyzer(src)
 	return
 
 /obj/item/weapon/storage/firstaid/brute
-	name = "brute first aid"
+	name = "brute trauma treatment kit"
 	desc = "A first aid kit for when you get toolboxed."
 	icon_state = "brute"
 	item_state = "firstaid-brute"
 
 /obj/item/weapon/storage/firstaid/brute/New()
 	..()
-	if (empty) return
+	if(empty) return
 	new /obj/item/weapon/reagent_containers/pill/patch/styptic(src)
 	new /obj/item/weapon/reagent_containers/pill/patch/styptic(src)
 	new /obj/item/weapon/reagent_containers/pill/patch/styptic(src)
 	new /obj/item/weapon/reagent_containers/pill/patch/styptic(src)
-	new /obj/item/device/healthanalyzer( src )
-	new /obj/item/weapon/reagent_containers/hypospray/medipen(src)
-	new /obj/item/stack/medical/bruise_pack(src)
+	new /obj/item/stack/medical/gauze(src)
+	new /obj/item/stack/medical/gauze(src)
+	new /obj/item/device/healthanalyzer(src)
 	return
 
 /obj/item/weapon/storage/firstaid/tactical
-	name = "first-aid kit"
-	icon_state = "bezerk"
+	name = "combat medical kit"
 	desc = "I hope you've got insurance."
+	icon_state = "bezerk"
 	max_w_class = 3
 
 /obj/item/weapon/storage/firstaid/tactical/New()
 	..()
-	if (empty) return
-	new /obj/item/clothing/tie/stethoscope( src )
-	new /obj/item/weapon/surgicaldrill ( src )
-	new /obj/item/weapon/reagent_containers/hypospray/combat( src )
-	new /obj/item/weapon/reagent_containers/pill/patch/styptic( src )
-	new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf( src )
-	new /obj/item/weapon/reagent_containers/syringe/lethal/choral( src )
-	new /obj/item/clothing/glasses/hud/health/night( src )
+	if(empty) return
+	new /obj/item/stack/medical/gauze(src)
+	new /obj/item/stack/medical/gauze(src)
+	new /obj/item/weapon/reagent_containers/hypospray/combat(src)
+	new /obj/item/weapon/reagent_containers/pill/patch/styptic(src)
+	new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf(src)
+	new /obj/item/weapon/reagent_containers/syringe/lethal/choral(src)
+	new /obj/item/clothing/glasses/hud/health/night(src)
 	return
 
 
@@ -146,11 +141,11 @@
 
 /obj/item/weapon/storage/pill_bottle/MouseDrop(obj/over_object as obj) //Quick pillbottle fix. -Agouri
 
-	if (ishuman(usr) || ismonkey(usr)) //Can monkeys even place items in the pocket slots? Leaving this in just in case~
+	if(ishuman(usr) || ismonkey(usr)) //Can monkeys even place items in the pocket slots? Leaving this in just in case~
 		var/mob/M = usr
-		if (!istype(over_object, /obj/screen) || !Adjacent(M))
+		if(!istype(over_object, /obj/screen) || !Adjacent(M))
 			return ..()
-		if ((!( M.restrained() ) && !( M.stat ) /*&& M.pocket == src*/))
+		if((!( M.restrained() ) && !( M.stat ) /*&& M.pocket == src*/))
 			switch(over_object.name)
 				if("r_hand")
 					M.unEquip(src)
@@ -161,7 +156,7 @@
 			src.add_fingerprint(usr)
 			return
 		if(over_object == usr && in_range(src, usr) || usr.contents.Find(src))
-			if (usr.s_active)
+			if(usr.s_active)
 				usr.s_active.close(usr)
 			src.show_to(usr)
 			return
@@ -173,13 +168,13 @@
 
 /obj/item/weapon/storage/box/silver_sulf/New()
 	..()
-	new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf( src )
-	new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf( src )
-	new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf( src )
-	new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf( src )
-	new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf( src )
-	new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf( src )
-	new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf( src )
+	new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf(src)
+	new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf(src)
+	new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf(src)
+	new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf(src)
+	new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf(src)
+	new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf(src)
+	new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf(src)
 
 
 /obj/item/weapon/storage/pill_bottle/charcoal
@@ -188,13 +183,13 @@
 
 /obj/item/weapon/storage/pill_bottle/charcoal/New()
 	..()
-	new /obj/item/weapon/reagent_containers/pill/charcoal( src )
-	new /obj/item/weapon/reagent_containers/pill/charcoal( src )
-	new /obj/item/weapon/reagent_containers/pill/charcoal( src )
-	new /obj/item/weapon/reagent_containers/pill/charcoal( src )
-	new /obj/item/weapon/reagent_containers/pill/charcoal( src )
-	new /obj/item/weapon/reagent_containers/pill/charcoal( src )
-	new /obj/item/weapon/reagent_containers/pill/charcoal( src )
+	new /obj/item/weapon/reagent_containers/pill/charcoal(src)
+	new /obj/item/weapon/reagent_containers/pill/charcoal(src)
+	new /obj/item/weapon/reagent_containers/pill/charcoal(src)
+	new /obj/item/weapon/reagent_containers/pill/charcoal(src)
+	new /obj/item/weapon/reagent_containers/pill/charcoal(src)
+	new /obj/item/weapon/reagent_containers/pill/charcoal(src)
+	new /obj/item/weapon/reagent_containers/pill/charcoal(src)
 
 /obj/item/weapon/storage/pill_bottle/epinephrine
 	name = "bottle of epinephrine pills"
@@ -202,13 +197,13 @@
 
 /obj/item/weapon/storage/pill_bottle/epinephrine/New()
 	..()
-	new /obj/item/weapon/reagent_containers/pill/epinephrine( src )
-	new /obj/item/weapon/reagent_containers/pill/epinephrine( src )
-	new /obj/item/weapon/reagent_containers/pill/epinephrine( src )
-	new /obj/item/weapon/reagent_containers/pill/epinephrine( src )
-	new /obj/item/weapon/reagent_containers/pill/epinephrine( src )
-	new /obj/item/weapon/reagent_containers/pill/epinephrine( src )
-	new /obj/item/weapon/reagent_containers/pill/epinephrine( src )
+	new /obj/item/weapon/reagent_containers/pill/epinephrine(src)
+	new /obj/item/weapon/reagent_containers/pill/epinephrine(src)
+	new /obj/item/weapon/reagent_containers/pill/epinephrine(src)
+	new /obj/item/weapon/reagent_containers/pill/epinephrine(src)
+	new /obj/item/weapon/reagent_containers/pill/epinephrine(src)
+	new /obj/item/weapon/reagent_containers/pill/epinephrine(src)
+	new /obj/item/weapon/reagent_containers/pill/epinephrine(src)
 
 /obj/item/weapon/storage/pill_bottle/mutadone
 	name = "bottle of mutadone pills"
@@ -244,11 +239,11 @@
 
 /obj/item/weapon/storage/pill_bottle/stimulant/New()
 	..()
-	new /obj/item/weapon/reagent_containers/pill/stimulant( src )
-	new /obj/item/weapon/reagent_containers/pill/stimulant( src )
-	new /obj/item/weapon/reagent_containers/pill/stimulant( src )
-	new /obj/item/weapon/reagent_containers/pill/stimulant( src )
-	new /obj/item/weapon/reagent_containers/pill/stimulant( src )
+	new /obj/item/weapon/reagent_containers/pill/stimulant(src)
+	new /obj/item/weapon/reagent_containers/pill/stimulant(src)
+	new /obj/item/weapon/reagent_containers/pill/stimulant(src)
+	new /obj/item/weapon/reagent_containers/pill/stimulant(src)
+	new /obj/item/weapon/reagent_containers/pill/stimulant(src)
 
 /obj/item/weapon/storage/pill_bottle/dice
 	name = "bag of dice"
@@ -258,11 +253,11 @@
 
 /obj/item/weapon/storage/pill_bottle/dice/New()
 	..()
-	new /obj/item/weapon/dice/d4( src )
-	new /obj/item/weapon/dice( src )
-	new /obj/item/weapon/dice/d8( src )
-	new /obj/item/weapon/dice/d10( src )
-	new /obj/item/weapon/dice/d00( src )
-	new /obj/item/weapon/dice/d12( src )
-	new /obj/item/weapon/dice/d20( src )
+	new /obj/item/weapon/dice/d4(src)
+	new /obj/item/weapon/dice(src)
+	new /obj/item/weapon/dice/d8(src)
+	new /obj/item/weapon/dice/d10(src)
+	new /obj/item/weapon/dice/d00(src)
+	new /obj/item/weapon/dice/d12(src)
+	new /obj/item/weapon/dice/d20(src)