Fix merge conflict

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

@@ -90,7 +90,6 @@
 			to_chat(AI, "Your core files are being wiped!")
 			while(AI && AI.stat != DEAD)
 				AI.adjustOxyLoss(2)
-				AI.updatehealth()
 				sleep(10)
 			flush = 0
 

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

@@ -84,7 +84,7 @@
 		var/dead_notes = input("Insert any relevant notes")
 		var/obj/item/paper/R = new(user.loc)
 		R.name = "Official Coroner's Report - [dead_name]"
-		R.info = "<b>NanoTrasen Science Station Cyberiad - Coroner's Report</b><br><br><b>Name of Deceased:</b> [dead_name]</br><br><b>Rank of Deceased:</b> [dead_rank]<br><br><b>Time of Death:</b> [dead_tod]<br><br><b>Cause of Death:</b> [dead_cause]<br><br><b>Trace Chemicals:</b> [dead_chems]<br><br><b>Additional Coroner's Notes:</b> [dead_notes]<br><br><b>Coroner's Signature:</b> <span class=\"paper_field\">"
+		R.info = "<b>Nanotrasen Science Station [using_map.station_short] - Coroner's Report</b><br><br><b>Name of Deceased:</b> [dead_name]</br><br><b>Rank of Deceased:</b> [dead_rank]<br><br><b>Time of Death:</b> [dead_tod]<br><br><b>Cause of Death:</b> [dead_cause]<br><br><b>Trace Chemicals:</b> [dead_chems]<br><br><b>Additional Coroner's Notes:</b> [dead_notes]<br><br><b>Coroner's Signature:</b> <span class=\"paper_field\">"
 		playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1)
 		sleep(10)
 		user.put_in_hands(R)
@@ -146,7 +146,7 @@
 		if(damaging_weapon)
 			scan_data += "Severity: [damage_desc]<br>"
 			scan_data += "Hits by weapon: [total_hits]<br>"
-		scan_data += "Approximate time of wound infliction: [station_time(age)]<br>"
+		scan_data += "Approximate time of wound infliction: [station_time_timestamp("hh:mm", age)]<br>"
 		scan_data += "Affected limbs: [D.organ_names]<br>"
 		scan_data += "Possible weapons:<br>"
 		for(var/weapon_name in weapon_chances)

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

@@ -10,6 +10,7 @@
 	var/spamcheck = 0
 	var/emagged = 0
 	var/insults = 0
+	var/span = ""
 	var/list/insultmsg = list("FUCK EVERYONE!", "I'M A TATER!", "ALL SECURITY TO SHOOT ME ON SIGHT!", "I HAVE A BOMB!", "CAPTAIN IS A COMDOM!", "FOR THE SYNDICATE!")
 
 /obj/item/megaphone/attack_self(mob/living/user as mob)
@@ -32,6 +33,10 @@
 		if(H && H.mind && H.mind.miming)
 			to_chat(user, "<span class='warning'>Your vow of silence prevents you from speaking.</span>")
 			return
+		if(H.mind)
+			span = H.mind.speech_span
+		if((COMIC in H.mutations) || H.get_int_organ(/obj/item/organ/internal/cyberimp/brain/clown_voice))
+			span = "sans"
 	if(spamcheck)
 		to_chat(user, "<span class='warning'>\The [src] needs to recharge!</span>")
 		return
@@ -51,6 +56,8 @@
 			else
 				to_chat(user, "<span class='warning'>*BZZZZzzzzzt*</span>")
 		else
+			if(span)
+				message = "<span class='[span]'>[message]</span>"
 			saymsg(user, message)
 
 		spamcheck = 1
@@ -58,7 +65,7 @@
 			spamcheck = 0
 
 /obj/item/megaphone/proc/saymsg(mob/living/user as mob, message)
-	audible_message("<span class='game say'><span class='name'>[user]</span> broadcasts, <span class='reallybig'>\"[message]\"</span></span>", hearing_distance = 14)
+	audible_message("<span class='game say'><span class='name'>[user.GetVoice()]</span> [user.GetAltName()] broadcasts, <span class='reallybig'>\"[message]\"</span></span>", hearing_distance = 14)
 	log_say(message, user)
 	for(var/obj/O in oview(14, get_turf(src)))
 		O.hear_talk(user, "<span class='reallybig'>[message]</span>")

code/game/objects/items/devices/radio/intercom.dm

@@ -45,15 +45,16 @@
 	name = "station intercom (Security)"
 	frequency = SEC_I_FREQ
 
-/obj/item/radio/intercom/New(turf/loc, var/ndir = 0, var/building = 3)
+/obj/item/radio/intercom/New(turf/loc, ndir, building = 3)
 	..()
 	buildstage = building
 	if(buildstage)
 		processing_objects.Add(src)
 	else
-		pixel_x = (ndir & 3)? 0 : (ndir == 4 ? 28 : -28)
-		pixel_y = (ndir & 3)? (ndir ==1 ? 28 : -28) : 0
-		dir=ndir
+		if(ndir)
+			pixel_x = (ndir & EAST|WEST) ? (ndir == EAST ? 28 : -28) : 0
+			pixel_y = (ndir & NORTH|SOUTH) ? (ndir == NORTH ? 28 : -28) : 0
+			dir=ndir
 		b_stat=1
 		on = 0
 	global_intercoms.Add(src)

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

@@ -509,7 +509,7 @@ REAGENT SCANNER
 		if(ismob(loc))
 			var/mob/M = loc
 			M.put_in_hands(P)
-			to_chat(M, "<span class='notice'>Report printed. Log cleared.<span>")
+			to_chat(M, "<span class='notice'>Report printed. Log cleared.</span>")
 			datatoprint = ""
 	else
 		to_chat(usr, "<span class='notice'>[src] has no logs or is already in use.</span>")
@@ -580,7 +580,7 @@ REAGENT SCANNER
 		if(ismob(loc))
 			var/mob/M = loc
 			M.put_in_hands(P)
-			to_chat(M, "<span class='notice'>Report printed. Log cleared.<span>")
+			to_chat(M, "<span class='notice'>Report printed. Log cleared.</span>")
 			datatoprint = ""
 			scanning = 1
 	else
@@ -632,3 +632,253 @@ REAGENT SCANNER
 	if(T.cores > 1)
 		user.show_message("Anomalous slime core amount detected", 1)
 	user.show_message("Growth progress: [T.amount_grown]/10", 1)
+
+/obj/item/bodyanalyzer
+	name = "handheld body analyzer"
+	icon = 'icons/obj/device.dmi'
+	icon_state = "bodyanalyzer_0"
+	item_state = "healthanalyser"
+	desc = "A handheld scanner capable of deep-scanning an entire body."
+	slot_flags = SLOT_BELT
+	throwforce = 3
+	w_class = WEIGHT_CLASS_TINY
+	throw_speed = 5
+	throw_range = 10
+	origin_tech = "magnets=6;biotech=6"
+	var/obj/item/stock_parts/cell/power_supply
+	var/cell_type = /obj/item/stock_parts/cell/upgraded
+	var/ready = TRUE // Ready to scan
+	var/time_to_use = 0 // How much time remaining before next scan is available.
+	var/usecharge = 750
+
+/obj/item/bodyanalyzer/advanced
+	cell_type = /obj/item/stock_parts/cell/upgraded/plus
+
+/obj/item/bodyanalyzer/New()
+	..()
+	power_supply = new cell_type(src)
+	power_supply.give(power_supply.maxcharge)
+	update_icon()
+
+/obj/item/bodyanalyzer/proc/setReady()
+	ready = TRUE
+	playsound(src, 'sound/machines/defib_saftyOn.ogg', 50, 0)
+	update_icon()
+
+/obj/item/bodyanalyzer/update_icon(printing = FALSE)
+	overlays.Cut()
+	var/percent = power_supply.percent()
+	if(ready)
+		icon_state = "bodyanalyzer_1"
+	else
+		icon_state = "bodyanalyzer_2"
+	
+	var/overlayid = round(percent / 10)
+	overlayid = "bodyanalyzer_charge[overlayid]"
+	overlays += icon(icon, overlayid)
+
+	if(printing)
+		overlays += icon(icon, "bodyanalyzer_printing")
+
+/obj/item/bodyanalyzer/attack(mob/living/M, mob/living/carbon/human/user)
+	if(user.incapacitated() || !user.Adjacent(M))
+		return
+	
+	if(!ready)
+		to_chat(user, "<span class='notice'>The scanner beeps angrily at you! It's currently recharging - [round((time_to_use - world.time) * 0.1)] seconds remaining.</span>")
+		playsound(user.loc, 'sound/machines/buzz-sigh.ogg', 50, 1)
+		return
+	
+	if(power_supply.charge >= usecharge)
+		mobScan(M, user)
+	else
+		to_chat(user, "<span class='notice'>The scanner beeps angrily at you! It's out of charge!</span>")
+		playsound(user.loc, 'sound/machines/buzz-sigh.ogg', 50, 1)
+	
+/obj/item/bodyanalyzer/proc/mobScan(mob/living/M, mob/user)
+	if(ishuman(M))
+		var/report = generate_printing_text(M, user)
+		user.visible_message("[user] begins scanning [M] with [src].", "You begin scanning [M].")
+		if(do_after(user, 100, target = M))
+			var/obj/item/paper/printout = new
+			printout.info = report
+			printout.name = "Scan report - [M.name]"
+			playsound(user.loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1)
+			user.put_in_hands(printout)
+			time_to_use = world.time + 600
+			power_supply.use(usecharge)
+			ready = FALSE
+			update_icon(TRUE)
+			addtimer(CALLBACK(src, /obj/item/bodyanalyzer/.proc/setReady), 600)
+			addtimer(CALLBACK(src, /obj/item/bodyanalyzer/.proc/update_icon), 20)
+
+	else if(iscorgi(M) && M.stat == DEAD)
+		to_chat(user, "<span class='notice'>You wonder if [M.p_they()] was a good dog. <b>[src] tells you they were the best...</b></span>") // :'(
+		playsound(loc, 'sound/machines/ping.ogg', 50, 0)
+		ready = FALSE
+		addtimer(CALLBACK(src, /obj/item/bodyanalyzer/.proc/setReady), 600)
+		time_to_use = world.time + 600
+	else
+		to_chat(user, "<span class='notice'>Scanning error detected. Invalid specimen.</span>")
+		
+//Unashamedly ripped from adv_med.dm
+/obj/item/bodyanalyzer/proc/generate_printing_text(mob/living/M, mob/user)
+	var/dat = ""
+	var/mob/living/carbon/human/target = M
+	
+	dat = "<font color='blue'><b>Target Statistics:</b></font><br>"
+	var/t1
+	switch(target.stat) // obvious, see what their status is
+		if(CONSCIOUS)
+			t1 = "Conscious"
+		if(UNCONSCIOUS)
+			t1 = "Unconscious"
+		else
+			t1 = "*dead*"
+	dat += "[target.health > 50 ? "<font color='blue'>" : "<font color='red'>"]\tHealth %: [target.health], ([t1])</font><br>"
+
+	var/found_disease = FALSE
+	for(var/thing in target.viruses)
+		var/datum/disease/D = thing
+		if(D.visibility_flags) //If any visibility flags are on.
+			continue
+		found_disease = TRUE
+		break
+	if(found_disease)
+		dat += "<font color='red'>Disease detected in target.</font><BR>"
+
+	var/extra_font = null
+	extra_font = (target.getBruteLoss() < 60 ? "<font color='blue'>" : "<font color='red'>")
+	dat += "[extra_font]\t-Brute Damage %: [target.getBruteLoss()]</font><br>"
+
+	extra_font = (target.getOxyLoss() < 60 ? "<font color='blue'>" : "<font color='red'>")
+	dat += "[extra_font]\t-Respiratory Damage %: [target.getOxyLoss()]</font><br>"
+
+	extra_font = (target.getToxLoss() < 60 ? "<font color='blue'>" : "<font color='red'>")
+	dat += "[extra_font]\t-Toxin Content %: [target.getToxLoss()]</font><br>"
+
+	extra_font = (target.getFireLoss() < 60 ? "<font color='blue'>" : "<font color='red'>")
+	dat += "[extra_font]\t-Burn Severity %: [target.getFireLoss()]</font><br>"
+
+	extra_font = (target.radiation < 10 ?"<font color='blue'>" : "<font color='red'>")
+	dat += "[extra_font]\tRadiation Level %: [target.radiation]</font><br>"
+
+	extra_font = (target.getCloneLoss() < 1 ?"<font color='blue'>" : "<font color='red'>")
+	dat += "[extra_font]\tGenetic Tissue Damage %: [target.getCloneLoss()]<br>"
+
+	extra_font = (target.getBrainLoss() < 1 ?"<font color='blue'>" : "<font color='red'>")
+	dat += "[extra_font]\tApprox. Brain Damage %: [target.getBrainLoss()]<br>"
+
+	dat += "Paralysis Summary %: [target.paralysis] ([round(target.paralysis / 4)] seconds left!)<br>"
+	dat += "Body Temperature: [target.bodytemperature-T0C]&deg;C ([target.bodytemperature*1.8-459.67]&deg;F)<br>"
+
+	dat += "<hr>"
+
+	if(target.has_brain_worms())
+		dat += "Large growth detected in frontal lobe, possibly cancerous. Surgical removal is recommended.<br>"
+
+	var/blood_percent =  round((target.blood_volume / BLOOD_VOLUME_NORMAL))
+	blood_percent *= 100
+
+	extra_font = (target.blood_volume > 448 ? "<font color='blue'>" : "<font color='red'>")
+	dat += "[extra_font]\tBlood Level %: [blood_percent] ([target.blood_volume] units)</font><br>"
+
+	if(target.reagents)
+		dat += "Epinephrine units: [target.reagents.get_reagent_amount("Epinephrine")] units<BR>"
+		dat += "Ether: [target.reagents.get_reagent_amount("ether")] units<BR>"
+
+		extra_font = (target.reagents.get_reagent_amount("silver_sulfadiazine") < 30 ? "<font color='black'>" : "<font color='red'>")
+		dat += "[extra_font]\tSilver Sulfadiazine: [target.reagents.get_reagent_amount("silver_sulfadiazine")]</font><br>"
+
+		extra_font = (target.reagents.get_reagent_amount("styptic_powder") < 30 ? "<font color='black'>" : "<font color='red'>")
+		dat += "[extra_font]\tStyptic Powder: [target.reagents.get_reagent_amount("styptic_powder")] units<BR>"
+
+		extra_font = (target.reagents.get_reagent_amount("salbutamol") < 30 ? "<font color='black'>" : "<font color='red'>")
+		dat += "[extra_font]\tSalbutamol: [target.reagents.get_reagent_amount("salbutamol")] units<BR>"
+
+	dat += "<hr><table border='1'>"
+	dat += "<tr>"
+	dat += "<th>Organ</th>"
+	dat += "<th>Burn Damage</th>"
+	dat += "<th>Brute Damage</th>"
+	dat += "<th>Other Wounds</th>"
+	dat += "</tr>"
+
+	for(var/obj/item/organ/external/e in target.bodyparts)
+		dat += "<tr>"
+		var/AN = ""
+		var/open = ""
+		var/infected = ""
+		var/robot = ""
+		var/imp = ""
+		var/bled = ""
+		var/splint = ""
+		var/internal_bleeding = ""
+		var/lung_ruptured = ""
+		if(e.internal_bleeding)
+			internal_bleeding = "<br>Internal bleeding"
+		if(istype(e, /obj/item/organ/external/chest) && target.is_lung_ruptured())
+			lung_ruptured = "Lung ruptured:"
+		if(e.status & ORGAN_SPLINTED)
+			splint = "Splinted:"
+		if(e.status & ORGAN_BROKEN)
+			AN = "[e.broken_description]:"
+		if(e.is_robotic())
+			robot = "Robotic:"
+		if(e.open)
+			open = "Open:"
+		switch(e.germ_level)
+			if(INFECTION_LEVEL_ONE to INFECTION_LEVEL_ONE + 200)
+				infected = "Mild Infection:"
+			if(INFECTION_LEVEL_ONE + 200 to INFECTION_LEVEL_ONE + 300)
+				infected = "Mild Infection+:"
+			if(INFECTION_LEVEL_ONE + 300 to INFECTION_LEVEL_ONE + 400)
+				infected = "Mild Infection++:"
+			if(INFECTION_LEVEL_TWO to INFECTION_LEVEL_TWO + 200)
+				infected = "Acute Infection:"
+			if(INFECTION_LEVEL_TWO + 200 to INFECTION_LEVEL_TWO + 300)
+				infected = "Acute Infection+:"
+			if(INFECTION_LEVEL_TWO + 300 to INFECTION_LEVEL_TWO + 400)
+				infected = "Acute Infection++:"
+			if(INFECTION_LEVEL_THREE to INFINITY)
+				infected = "Septic:"
+
+		var/unknown_body = 0
+		for(var/I in e.embedded_objects)
+			unknown_body++
+
+		if(unknown_body || e.hidden)
+			imp += "Unknown body present:"
+		if(!AN && !open && !infected & !imp)
+			AN = "None:"
+		dat += "<td>[e.name]</td><td>[e.burn_dam]</td><td>[e.brute_dam]</td><td>[robot][bled][AN][splint][open][infected][imp][internal_bleeding][lung_ruptured]</td>"
+		dat += "</tr>"
+	for(var/obj/item/organ/internal/i in target.internal_organs)
+		var/mech = i.desc
+		var/infection = "None"
+		switch(i.germ_level)
+			if(1 to INFECTION_LEVEL_ONE + 200)
+				infection = "Mild Infection:"
+			if(INFECTION_LEVEL_ONE + 200 to INFECTION_LEVEL_ONE + 300)
+				infection = "Mild Infection+:"
+			if(INFECTION_LEVEL_ONE + 300 to INFECTION_LEVEL_ONE + 400)
+				infection = "Mild Infection++:"
+			if(INFECTION_LEVEL_TWO to INFECTION_LEVEL_TWO + 200)
+				infection = "Acute Infection:"
+			if(INFECTION_LEVEL_TWO + 200 to INFECTION_LEVEL_TWO + 300)
+				infection = "Acute Infection+:"
+			if(INFECTION_LEVEL_TWO + 300 to INFINITY)
+				infection = "Acute Infection++:"
+
+		dat += "<tr>"
+		dat += "<td>[i.name]</td><td>N/A</td><td>[i.damage]</td><td>[infection]:[mech]</td><td></td>"
+		dat += "</tr>"
+	dat += "</table>"
+	if(target.disabilities & BLIND)
+		dat += "<font color='red'>Cataracts detected.</font><BR>"
+	if(target.disabilities & COLOURBLIND)
+		dat += "<font color='red'>Photoreceptor abnormalities detected.</font><BR>"
+	if(target.disabilities & NEARSIGHTED)
+		dat += "<font color='red'>Retinal misalignment detected.</font><BR>"
+	
+	return dat

code/game/objects/items/mixing_bowl.dm

@@ -0,0 +1,170 @@
+
+/obj/item/mixing_bowl
+	name = "mixing bowl"
+	desc = "Mixing it up in the kitchen."
+	flags = OPENCONTAINER
+	icon = 'icons/obj/kitchen.dmi'
+	icon_state = "mixing_bowl"
+	var/max_n_of_items = 25
+	var/dirty = FALSE
+	var/clean_icon = "mixing_bowl"
+	var/dirty_icon = "mixing_bowl_dirty"
+
+/obj/item/mixing_bowl/New()
+	..()
+	create_reagents(100)
+
+/obj/item/mixing_bowl/attackby(obj/item/I, mob/user, params)
+	if(dirty)
+		if(istype(I, /obj/item/soap))
+			user.visible_message("<span class='notice'>[user] starts to scrub [src].</span>", "<span class='notice'>You start to scrub [src].</span>")
+			if(do_after(user, 20 * I.toolspeed, target = src))
+				clean()
+				user.visible_message("<span class='notice'>[user] has scrubbed [src] clean.</span>", "<span class='notice'>You have scrubbed [src] clean.</span>")
+			return 1
+		else
+			to_chat(user, "<span class='warning'>You should clean [src] before you use it for food prep.</span>")
+		return 0
+	if(is_type_in_list(I, GLOB.cooking_ingredients[RECIPE_MICROWAVE]) || is_type_in_list(I, GLOB.cooking_ingredients[RECIPE_GRILL]) || is_type_in_list(I, GLOB.cooking_ingredients[RECIPE_OVEN]) || is_type_in_list(I, GLOB.cooking_ingredients[RECIPE_CANDY]))
+		if(contents.len>=max_n_of_items)
+			to_chat(user, "<span class='alert'>This [src] is full of ingredients, you cannot put more.</span>")
+			return 1
+		if(istype(I, /obj/item/stack))
+			var/obj/item/stack/S = I
+			if(S.amount > 1)
+				var/obj/item/stack/to_add = S.split(user, 1)
+				to_add.forceMove(src)
+				user.visible_message("<span class='notice'>[user] adds one of [S] to [src].</span>", "<span class='notice'>You add one of [S] to [src].</span>")
+			else
+				return add_item(S, user)
+		else
+			return add_item(I, user)
+	else if(is_type_in_list(I, list(/obj/item/reagent_containers/glass, /obj/item/reagent_containers/food/drinks, /obj/item/reagent_containers/food/condiment)))
+		if(!I.reagents)
+			return 1
+		for(var/datum/reagent/R in I.reagents.reagent_list)
+			if(!(R.id in GLOB.cooking_reagents[RECIPE_MICROWAVE]) && !(R.id in GLOB.cooking_reagents[RECIPE_GRILL]) && !(R.id in GLOB.cooking_reagents[RECIPE_OVEN]) && !(R.id in GLOB.cooking_reagents[RECIPE_CANDY]))
+				to_chat(user, "<span class='alert'>Your [I] contains components unsuitable for cookery.</span>")
+				return 1
+	else
+		to_chat(user, "<span class='alert'>You have no idea what you can cook with [I].</span>")
+		return 1
+
+/obj/item/mixing_bowl/proc/add_item(obj/item/I, mob/user)
+	if(!user.drop_item())
+		to_chat(user, "<span class='notice'>\The [I] is stuck to your hand, you cannot put it in [src]</span>")
+		//return 0
+	else
+		I.forceMove(src)
+		user.visible_message("<span class='notice'>[user] adds [I] to [src].</span>", "<span class='notice'>You add [I] to [src].</span>")
+
+/obj/item/mixing_bowl/attack_self(mob/user)
+	var/dat = ""
+	if(dirty)
+		dat = {"<code>This [src] is dirty!<BR>Please clean it before use!</code>"}
+	else
+		var/list/items_counts = new
+		var/list/items_measures = new
+		var/list/items_measures_p = new
+		for(var/obj/O in contents)
+			var/display_name = O.name
+			if(istype(O,/obj/item/reagent_containers/food/snacks/egg))
+				items_measures[display_name] = "egg"
+				items_measures_p[display_name] = "eggs"
+			if(istype(O,/obj/item/reagent_containers/food/snacks/tofu))
+				items_measures[display_name] = "tofu chunk"
+				items_measures_p[display_name] = "tofu chunks"
+			if(istype(O,/obj/item/reagent_containers/food/snacks/meat)) //any meat
+				items_measures[display_name] = "slab of meat"
+				items_measures_p[display_name] = "slabs of meat"
+			if(istype(O,/obj/item/reagent_containers/food/snacks/donkpocket))
+				display_name = "Turnovers"
+				items_measures[display_name] = "turnover"
+				items_measures_p[display_name] = "turnovers"
+			if(istype(O,/obj/item/reagent_containers/food/snacks/carpmeat))
+				items_measures[display_name] = "fillet of meat"
+				items_measures_p[display_name] = "fillets of meat"
+			items_counts[display_name]++
+		for(var/O in items_counts)
+			var/N = items_counts[O]
+			if(!(O in items_measures))
+				dat += {"<B>[capitalize(O)]:</B> [N] [lowertext(O)]\s<BR>"}
+			else
+				if(N==1)
+					dat += {"<B>[capitalize(O)]:</B> [N] [items_measures[O]]<BR>"}
+				else
+					dat += {"<B>[capitalize(O)]:</B> [N] [items_measures_p[O]]<BR>"}
+
+		for(var/datum/reagent/R in reagents.reagent_list)
+			var/display_name = R.name
+			if(R.id == "capsaicin")
+				display_name = "Hotsauce"
+			if(R.id == "frostoil")
+				display_name = "Coldsauce"
+			dat += {"<B>[display_name]:</B> [R.volume] unit\s<BR>"}
+
+		if(items_counts.len==0 && reagents.reagent_list.len==0)
+			dat = {"<B>The [src] is empty</B><BR>"}
+		else
+			dat = {"<b>Ingredients:</b><br>[dat]"}
+		dat += {"<HR><BR> <A href='?src=[UID()];action=dispose'>Eject ingredients!</A><BR>"}
+
+	var/datum/browser/popup = new(user, name, name, 400, 400)
+	popup.set_content(dat)
+	popup.open(0)
+	onclose(user, "[name]")
+	return
+
+/obj/item/mixing_bowl/Topic(href, href_list)
+	if(..())
+		return
+	if("dispose")
+		dispose()
+	return
+
+/obj/item/mixing_bowl/proc/dispose()
+	for(var/obj/O in contents)
+		O.forceMove(loc)
+	if(reagents.total_volume)
+		make_dirty(5)
+	reagents.clear_reagents()
+	to_chat(usr, "<span class='notice'>You dispose of [src]'s contents.</span>")
+	updateUsrDialog()
+
+/obj/item/mixing_bowl/proc/make_dirty(chance)
+	if(!chance)
+		return
+	if(prob(chance))
+		dirty = TRUE
+		flags = null
+		icon_state = dirty_icon
+
+/obj/item/mixing_bowl/proc/clean()
+	dirty = FALSE
+	flags = OPENCONTAINER
+	icon_state = clean_icon
+
+/obj/item/mixing_bowl/wash(mob/user, atom/source)
+	if(..())
+		clean()
+
+/obj/item/mixing_bowl/proc/fail(obj/source)
+	if(!source)
+		source = src
+	var/amount = 0
+	for(var/obj/O in contents)
+		amount++
+		if(O.reagents)
+			var/id = O.reagents.get_master_reagent_id()
+			if(id)
+				amount+=O.reagents.get_reagent_amount(id)
+		qdel(O)
+	if(reagents && reagents.total_volume)
+		var/id = reagents.get_master_reagent_id()
+		if(id)
+			amount += reagents.get_reagent_amount(id)
+	reagents.clear_reagents()
+	var/obj/item/reagent_containers/food/snacks/badrecipe/ffuu = new(get_turf(source))
+	ffuu.reagents.add_reagent("carbon", amount)
+	ffuu.reagents.add_reagent("????", amount/10)
+	make_dirty(75)

code/game/objects/items/mountable_frames/extinguisher_frame.dm

@@ -0,0 +1,10 @@
+/obj/item/mounted/frame/extinguisher
+	name = "Extinguisher Cabinet Frame"
+	desc = "Used for building extinguisher cabinet"
+	icon = 'icons/obj/closet.dmi'
+	icon_state = "extinguisher_frame"
+	mount_reqs = list("simfloor", "nospace")
+
+/obj/item/mounted/frame/extinguisher/do_build(turf/on_wall, mob/user)
+	new /obj/structure/extinguisher_cabinet/empty(get_turf(src), get_dir(user, on_wall))
+	qdel(src)

code/game/objects/items/robot/robot_upgrades.dm

@@ -302,14 +302,12 @@
 
 		if(cyborg.health < cyborg.maxHealth)
 			if(cyborg.health < 0)
-				repair_amount = -2.5
+				repair_amount = 2.5
 				powercost = 30
 			else
-				repair_amount = -1
+				repair_amount = 1
 				powercost = 10
-			cyborg.adjustBruteLoss(repair_amount)
-			cyborg.adjustFireLoss(repair_amount)
-			cyborg.updatehealth()
+			cyborg.heal_overall_damage(repair_amount, repair_amount)
 			cyborg.cell.use(powercost)
 		else
 			cyborg.cell.use(5)

code/game/objects/items/shooting_range.dm

@@ -94,9 +94,7 @@
 
 		hp -= Proj.damage
 		if(hp <= 0)
-			for(var/mob/O in oviewers())
-				if((O.client && !( O.blinded )))
-					to_chat(O, "<span class='warning'>[src] breaks into tiny pieces and collapses!</span>")
+			visible_message("<span class='warning'>[src] breaks into tiny pieces and collapses!</span>")
 			qdel(src)
 
 		// Create a temporary object to represent the damage

code/game/objects/items/stacks/medical.dm

@@ -73,7 +73,6 @@
 
 	else
 		M.heal_organ_damage(heal_brute, heal_burn)
-		M.updatehealth()
 		user.visible_message("<span class='green'>[user] applies [src] on [M].</span>", \
 							 "<span class='green'>You apply [src] on [M].</span>")
 		use(1)

code/game/objects/items/stacks/nanopaste.dm

@@ -15,9 +15,7 @@
 	if(istype(M,/mob/living/silicon/robot))	//Repairing cyborgs
 		var/mob/living/silicon/robot/R = M
 		if(R.getBruteLoss() || R.getFireLoss() )
-			R.adjustBruteLoss(-15)
-			R.adjustFireLoss(-15)
-			R.updatehealth()
+			R.heal_overall_damage(15, 15)
 			use(1)
 			user.visible_message("<span class='notice'>\The [user] applied some [src] at [R]'s damaged areas.</span>",\
 				"<span class='notice'>You apply some [src] at [R]'s damaged areas.</span>")
@@ -31,7 +29,6 @@
 		if(S && S.is_robotic())
 			if(S.get_damage())
 				S.heal_damage(15, 15, robo_repair = 1)
-				H.updatehealth()
 				use(1)
 				user.visible_message("<span class='notice'>\The [user] applies some nanite paste at[user != M ? " \the [M]'s" : " \the"][S.name] with \the [src].</span>",\
 				"<span class='notice'>You apply some nanite paste at [user == M ? "your" : "[M]'s"] [S.name].</span>")

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

@@ -68,12 +68,12 @@ var/global/list/datum/stack_recipe/gold_recipes = list ( \
 	)
 
 var/global/list/datum/stack_recipe/plasma_recipes = list ( \
-	new/datum/stack_recipe("plasma door", /obj/structure/mineral_door/transparent/plasma, 10, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe/dangerous("plasma door", /obj/structure/mineral_door/transparent/plasma, 10, one_per_turf = 1, on_floor = 1), \
 	null, \
-	new/datum/stack_recipe("plasma tile", /obj/item/stack/tile/mineral/plasma, 1, 4, 20), \
+	new/datum/stack_recipe/dangerous("plasma tile", /obj/item/stack/tile/mineral/plasma, 1, 4, 20), \
 	null, \
-	new/datum/stack_recipe("Scientist Statue", /obj/structure/statue/plasma/scientist, 5, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("Xenomorph Statue", /obj/structure/statue/plasma/xeno, 5, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe/dangerous("Scientist Statue", /obj/structure/statue/plasma/scientist, 5, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe/dangerous("Xenomorph Statue", /obj/structure/statue/plasma/xeno, 5, one_per_turf = 1, on_floor = 1), \
 	)
 
 var/global/list/datum/stack_recipe/bananium_recipes = list ( \
@@ -94,7 +94,7 @@ var/global/list/datum/stack_recipe/tranquillite_recipes = list ( \
 	)
 
 var/global/list/datum/stack_recipe/abductor_recipes = list ( \
-	new/datum/stack_recipe("alien bed", /obj/structure/stool/bed/abductor, 2, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("alien bed", /obj/structure/bed/abductor, 2, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("alien locker", /obj/structure/closet/abductor, 1, time = 15, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("alien table frame", /obj/structure/table_frame/abductor, 1, time = 15, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("alien airlock assembly", /obj/structure/door_assembly/door_assembly_abductor, 4, time = 20, one_per_turf = 1, on_floor = 1), \

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

@@ -14,32 +14,32 @@
  * Metal
  */
 var/global/list/datum/stack_recipe/metal_recipes = list(
-	new /datum/stack_recipe("stool", /obj/structure/stool, one_per_turf = 1, on_floor = 1),
-	new /datum/stack_recipe("chair", /obj/structure/stool/bed/chair, one_per_turf = 1, on_floor = 1),
-	new /datum/stack_recipe("sofa (middle)", /obj/structure/stool/bed/chair/sofa, one_per_turf = 1, on_floor = 1),
-	new /datum/stack_recipe("sofa (left)", /obj/structure/stool/bed/chair/sofa/left, one_per_turf = 1, on_floor = 1),
-	new /datum/stack_recipe("sofa (right)", /obj/structure/stool/bed/chair/sofa/right, one_per_turf = 1, on_floor = 1),
-	new /datum/stack_recipe("sofa (corner)", /obj/structure/stool/bed/chair/sofa/corner, one_per_turf = 1, on_floor = 1),
-	new /datum/stack_recipe("barber chair", /obj/structure/stool/bed/chair/barber, one_per_turf = 1, on_floor = 1),
-	new /datum/stack_recipe("wheelchair", /obj/structure/stool/bed/chair/wheelchair, 15, one_per_turf = 1, on_floor = 1),
-	new /datum/stack_recipe("bed", /obj/structure/stool/bed, 2, one_per_turf = 1, on_floor = 1),
-	new /datum/stack_recipe("psychiatrist bed", /obj/structure/stool/psychbed, 5, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("stool", /obj/structure/chair/stool, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("chair", /obj/structure/chair, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("sofa (middle)", /obj/structure/chair/sofa, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("sofa (left)", /obj/structure/chair/sofa/left, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("sofa (right)", /obj/structure/chair/sofa/right, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("sofa (corner)", /obj/structure/chair/sofa/corner, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("barber chair", /obj/structure/chair/barber, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("wheelchair", /obj/structure/chair/wheelchair, 15, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("bed", /obj/structure/bed, 2, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("psychiatrist bed", /obj/structure/bed/psych, 5, one_per_turf = 1, on_floor = 1),
 	null,
 	new /datum/stack_recipe_list("office chairs",list(
-		new /datum/stack_recipe("dark office chair", /obj/structure/stool/bed/chair/office/dark, 5, one_per_turf = 1, on_floor = 1),
-		new /datum/stack_recipe("light office chair", /obj/structure/stool/bed/chair/office/light, 5, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("dark office chair", /obj/structure/chair/office/dark, 5, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("light office chair", /obj/structure/chair/office/light, 5, one_per_turf = 1, on_floor = 1),
 	)),
 
 	new /datum/stack_recipe_list("comfy chairs", list(
-		new /datum/stack_recipe("beige comfy chair", /obj/structure/stool/bed/chair/comfy/beige, 2, one_per_turf = 1, on_floor = 1),
-		new /datum/stack_recipe("black comfy chair", /obj/structure/stool/bed/chair/comfy/black, 2, one_per_turf = 1, on_floor = 1),
-		new /datum/stack_recipe("brown comfy chair", /obj/structure/stool/bed/chair/comfy/brown, 2, one_per_turf = 1, on_floor = 1),
-		new /datum/stack_recipe("lime comfy chair", /obj/structure/stool/bed/chair/comfy/lime, 2, one_per_turf = 1, on_floor = 1),
-		new /datum/stack_recipe("teal comfy chair", /obj/structure/stool/bed/chair/comfy/teal, 2, one_per_turf = 1, on_floor = 1),
-		new /datum/stack_recipe("red comfy chair", /obj/structure/stool/bed/chair/comfy/red, 2, one_per_turf = 1, on_floor = 1),
-		new /datum/stack_recipe("blue comfy chair", /obj/structure/stool/bed/chair/comfy/blue, 2, one_per_turf = 1, on_floor = 1),
-		new /datum/stack_recipe("purple comfy chair", /obj/structure/stool/bed/chair/comfy/purp, 2, one_per_turf = 1, on_floor = 1),
-		new /datum/stack_recipe("green comfy chair", /obj/structure/stool/bed/chair/comfy/green, 2, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("beige comfy chair", /obj/structure/chair/comfy/beige, 2, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("black comfy chair", /obj/structure/chair/comfy/black, 2, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("brown comfy chair", /obj/structure/chair/comfy/brown, 2, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("lime comfy chair", /obj/structure/chair/comfy/lime, 2, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("teal comfy chair", /obj/structure/chair/comfy/teal, 2, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("red comfy chair", /obj/structure/chair/comfy/red, 2, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("blue comfy chair", /obj/structure/chair/comfy/blue, 2, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("purple comfy chair", /obj/structure/chair/comfy/purp, 2, one_per_turf = 1, on_floor = 1),
+		new /datum/stack_recipe("green comfy chair", /obj/structure/chair/comfy/green, 2, one_per_turf = 1, on_floor = 1),
 	)),
 
 	null,
@@ -90,6 +90,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list(
 	new /datum/stack_recipe("air alarm frame", /obj/item/mounted/frame/alarm_frame, 2),
 	new /datum/stack_recipe("fire alarm frame", /obj/item/mounted/frame/firealarm, 2),
 	new /datum/stack_recipe("intercom frame", /obj/item/mounted/frame/intercom, 2),
+	new /datum/stack_recipe("extinguisher cabinet frame", /obj/item/mounted/frame/extinguisher, 2),
 	null
 )
 
@@ -161,16 +162,15 @@ var/global/list/datum/stack_recipe/wood_recipes = list(
 	new /datum/stack_recipe("wooden sandals", /obj/item/clothing/shoes/sandal, 1),
 	new /datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20),
 	new /datum/stack_recipe("wood table frame", /obj/structure/table_frame/wood, 2, time = 10), \
-	new /datum/stack_recipe("wooden chair", /obj/structure/stool/bed/chair/wood/normal, 3, time = 10, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("wooden chair", /obj/structure/chair/wood/normal, 3, time = 10, one_per_turf = 1, on_floor = 1),
 	new /datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 50, one_per_turf = 1, on_floor = 1),
 	new /datum/stack_recipe("bookcase", /obj/structure/bookcase, 5, time = 50, one_per_turf = 1, on_floor = 1),
 	new /datum/stack_recipe("dresser", /obj/structure/dresser, 30, time = 50, one_per_turf = 1, on_floor = 1),
 	new /datum/stack_recipe("drying rack", /obj/machinery/smartfridge/drying_rack, 10, time = 15, one_per_turf = 1, on_floor = 1),
-	new /datum/stack_recipe("dog bed", /obj/structure/stool/bed/dogbed, 10, time = 10, one_per_turf = 1, on_floor = 1), \
+	new /datum/stack_recipe("dog bed", /obj/structure/bed/dogbed, 10, time = 10, one_per_turf = 1, on_floor = 1), \
 	new /datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 40),
 	new /datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = 1, on_floor = 1),
 	new /datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1),
-	new /datum/stack_recipe("easel", /obj/structure/easel, 3, one_per_turf = 1, on_floor = 1),
 	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),

code/game/objects/items/stacks/stack.dm

@@ -31,7 +31,10 @@
 
 /obj/item/stack/examine(mob/user)
 	if(..(user, 1))
-		to_chat(user, "There are [amount] [singular_name]\s in the stack.")
+		if(singular_name)
+			to_chat(user, "There are [amount] [singular_name]\s in the stack.")
+		else
+			to_chat(user, "There are [amount] [name]\s in the stack.")
 
 /obj/item/stack/attack_self(mob/user)
 	list_recipes(user)

code/game/objects/items/stacks/stack_recipe.dm

@@ -35,6 +35,14 @@
 		result.color = S.color
 	..()
 
+
+/datum/stack_recipe/dangerous
+/datum/stack_recipe/dangerous/post_build(/obj/item/stack/S, /obj/result)
+	var/turf/targ = get_turf(usr)
+	message_admins("[title] made by [key_name_admin(usr)](<A HREF='?_src_=holder;adminmoreinfo=\ref[usr]'>?</A>) in [get_area(usr)] [ADMIN_COORDJMP(targ)]!",0,1)
+	log_game("[title] made by [key_name_admin(usr)] at [get_area(usr)] [targ.x], [targ.y], [targ.z].")
+	..()
+
 /datum/stack_recipe/rods
 /datum/stack_recipe/rods/post_build(var/obj/item/stack/S, var/obj/result)
 	if(istype(result, /obj/item/stack/rods))

code/game/objects/items/stacks/tiles/tile_types.dm

@@ -39,6 +39,9 @@
 				atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 5)
 				user.visible_message("<span class='warning'>[user.name] sets the plasma tiles on fire!</span>", \
 									"<span class='warning'>You set the plasma tiles on fire!</span>")
+				message_admins("Plasma tiles ignited by [key_name_admin(user)](<A HREF='?_src_=holder;adminmoreinfo=\ref[user]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[user]'>FLW</A>) in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
+				log_game("Plasma tiles ignited by [key_name(user)] in ([x],[y],[z])")
+				investigate_log("was <font color='red'><b>ignited</b></font> by [key_name(user)]","atmos")
 				qdel(src)
 				return
 

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

@@ -6,14 +6,26 @@
 	w_class = WEIGHT_CLASS_TINY
 	var/colour = "red"
 	var/open = 0
+	var/list/lipstick_colors = list(
+		"purple" = "purple",
+		"jade" = "#216F43",
+		"lime" = "lime",
+		"black" = "black",
+		"green" = "green",
+		"blue" = "blue",
+		"white" = "white")
+
 
 /obj/item/lipstick/purple
 	name = "purple lipstick"
 	colour = "purple"
 
 /obj/item/lipstick/jade
-	//It's still called Jade, but theres no HTML color for jade, so we use lime.
 	name = "jade lipstick"
+	colour = "#216F43"
+
+/obj/item/lipstick/lime
+	name = "lime lipstick"
 	colour = "lime"
 
 /obj/item/lipstick/black
@@ -36,8 +48,9 @@
 	name = "lipstick"
 
 /obj/item/lipstick/random/New()
-	colour = pick("red","purple","lime","black","green","blue","white")
-	name = "[colour] lipstick"
+	var/lscolor = pick(lipstick_colors)//A random color is picked from the var defined initially in a new var.
+	colour = lipstick_colors[lscolor]//The color of the lipstick is pulled from the new variable (right hand side, HTML & Hex RGB)
+	name = "[lscolor] lipstick"//The new variable is also used to match the name to the color of the lipstick. Kudos to Desolate & Lemon
 
 
 /obj/item/lipstick/attack_self(mob/user as mob)

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

@@ -332,7 +332,6 @@
 					"<span class='userdanger'>[user] has touched [H.name] with [src]!</span>")
 			H.adjustStaminaLoss(50)
 			H.Weaken(5)
-			H.updatehealth() //forces health update before next life tick
 			playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
 			H.emote("gasp")
 			if(!H.undergoing_cardiac_arrest() && (prob(10) || defib.combat)) // Your heart explodes.
@@ -479,7 +478,6 @@
 					"<span class='userdanger'>[user] has touched [H.name] with [src]!</span>")
 			H.adjustStaminaLoss(50)
 			H.Weaken(5)
-			H.updatehealth() //forces health update before next life tick
 			if(!H.undergoing_cardiac_arrest() && prob(10)) // Your heart explodes.
 				H.set_heartattack(TRUE)
 			playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)

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

@@ -60,7 +60,7 @@
 	if(nadeassembly)
 		nadeassembly.attack_self(user)
 		return
-	var/newtime = input(usr, "Please set the timer.", "Timer", 10) as num
+	var/newtime = input(usr, "Please set the timer.", "Timer", det_time) as num
 	if(user.is_in_active_hand(src))
 		newtime = Clamp(newtime, 10, 60000)
 		det_time = newtime
@@ -231,3 +231,38 @@
 	CB.prime()
 
 	..()
+
+/obj/item/grenade/plastic/x4/thermite
+	name = "T4"
+	desc = "A wall breaching charge, containing fuel, metal oxide and metal powder mixed in just the right way. One hell of a combination. Effective against walls, ineffective against airlocks..."
+	det_time = 2
+	icon_state = "t4breach0"
+	item_state = "t4breach"
+
+/obj/item/grenade/plastic/x4/thermite/prime()
+	var/turf/location
+	if(target)
+		if(!QDELETED(target))
+			location = get_turf(target)
+			target.overlays -= image_overlay
+	else
+		location = get_turf(src)
+	if(location)
+		var/datum/effect_system/smoke_spread/smoke = new
+		smoke.set_up(8,0, location, aim_dir)
+		if(target && target.density)
+			var/turf/T = get_step(location, aim_dir)
+			for(var/turf/simulated/wall/W in range(1, location))
+				W.thermitemelt(speed = 30)
+			addtimer(CALLBACK(null, .proc/explosion, T, 0, 0, 2), 3)
+			addtimer(CALLBACK(smoke, /datum/effect_system/smoke_spread/.proc/start), 3)
+		else
+			addtimer(CALLBACK(null, .proc/explosion, T, 0, 0, 2), 3)
+			addtimer(CALLBACK(smoke, /datum/effect_system/smoke_spread/.proc/start), 3)
+
+
+	if(isliving(target))
+		var/mob/living/M = target
+		M.adjust_fire_stacks(2)
+		M.IgniteMob()
+	qdel(src)

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

@@ -98,8 +98,8 @@
 
 		if(usr.buckled && isobj(usr.buckled) && !usr.buckled.anchored )
 			spawn(0)
-				var/obj/structure/stool/bed/chair/C = null
-				if(istype(usr.buckled, /obj/structure/stool/bed/chair))
+				var/obj/structure/chair/C = null
+				if(istype(usr.buckled, /obj/structure/chair))
 					C = usr.buckled
 				var/obj/B = usr.buckled
 				var/movementdirection = turn(direction,180)

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

@@ -84,8 +84,7 @@
 	unwield(U)
 
 	U.swap_hand() // For whatever reason the grab will not properly work if we don't have the free hand active.
-	M.grabbedby(U, 1)
-	var/obj/item/grab/G = U.get_active_hand()
+	var/obj/item/grab/G = M.grabbedby(U, 1)
 	U.swap_hand()
 
 	if(G && istype(G))

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

@@ -135,6 +135,7 @@
 	desc = "You can use this to wrap items in."
 	icon = 'icons/obj/items.dmi'
 	icon_state = "wrap_paper"
+	singular_name = "wrapping paper"
 	flags = NOBLUDGEON
 	amount = 25
 	max_amount = 25

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

@@ -160,7 +160,7 @@
 	if(..() || !iscarbon(hit_atom))//if it gets caught or the target can't be cuffed,
 		return//abort
 	var/mob/living/carbon/C = hit_atom
-	if(!C.legcuffed)
+	if(!C.legcuffed && C.get_num_legs() >= 2)
 		visible_message("<span class='danger'>[src] ensnares [C]!</span>")
 		C.legcuffed = src
 		forceMove(C)

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

@@ -56,7 +56,6 @@
 						var/obj/item/organ/external/affecting = H.get_organ("[user.hand ? "l" : "r" ]_hand")
 						if(affecting.receive_damage( 0, 5 ))		//INFERNO
 							H.UpdateDamageIcon()
-							H.updatehealth()
 					user.visible_message("<span class='notice'>After a few attempts, [user] manages to light the [src], [user.p_they()] however burn[user.p_s()] [user.p_their()] finger in the process.</span>")
 
 			set_light(2)

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

@@ -1636,7 +1636,7 @@
                     <li>The Chief Engineer is bound to the same rules regarding the axe as Atmospheric Technicians;</li>
                     <li>The Chief Engineer is permitted to carry a telescopic baton and a flash; </li>
                     <li>The Chief Engineer is responsible for maintaining the integrity of the Gravitational Singularity Engine and/or the Supermatter Engine and/or the Tesla Engine. Neglecting this duty is grounds for termination should the Engine malfunction;</li>
-                    <li>The Chief Engineer is responsible for maintaining the integrity of the Cyberiad's Atmospherics System. Failure to maintain this integrity is grounds for termination;</li>
+                    <li>The Chief Engineer is responsible for maintaining the integrity of the station's Atmospherics System. Failure to maintain this integrity is grounds for termination;</li>
                     <li>The Chief Engineer may declare an area "Condemned", if it is damaged to the point where repairs cannot reasonably be completed within an acceptable frame of time;</li>
                     <li>The Chief Engineer is permitted to grant Building Permits to crewmembers, but must keep the Station Blueprints in a safe location at all times.</li>
 				</ol>
@@ -1652,7 +1652,7 @@
                     <li>Engineers must constantly monitor the Supermatter Engine, if it is the chosen method of power generation, if it is currently active (ie, under Emitter Fire). This is not negotiable;</li>
                     <li>Engineers must respond promptly to breaches, regardless of size. Failure to report within fifteen (15) minutes will be considered a breach of Standard Operating Procedure, unless there are no spare Engineers to report or an Atmospheric Technician has arrived on scene first. All Hazard Zones must be cordoned off with Engineering Tape, for the sake of everyone else;</li>
                     <li>Engineers are permitted to hack doors to gain unauthorized access to locations if said locations happen to require urgent repairs;</li>
-                    <li>Engineers are to maintain the integrity of the Cyberiad's Power Network. In addition, hotwiring the Gravitational Singularity Engine, Supermatter Engine or Tesla Engine is strictly forbidden;</li>
+                    <li>Engineers are to maintain the integrity of the station's Power Network. In addition, hotwiring the Gravitational Singularity Engine, Supermatter Engine or Tesla Engine is strictly forbidden;</li>
                     <li>Engineers must ensure there is at least one (1) engineering hardsuit available on the station at all times, unless there is an emergency that requires the use of all suits.</li>
 				</ol>
                 <br><br>
@@ -2063,7 +2063,7 @@
 					<li>The Security Pod Pilot is not permitted to use the Laser Module during arrests, and must switch to the Disabler Module;</li>
 					<li>The Security Pod Pilot must carry around a spare set of tools and energy cell, for their own sake;</li>
 					<li>The Security Pod Pilot may immediately, and without warning, conduct arrests on individuals attempting to perform E.V.A actions near the AI Satellite. Exception is made if the AI Unit is malfunctioning;</li>
-					<li>The Security Pod Pilot is not permitted to explore the area surrounding the station, and must therefore be confined to the immediate orbital area of the NSS Cyberiad, the NXS Klapaucius (the Telecomms Satellite) and the Mining/Research Asteroid. Exception is made if the Head of Security permits otherwise.</li>
+					<li>The Security Pod Pilot is not permitted to explore the area surrounding the station, and must therefore be confined to the immediate orbital area of the station, the NXS Klapaucius (the Telecomms Satellite) and the Mining/Research Asteroid. Exception is made if the Head of Security permits otherwise.</li>
 				</ol><BR>
 
 				<h style='color: darkblue'>Code Blue</h>
@@ -2506,11 +2506,11 @@
 					<li>The Captain is not permitted to perform regular Security Duty. However, they may still assist Security if they are understaffed, or if they see a crime being committed. However, the Captain is not permitted to take items from the Armory under normal circumstances, unless authorized by the Head of Security. In addition, the Captain may not requisition weaponry for themselves from Cargo and/or Science, unless there's an immediate threat to station and/or crew;</li>
 					<li>If a Department lacks a Head of Staff, the Captain should make reasonable efforts to appoint an Acting Head of Staff, if there are available personnel to fill the position;</li>
 					<li>The Captain is to ensure that Space Law is being correctly applied. This should be done in cooperation with the Head of Security;</li>
-					<li>The Captain is not to leave the NSS Cyberiad unless given specific permission by Central Command, or it happens to be the end of the shift. This includes via space or via the Gateway. To do so is to be considered abandoning their posts and is grounds for termination;</li>
+					<li>The Captain is not to leave the station unless given specific permission by Central Command, or it happens to be the end of the shift. This includes via space or via the Gateway. To do so is to be considered abandoning their posts and is grounds for termination;</li>
 					<li>The Captain must keep the Nuclear Authentication Disk on their person at all times or, failing that, in the possession of the Head of Security or Blueshield;</li>
 					<li>The Captain is to attempt to resolve every issue that arises in Command locally before contacting Central Command;</li>
 					<li>The Captain is not permitted to carry their Antique Laser Gun or Space Armor unless there's an immediate emergency that requires attending to;</li>
-					<li>The Captain, despite being in charge of the Cyberiad, is not independent from Nanotrasen. Any attempts to disregard general company policy are to be considered an instant condition for contract termination;</li>
+					<li>The Captain, despite being in charge of the station, is not independent from Nanotrasen. Any attempts to disregard general company policy are to be considered an instant condition for contract termination;</li>
 					<li>The Captain may only promote personnel to a Acting Head of Staff position if there is no assigned Head of Staff associated with the Department. Said Acting Head of Staff must be a member of the Department they are to lead. See below for more information on Chain of Command;</li>
                     <li>The Captain may not fire any Head of Staff without reasonable justification (ie, incompetency, criminal activity, or otherwise any action that endangers/compromises the station and/or crew). The Captain may not fire any Central Command VIPs (ie, Blueshield, Magistrate, Nanotrasen Representative) without permission from Central Command, unless they are blatantly acting against the well-being and safety of the crew and station.</li>
 				</ol><BR>
@@ -2560,4 +2560,4 @@
 				</body>
 				</html>
 
-		"}
+		"}

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

@@ -50,7 +50,6 @@
 			to_chat(H, "<span class='warning'>[src] cuts into your hand!</span>")
 			if(affecting.receive_damage(force*0.5))
 				H.UpdateDamageIcon()
-				H.updatehealth()
 
 /obj/item/shard/attackby(obj/item/I, mob/user, params)
 	if(iswelder(I))
@@ -87,7 +86,6 @@
 				H.Weaken(3)
 				if(affecting.receive_damage(5, 0))
 					H.UpdateDamageIcon()
-				H.updatehealth()
 	..()
 
 /obj/item/shard/plasma
@@ -126,4 +124,4 @@
 				to_chat(usr, "You add the newly-formed plasma glass to the stack. It now contains [NG.amount] sheets.")
 			qdel(src)
 	else
-		return ..()
+		return ..()

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

@@ -127,12 +127,48 @@
 		/obj/item/flashlight/pen,
 		/obj/item/clothing/mask/surgical,
 		/obj/item/clothing/gloves/color/latex,
-        /obj/item/reagent_containers/hypospray/autoinjector,
-        /obj/item/rad_laser,
+		/obj/item/reagent_containers/hypospray/autoinjector,
+		/obj/item/reagent_containers/hypospray/CMO,
+		/obj/item/reagent_containers/hypospray/safety,
+		/obj/item/rad_laser,
 		/obj/item/sensor_device,
 		/obj/item/wrench/medical,
 	)
 
+/obj/item/storage/belt/medical/surgery
+	max_w_class = WEIGHT_CLASS_NORMAL
+	max_combined_w_class = 17
+	use_to_pickup = 1
+	name = "Surgical Belt"
+	desc = "Can hold various surgical tools."
+	storage_slots = 9
+	use_item_overlays = 1
+	can_hold = list(
+		/obj/item/scalpel,
+		/obj/item/hemostat,
+		/obj/item/retractor,
+		/obj/item/circular_saw,
+		/obj/item/bonegel,
+		/obj/item/bonesetter,
+		/obj/item/FixOVein,
+		/obj/item/surgicaldrill,
+		/obj/item/cautery,
+	)
+
+/obj/item/storage/belt/medical/surgery/loaded
+
+/obj/item/storage/belt/medical/surgery/loaded/New()
+	..()
+	new /obj/item/scalpel(src)
+	new /obj/item/hemostat(src)
+	new /obj/item/retractor(src)
+	new /obj/item/circular_saw(src)
+	new /obj/item/bonegel(src)
+	new /obj/item/bonesetter(src)
+	new /obj/item/FixOVein(src)
+	new /obj/item/surgicaldrill(src)
+	new /obj/item/cautery(src)
+
 /obj/item/storage/belt/medical/response_team
 
 /obj/item/storage/belt/medical/response_team/New()
@@ -203,13 +239,22 @@
 
 /obj/item/storage/belt/security/response_team/New()
 	..()
-	new /obj/item/kitchen/knife/combat(src)
+	new /obj/item/reagent_containers/spray/pepper(src)
 	new /obj/item/melee/baton/loaded(src)
 	new /obj/item/flash(src)
 	new /obj/item/melee/classic_baton/telescopic(src)
 	new /obj/item/grenade/flashbang(src)
 	update_icon()
 
+/obj/item/storage/belt/security/response_team_gamma/New()
+	..()
+	new /obj/item/melee/baton/loaded(src)
+	new /obj/item/reagent_containers/spray/pepper(src)
+	new /obj/item/flash(src)
+	new /obj/item/grenade/flashbang(src)
+	new /obj/item/grenade/flashbang(src)
+	update_icon()
+	
 /obj/item/storage/belt/soulstone
 	name = "soul stone belt"
 	desc = "Designed for ease of access to the shards during a fight, as to not let a single enemy spirit slip away"

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

@@ -231,6 +231,15 @@
 	..()
 	base_name = name
 
+/obj/item/storage/pill_bottle/ert/New()
+	..()
+	new /obj/item/reagent_containers/food/pill/salicylic(src)
+	new /obj/item/reagent_containers/food/pill/salicylic(src)
+	new /obj/item/reagent_containers/food/pill/salicylic(src)
+	new /obj/item/reagent_containers/food/pill/charcoal(src)
+	new /obj/item/reagent_containers/food/pill/charcoal(src)
+	new /obj/item/reagent_containers/food/pill/charcoal(src)
+
 /obj/item/storage/pill_bottle/MouseDrop(obj/over_object as obj) //Quick pillbottle fix. -Agouri
 	if(ishuman(usr)) //Can monkeys even place items in the pocket slots? Leaving this in just in case~
 		var/mob/M = usr

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

@@ -123,3 +123,13 @@
 	new /obj/item/clothing/accessory/medal/conduct(src)
 	new /obj/item/clothing/accessory/medal/conduct(src)
 	new /obj/item/clothing/accessory/medal/gold/captain(src)
+
+/obj/item/storage/lockbox/t4
+	name = "lockbox (T4)"
+	desc = "Contains three T4 breaching charges."
+	req_access = list(access_cent_specops)
+
+/obj/item/storage/lockbox/t4/New()
+	..()
+	for(var/i = 0, i < 3, i++)
+		new /obj/item/grenade/plastic/x4/thermite(src)

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

@@ -166,7 +166,7 @@
 
 	if(display_contents_with_number)
 		for(var/datum/numbered_display/ND in display_contents)
-			ND.sample_object.mouse_opacity = 2
+			ND.sample_object.mouse_opacity = MOUSE_OPACITY_OPAQUE
 			ND.sample_object.screen_loc = "[cx]:16,[cy]:16"
 			ND.sample_object.maptext = "<font color='white'>[(ND.number > 1)? "[ND.number]" : ""]</font>"
 			ND.sample_object.layer = 20
@@ -177,7 +177,7 @@
 				cy--
 	else
 		for(var/obj/O in contents)
-			O.mouse_opacity = 2 //This is here so storage items that spawn with contents correctly have the "click around item to equip"
+			O.mouse_opacity = MOUSE_OPACITY_OPAQUE //This is here so storage items that spawn with contents correctly have the "click around item to equip"
 			O.screen_loc = "[cx]:16,[cy]:16"
 			O.maptext = ""
 			O.layer = 20
@@ -309,7 +309,7 @@
 		src.orient2hud(usr)
 		if(usr.s_active)
 			usr.s_active.show_to(usr)
-	W.mouse_opacity = 2 //So you can click on the area around the item to equip it, instead of having to pixel hunt
+	W.mouse_opacity = MOUSE_OPACITY_OPAQUE //So you can click on the area around the item to equip it, instead of having to pixel hunt
 	update_icon()
 	return 1
 
@@ -352,6 +352,10 @@
 		W.fire_act()
 	return 1
 
+/obj/item/storage/Exited(atom/A, loc)
+	remove_from_storage(A, loc) //worry not, comrade; this only gets called once
+	..()
+
 /obj/item/storage/empty_object_contents(burn, loc)
 	for(var/obj/item/Item in contents)
 		remove_from_storage(Item, loc, burn)
@@ -553,3 +557,6 @@
 		else
 			log_runtime(EXCEPTION("Non-list thing found in storage/deserialize."), src, list("Thing: [thing]"))
 	..()
+
+/obj/item/storage/AllowDrop()
+	return TRUE

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

@@ -49,9 +49,6 @@
 
 	if(front_id)
 		switch(front_id.icon_state)
-			if("id")
-				icon_state = "walletid"
-				return
 			if("silver")
 				icon_state = "walletid_silver"
 				return
@@ -61,6 +58,9 @@
 			if("centcom")
 				icon_state = "walletid_centcom"
 				return
+			else
+				icon_state = "walletid"
+				return
 	icon_state = "wallet"
 
 
@@ -124,9 +124,6 @@
 /obj/item/storage/wallet/color/update_icon()
 	if(front_id)
 		switch(front_id.icon_state)
-			if("id")
-				icon_state = "[item_color]_walletid"
-				return
 			if("silver")
 				icon_state = "[item_color]_walletid_silver"
 				return
@@ -136,6 +133,9 @@
 			if("centcom")
 				icon_state = "[item_color]_walletid_centcom"
 				return
+			else
+				icon_state = "[item_color]_walletid"
+				return
 	icon_state = "[item_color]_wallet"
 
 /obj/item/storage/wallet/color/blue

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

@@ -14,6 +14,7 @@
 	var/status = 0
 	var/obj/item/stock_parts/cell/high/bcell = null
 	var/hitcost = 1000
+	var/throw_hit_chance = 35
 
 /obj/item/melee/baton/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is putting the live [name] in [user.p_their()] mouth! It looks like [user.p_theyre()] trying to commit suicide.</span>")
@@ -28,6 +29,11 @@
 	QDEL_NULL(bcell)
 	return ..()
 
+/obj/item/melee/baton/throw_impact(atom/hit_atom)
+	..()
+	if(status && prob(throw_hit_chance))
+		baton_stun(hit_atom)
+
 /obj/item/melee/baton/loaded/New() //this one starts with a cell pre-installed.
 	..()
 	bcell = new(src)
@@ -138,15 +144,17 @@
 		if(H.check_shields(0, "[user]'s [name]", src, MELEE_ATTACK)) //No message; check_shields() handles that
 			playsound(L, 'sound/weapons/Genhit.ogg', 50, 1)
 			return
-	user.lastattacked = L
-	L.lastattacker = user
 
 	L.Stun(stunforce)
 	L.Weaken(stunforce)
 	L.apply_effect(STUTTER, stunforce)
 
-	L.visible_message("<span class='danger'>[user] has stunned [L] with [src]!</span>", \
-							"<span class='userdanger'>[user] has stunned you with [src]!</span>")
+	if(user)
+		user.lastattacked = L
+		L.lastattacker = user
+		L.visible_message("<span class='danger'>[user] has stunned [L] with [src]!</span>", \
+								"<span class='userdanger'>[user] has stunned you with [src]!</span>")
+		add_attack_logs(user, L, "stunned")
 	playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
 
 	if(isrobot(loc))
@@ -160,8 +168,6 @@
 		var/mob/living/carbon/human/H = L
 		H.forcesay(hit_appends)
 
-	add_attack_logs(user, L, "Stunned with [src]")
-
 /obj/item/melee/baton/emp_act(severity)
 	if(bcell)
 		deductcharge(1000 / severity)
@@ -193,6 +199,7 @@
 	throwforce = 5
 	stunforce = 5
 	hitcost = 2000
+	throw_hit_chance = 10
 	slot_flags = SLOT_BACK
 	var/obj/item/assembly/igniter/sparkler = null
 

code/game/objects/items/weapons/tanks/watertank.dm

@@ -315,7 +315,7 @@
 	desc = "A frozen shell of ice containing nanofrost that freezes the surrounding area after activation."
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "frozen_smoke_capsule"
-	mouse_opacity = 0
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	pass_flags = PASSTABLE
 
 /obj/effect/nanofrost_container/proc/Smoke()

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

@@ -3,6 +3,7 @@
 	desc = "A roll of sticky tape. Possibly for taping ducks... or was that ducts?"
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "taperoll"
+	singular_name = "tape roll"
 	w_class = WEIGHT_CLASS_TINY
 	amount = 10
 	max_amount = 10