Merge branch 'master' into punishesarchie

code/game/objects/structures/barsigns.dm

@@ -301,7 +301,7 @@
 
 /datum/barsign/meow_mix
 	name = "Meow Mix"
-	icon = "meow_mix"
+	icon = "meow mix"
 	desc = "No, we don't serve catnip, officer!"
 
 /datum/barsign/goose

code/game/objects/structures/beds_chairs/chair.dm

@@ -348,6 +348,43 @@
 	item_state = "stool_bar"
 	origin_type = /obj/structure/chair/stool/bar
 
+//////////////////////////
+//Alien(Disco) Stools!////
+//////////////////////////
+
+/obj/structure/chair/stool/alien
+	name = "alien stool"
+	desc = "A hard stool made of advanced alien alloy."
+	icon_state = "stoolalien"
+	icon = 'icons/obj/abductor.dmi'
+	item_chair = /obj/item/chair/stool/alien
+	buildstacktype = /obj/item/stack/sheet/mineral/abductor
+	buildstackamount = 1
+
+/obj/structure/chair/stool/bar/alien
+	name = "bronze bar stool"
+	desc = "A hard bar stool made of advanced alien alloy."
+	icon_state = "baralien"
+	icon = 'icons/obj/abductor.dmi'
+	item_chair = /obj/item/chair/stool/bar/alien
+	buildstacktype = /obj/item/stack/sheet/mineral/abductor
+	buildstackamount = 1
+
+/obj/item/chair/stool/alien
+	name = "stool"
+	icon_state = "stoolalien_toppled"
+	item_state = "stoolalien"
+	icon = 'icons/obj/abductor.dmi'
+	origin_type = /obj/structure/chair/stool/alien
+	break_chance = 0 //It's too sturdy.
+
+/obj/item/chair/stool/bar/alien
+	name = "bar stool"
+	icon_state = "baralien_toppled"
+	item_state = "baralien"
+	icon = 'icons/obj/abductor.dmi'
+	origin_type = /obj/structure/chair/stool/bar/alien
+
 //////////////////////////
 //Brass & Bronze stools!//
 //////////////////////////
@@ -449,6 +486,9 @@
 	item_chair = null
 	var/turns = 0
 
+/obj/structure/chair/brass/ComponentInitialize()
+	return //it spins with the power of ratvar, not components.
+
 /obj/structure/chair/brass/Destroy()
 	STOP_PROCESSING(SSfastprocess, src)
 	. = ..()
@@ -464,6 +504,7 @@
 	return
 
 /obj/structure/chair/brass/AltClick(mob/living/user)
+	. = ..()
 	turns = 0
 	if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
 		return
@@ -475,6 +516,7 @@
 		user.visible_message("<span class='notice'>[user] stops [src]'s uncontrollable spinning.</span>", \
 		"<span class='notice'>You grab [src] and stop its wild spinning.</span>")
 		STOP_PROCESSING(SSfastprocess, src)
+	return TRUE
 
 /obj/structure/chair/bronze
 	name = "brass chair"

code/game/objects/structures/crates_lockers/closets/job_closets.dm

@@ -103,7 +103,7 @@
 
 /obj/structure/closet/wardrobe/chaplain_black
 	name = "chapel wardrobe"
-	desc = "It's a storage unit for Nanotrasen-approved religious attire."
+	desc = "It's a storage unit for Kinaris-approved religious attire."
 	icon_door = "black"
 
 /obj/structure/closet/wardrobe/chaplain_black/PopulateContents()

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -1,6 +1,6 @@
 /obj/structure/closet/wardrobe
 	name = "wardrobe"
-	desc = "It's a storage unit for standard-issue Nanotrasen attire."
+	desc = "It's a storage unit for standard-issue Kinaris attire."
 	icon_door = "blue"
 /obj/structure/closet/wardrobe/PopulateContents()
 	..()
@@ -60,7 +60,7 @@
 	return
 /obj/structure/closet/wardrobe/orange
 	name = "prison wardrobe"
-	desc = "It's a storage unit for Nanotrasen-regulation prisoner attire."
+	desc = "It's a storage unit for Kinaris-regulation prisoner attire."
 	icon_door = "orange"
 /obj/structure/closet/wardrobe/orange/PopulateContents()
 	for(var/i in 1 to 3)

code/game/objects/structures/crates_lockers/crates.dm

@@ -79,6 +79,15 @@
 	material_drop = /obj/item/stack/sheet/mineral/wood
 	material_drop_amount = 5
 
+/obj/structure/closet/crate/coffin/examine(mob/user)
+	. = ..()
+	if(user.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER))
+		. += {"<span class='cult'>This is a coffin which you can use to regenerate your burns and other wounds faster.</span>"}
+		. += {"<span class='cult'>You can also thicken your blood if you survive the day, and hide from the sun safely while inside.</span>"}
+	/*	if(user.mind.has_antag_datum(ANTAG_DATUM_VASSAL)
+			. += {"<span class='cult'>This is a coffin which your master can use to shield himself from the unforgiving sun.\n
+			You yourself are still human and dont need it. Yet.</span>"} */
+
 /obj/structure/closet/crate/internals
 	desc = "An internals crate."
 	name = "internals crate"

code/game/objects/structures/crates_lockers/crates/bins.dm

@@ -4,6 +4,8 @@
 	icon_state = "largebins"
 	open_sound = 'sound/effects/bin_open.ogg'
 	close_sound = 'sound/effects/bin_close.ogg'
+	material_drop = /obj/item/stack/sheet/plastic
+	material_drop_amount = 40
 	anchored = TRUE
 	horizontal = FALSE
 	delivery_icon = null

code/game/objects/structures/divine.dm

@@ -39,7 +39,7 @@
 		return
 	last_process = world.time
 	to_chat(user, "<span class='notice'>The water feels warm and soothing as you touch it. The fountain immediately dries up shortly afterwards.</span>")
-	user.reagents.add_reagent("godblood",20)
+	user.reagents.add_reagent(/datum/reagent/medicine/omnizine/godblood,20)
 	update_icons()
 	addtimer(CALLBACK(src, .proc/update_icons), time_between_uses)
 
@@ -48,4 +48,4 @@
 	if(last_process + time_between_uses > world.time)
 		icon_state = "fountain"
 	else
-		icon_state = "fountain-red"
+		icon_state = "fountain-red"

code/game/objects/structures/extinguisher.dm

@@ -1,154 +1,156 @@
-/obj/structure/extinguisher_cabinet
-	name = "extinguisher cabinet"
-	desc = "A small wall mounted cabinet designed to hold a fire extinguisher."
-	icon = 'icons/obj/wallmounts.dmi'
-	icon_state = "extinguisher_closed"
-	anchored = TRUE
-	density = FALSE
-	max_integrity = 200
-	integrity_failure = 50
-	var/obj/item/extinguisher/stored_extinguisher
-	var/opened = FALSE
-
-/obj/structure/extinguisher_cabinet/Initialize(mapload, ndir, building)
-	. = ..()
-	if(building)
-		setDir(ndir)
-		pixel_x = (dir & 3)? 0 : (dir == 4 ? -27 : 27)
-		pixel_y = (dir & 3)? (dir ==1 ? -30 : 30) : 0
-		opened = TRUE
-		icon_state = "extinguisher_empty"
-	else
-		stored_extinguisher = new /obj/item/extinguisher(src)
-
-/obj/structure/extinguisher_cabinet/examine(mob/user)
-	. = ..()
-	. += "<span class='notice'>Alt-click to [opened ? "close":"open"] it.</span>"
-
-/obj/structure/extinguisher_cabinet/Destroy()
-	if(stored_extinguisher)
-		qdel(stored_extinguisher)
-		stored_extinguisher = null
-	return ..()
-
-/obj/structure/extinguisher_cabinet/contents_explosion(severity, target)
-	if(stored_extinguisher)
-		stored_extinguisher.ex_act(severity, target)
-
-/obj/structure/extinguisher_cabinet/handle_atom_del(atom/A)
-	if(A == stored_extinguisher)
-		stored_extinguisher = null
-		update_icon()
-
-/obj/structure/extinguisher_cabinet/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/wrench) && !stored_extinguisher)
-		to_chat(user, "<span class='notice'>You start unsecuring [name]...</span>")
-		I.play_tool_sound(src)
-		if(I.use_tool(src, user, 60))
-			playsound(loc, 'sound/items/deconstruct.ogg', 50, 1)
-			to_chat(user, "<span class='notice'>You unsecure [name].</span>")
-			deconstruct(TRUE)
-		return
-
-	if(iscyborg(user) || isalien(user))
-		return
-	if(istype(I, /obj/item/extinguisher))
-		if(!stored_extinguisher && opened)
-			if(!user.transferItemToLoc(I, src))
-				return
-			stored_extinguisher = I
-			to_chat(user, "<span class='notice'>You place [I] in [src].</span>")
-			update_icon()
-			return TRUE
-		else
-			toggle_cabinet(user)
-	else if(user.a_intent != INTENT_HARM)
-		toggle_cabinet(user)
-	else
-		return ..()
-
-
-/obj/structure/extinguisher_cabinet/attack_hand(mob/user)
-	. = ..()
-	if(.)
-		return
-	if(iscyborg(user) || isalien(user))
-		return
-	if(stored_extinguisher)
-		user.put_in_hands(stored_extinguisher)
-		to_chat(user, "<span class='notice'>You take [stored_extinguisher] from [src].</span>")
-		stored_extinguisher = null
-		if(!opened)
-			opened = 1
-			playsound(loc, 'sound/machines/click.ogg', 15, 1, -3)
-		update_icon()
-	else
-		toggle_cabinet(user)
-
-
-/obj/structure/extinguisher_cabinet/attack_tk(mob/user)
-	if(stored_extinguisher)
-		stored_extinguisher.forceMove(loc)
-		to_chat(user, "<span class='notice'>You telekinetically remove [stored_extinguisher] from [src].</span>")
-		stored_extinguisher = null
-		opened = 1
-		playsound(loc, 'sound/machines/click.ogg', 15, 1, -3)
-		update_icon()
-	else
-		toggle_cabinet(user)
-
-
-/obj/structure/extinguisher_cabinet/attack_paw(mob/user)
-	return attack_hand(user)
-
-/obj/structure/extinguisher_cabinet/AltClick(mob/living/user)
-	if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
-		return
-	toggle_cabinet(user)
-
-/obj/structure/extinguisher_cabinet/proc/toggle_cabinet(mob/user)
-	if(opened && broken)
-		to_chat(user, "<span class='warning'>[src] is broken open.</span>")
-	else
-		playsound(loc, 'sound/machines/click.ogg', 15, 1, -3)
-		opened = !opened
-		update_icon()
-
-/obj/structure/extinguisher_cabinet/update_icon()
-	if(!opened)
-		icon_state = "extinguisher_closed"
-		return
-	if(stored_extinguisher)
-		if(istype(stored_extinguisher, /obj/item/extinguisher/mini))
-			icon_state = "extinguisher_mini"
-		else
-			icon_state = "extinguisher_full"
-	else
-		icon_state = "extinguisher_empty"
-
-/obj/structure/extinguisher_cabinet/obj_break(damage_flag)
-	if(!broken && !(flags_1 & NODECONSTRUCT_1))
-		broken = 1
-		opened = 1
-		if(stored_extinguisher)
-			stored_extinguisher.forceMove(loc)
-			stored_extinguisher = null
-		update_icon()
-
-
-/obj/structure/extinguisher_cabinet/deconstruct(disassembled = TRUE)
-	if(!(flags_1 & NODECONSTRUCT_1))
-		if(disassembled)
-			new /obj/item/wallframe/extinguisher_cabinet(loc)
-		else
-			new /obj/item/stack/sheet/metal (loc, 2)
-		if(stored_extinguisher)
-			stored_extinguisher.forceMove(loc)
-			stored_extinguisher = null
-	qdel(src)
-
-/obj/item/wallframe/extinguisher_cabinet
-	name = "extinguisher cabinet frame"
-	desc = "Used for building wall-mounted extinguisher cabinets."
-	icon_state = "extinguisher"
-	result_path = /obj/structure/extinguisher_cabinet
+/obj/structure/extinguisher_cabinet
+	name = "extinguisher cabinet"
+	desc = "A small wall mounted cabinet designed to hold a fire extinguisher."
+	icon = 'icons/obj/wallmounts.dmi'
+	icon_state = "extinguisher_closed"
+	anchored = TRUE
+	density = FALSE
+	max_integrity = 200
+	integrity_failure = 50
+	var/obj/item/extinguisher/stored_extinguisher
+	var/opened = FALSE
+
+/obj/structure/extinguisher_cabinet/Initialize(mapload, ndir, building)
+	. = ..()
+	if(building)
+		setDir(ndir)
+		pixel_x = (dir & 3)? 0 : (dir == 4 ? -27 : 27)
+		pixel_y = (dir & 3)? (dir ==1 ? -30 : 30) : 0
+		opened = TRUE
+		icon_state = "extinguisher_empty"
+	else
+		stored_extinguisher = new /obj/item/extinguisher(src)
+
+/obj/structure/extinguisher_cabinet/examine(mob/user)
+	. = ..()
+	. += "<span class='notice'>Alt-click to [opened ? "close":"open"] it.</span>"
+
+/obj/structure/extinguisher_cabinet/Destroy()
+	if(stored_extinguisher)
+		qdel(stored_extinguisher)
+		stored_extinguisher = null
+	return ..()
+
+/obj/structure/extinguisher_cabinet/contents_explosion(severity, target)
+	if(stored_extinguisher)
+		stored_extinguisher.ex_act(severity, target)
+
+/obj/structure/extinguisher_cabinet/handle_atom_del(atom/A)
+	if(A == stored_extinguisher)
+		stored_extinguisher = null
+		update_icon()
+
+/obj/structure/extinguisher_cabinet/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/wrench) && !stored_extinguisher)
+		to_chat(user, "<span class='notice'>You start unsecuring [name]...</span>")
+		I.play_tool_sound(src)
+		if(I.use_tool(src, user, 60))
+			playsound(loc, 'sound/items/deconstruct.ogg', 50, 1)
+			to_chat(user, "<span class='notice'>You unsecure [name].</span>")
+			deconstruct(TRUE)
+		return
+
+	if(iscyborg(user) || isalien(user))
+		return
+	if(istype(I, /obj/item/extinguisher))
+		if(!stored_extinguisher && opened)
+			if(!user.transferItemToLoc(I, src))
+				return
+			stored_extinguisher = I
+			to_chat(user, "<span class='notice'>You place [I] in [src].</span>")
+			update_icon()
+			return TRUE
+		else
+			toggle_cabinet(user)
+	else if(user.a_intent != INTENT_HARM)
+		toggle_cabinet(user)
+	else
+		return ..()
+
+
+/obj/structure/extinguisher_cabinet/attack_hand(mob/user)
+	. = ..()
+	if(.)
+		return
+	if(iscyborg(user) || isalien(user))
+		return
+	if(stored_extinguisher)
+		user.put_in_hands(stored_extinguisher)
+		to_chat(user, "<span class='notice'>You take [stored_extinguisher] from [src].</span>")
+		stored_extinguisher = null
+		if(!opened)
+			opened = 1
+			playsound(loc, 'sound/machines/click.ogg', 15, 1, -3)
+		update_icon()
+	else
+		toggle_cabinet(user)
+
+
+/obj/structure/extinguisher_cabinet/attack_tk(mob/user)
+	if(stored_extinguisher)
+		stored_extinguisher.forceMove(loc)
+		to_chat(user, "<span class='notice'>You telekinetically remove [stored_extinguisher] from [src].</span>")
+		stored_extinguisher = null
+		opened = 1
+		playsound(loc, 'sound/machines/click.ogg', 15, 1, -3)
+		update_icon()
+	else
+		toggle_cabinet(user)
+
+
+/obj/structure/extinguisher_cabinet/attack_paw(mob/user)
+	return attack_hand(user)
+
+/obj/structure/extinguisher_cabinet/AltClick(mob/living/user)
+	. = ..()
+	if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
+		return
+	toggle_cabinet(user)
+	return TRUE
+
+/obj/structure/extinguisher_cabinet/proc/toggle_cabinet(mob/user)
+	if(opened && broken)
+		to_chat(user, "<span class='warning'>[src] is broken open.</span>")
+	else
+		playsound(loc, 'sound/machines/click.ogg', 15, 1, -3)
+		opened = !opened
+		update_icon()
+
+/obj/structure/extinguisher_cabinet/update_icon()
+	if(!opened)
+		icon_state = "extinguisher_closed"
+		return
+	if(stored_extinguisher)
+		if(istype(stored_extinguisher, /obj/item/extinguisher/mini))
+			icon_state = "extinguisher_mini"
+		else
+			icon_state = "extinguisher_full"
+	else
+		icon_state = "extinguisher_empty"
+
+/obj/structure/extinguisher_cabinet/obj_break(damage_flag)
+	if(!broken && !(flags_1 & NODECONSTRUCT_1))
+		broken = 1
+		opened = 1
+		if(stored_extinguisher)
+			stored_extinguisher.forceMove(loc)
+			stored_extinguisher = null
+		update_icon()
+
+
+/obj/structure/extinguisher_cabinet/deconstruct(disassembled = TRUE)
+	if(!(flags_1 & NODECONSTRUCT_1))
+		if(disassembled)
+			new /obj/item/wallframe/extinguisher_cabinet(loc)
+		else
+			new /obj/item/stack/sheet/metal (loc, 2)
+		if(stored_extinguisher)
+			stored_extinguisher.forceMove(loc)
+			stored_extinguisher = null
+	qdel(src)
+
+/obj/item/wallframe/extinguisher_cabinet
+	name = "extinguisher cabinet frame"
+	desc = "Used for building wall-mounted extinguisher cabinets."
+	icon_state = "extinguisher"
+	result_path = /obj/structure/extinguisher_cabinet

code/game/objects/structures/fluff.dm

@@ -37,7 +37,7 @@
 
 /obj/structure/fluff/empty_sleeper/nanotrasen
 	name = "broken hypersleep chamber"
-	desc = "A Nanotrasen hypersleep chamber - this one appears broken. \
+	desc = "A Kinaris hypersleep chamber - this one appears broken. \
 		There are exposed bolts for easy disassembly using a wrench."
 	icon_state = "sleeper-o"
 

code/game/objects/structures/ghost_role_spawners.dm

@@ -12,9 +12,11 @@
 	roundstart = FALSE
 	death = FALSE
 	mob_species = /datum/species/pod
-	flavour_text = "<span class='big bold'>You are a sentient ecosystem,</span><b> an example of the mastery over life that your creators possessed. Your masters, benevolent as they were, created uncounted \
-	seed vaults and spread them across the universe to every planet they could chart. You are in one such seed vault. Your goal is to cultivate and spread life wherever it will go while waiting \
-	for contact from your creators. Estimated time of last contact: Deployment, 5x10^3 millennia ago.</b>"
+	short_desc = "You are a sentient ecosystem, an example of the mastery over life that your creators possessed."
+	flavour_text = "Your masters, benevolent as they were, created uncounted seed vaults and spread them across \
+	the universe to every planet they could chart. You are in one such seed vault. \
+	Your goal is to cultivate and spread life wherever it will go while waiting for contact from your creators. \
+	Estimated time of last contact: Deployment, 5000 millennia ago."
 	assignedrole = "Lifebringer"
 
 /obj/effect/mob_spawn/human/seed_vault/special(mob/living/new_spawn)
@@ -46,9 +48,10 @@
 	anchored = FALSE
 	move_resist = MOVE_FORCE_NORMAL
 	density = FALSE
-	flavour_text = "<span class='big bold'>You are an ash walker.</span><b> Your tribe worships <span class='danger'>the Necropolis</span>. The wastes are sacred ground, its monsters a blessed bounty. \
-	You have seen lights in the distance... they foreshadow the arrival of outsiders that seek to tear apart the Necropolis and its domain. Fresh sacrifices for your nest. \
-	For what lies beyond the lights, you get the impression that going towards it is forbidden, rumors say <span class='danger'>the Necropolis</span> does not favor those who leave the sacred ground. </b>"
+	short_desc = "You are an ash walker. Your tribe worships the Necropolis."
+	flavour_text = "The wastes are sacred ground, its monsters a blessed bounty. You would never willingly leave your homeland behind. \
+	You have seen lights in the distance... they foreshadow the arrival of outsiders to your domain. However, their intentions have yet to be judged.\
+	Ensure your nest remains protected at all costs."
 	assignedrole = "Ash Walker"
 
 /obj/effect/mob_spawn/human/ash_walker/special(mob/living/new_spawn)
@@ -87,8 +90,9 @@
 	roundstart = FALSE
 	death = FALSE
 	mob_species = /datum/species/shadow
-	flavour_text = "<span class='big bold'>You are cursed.</span><b> Years ago, you sacrificed the lives of your trusted friends and the humanity of yourself to reach the Wish Granter. Though you \
-	did so, it has come at a cost: your very body rejects the light, dooming you to wander endlessly in this horrible wasteland.</b>"
+	short_desc = "You are cursed."
+	flavour_text = "Years ago, you sacrificed the lives of your trusted friends and the humanity of yourself to reach the Wish Granter. Though you \
+	did so, it has come at a cost: your very body rejects the light, dooming you to wander endlessly in this horrible wasteland."
 	assignedrole = "Exile"
 
 /obj/effect/mob_spawn/human/exile/Destroy()
@@ -125,9 +129,10 @@
 	var/has_owner = FALSE
 	var/can_transfer = TRUE //if golems can switch bodies to this new shell
 	var/mob/living/owner = null //golem's owner if it has one
-	flavour_text = "<span class='big bold'>You are a Free Golem.</span><b> Your family worships <span class='danger'>The Liberator</span>. In his infinite and divine wisdom, he set your clan free to \
+	short_desc = "You are a Free Golem. Your family worships The Liberator."
+	flavour_text = "In his infinite and divine wisdom, he set your clan free to \
 	travel the stars with a single declaration: \"Yeah go do whatever.\" Though you are bound to the one who created you, it is customary in your society to repeat those same words to newborn \
-	golems, so that no golem may ever be forced to serve again.</b>"
+	golems, so that no golem may ever be forced to serve again."
 
 /obj/effect/mob_spawn/human/golem/Initialize(mapload, datum/species/golem/species = null, mob/creator = null)
 	if(species) //spawners list uses object name to register so this goes before ..()
@@ -138,8 +143,9 @@
 	if(!mapload && A)
 		notify_ghosts("\A [initial(species.prefix)] golem shell has been completed in \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE, ignore_key = POLL_IGNORE_GOLEM)
 	if(has_owner && creator)
-		flavour_text = "<span class='big bold'>You are a Golem.</span><b> You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. \
-		Serve [creator], and assist [creator.p_them()] in completing [creator.p_their()] goals at any cost.</b>"
+		short_desc = "You are a golem."
+		flavour_text = "You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools."
+		important_info = "Serve [creator], and assist [creator.p_them()] in completing [creator.p_their()] goals at any cost."
 		owner = creator
 
 /obj/effect/mob_spawn/human/golem/special(mob/living/new_spawn, name)
@@ -154,6 +160,9 @@
 		log_admin("[key_name(new_spawn)] possessed a golem shell enslaved to [key_name(owner)].")
 	if(ishuman(new_spawn))
 		var/mob/living/carbon/human/H = new_spawn
+		if(has_owner)
+			var/datum/species/golem/G = H.dna.species
+			G.owner = owner
 		H.set_cloned_appearance()
 		if(!name)
 			if(has_owner)
@@ -209,8 +218,9 @@
 	death = FALSE
 	random = TRUE
 	mob_species = /datum/species/human
-	flavour_text = "<span class='big bold'>You've been stranded in this godless prison of a planet for longer than you can remember.</span><b> Each day you barely scrape by, and between the terrible \
-	conditions of your makeshift shelter, the hostile creatures, and the ash drakes swooping down from the cloudless skies, all you can wish for is the feel of soft grass between your toes and \
+	short_desc = "You've been stranded in this godless prison of a planet for longer than you can remember."
+	flavour_text = "Each day you barely scrape by, and between the terrible conditions of your makeshift shelter, \
+	the hostile creatures, and the ash drakes swooping down from the cloudless skies, all you can wish for is the feel of soft grass between your toes and \
 	the fresh air of Earth. These thoughts are dispelled by yet another recollection of how you got here... "
 	assignedrole = "Hermit"
 	mirrorcanloadappearance = TRUE
@@ -222,28 +232,28 @@
 		if(1)
 			flavour_text += "you were a [pick("arms dealer", "shipwright", "docking manager")]'s assistant on a small trading station several sectors from here. Raiders attacked, and there was \
 			only one pod left when you got to the escape bay. You took it and launched it alone, and the crowd of terrified faces crowding at the airlock door as your pod's engines burst to \
-			life and sent you to this hell are forever branded into your memory.</b>"
+			life and sent you to this hell are forever branded into your memory."
 			outfit.uniform = /obj/item/clothing/under/assistantformal
 			outfit.shoes = /obj/item/clothing/shoes/sneakers/black
 			outfit.back = /obj/item/storage/backpack
 		if(2)
 			flavour_text += "you're an exile from the Tiger Cooperative. Their technological fanaticism drove you to question the power and beliefs of the Exolitics, and they saw you as a \
 			heretic and subjected you to hours of horrible torture. You were hours away from execution when a high-ranking friend of yours in the Cooperative managed to secure you a pod, \
-			scrambled its destination's coordinates, and launched it. You awoke from stasis when you landed and have been surviving - barely - ever since.</b>"
+			scrambled its destination's coordinates, and launched it. You awoke from stasis when you landed and have been surviving - barely - ever since."
 			outfit.uniform = /obj/item/clothing/under/rank/prisoner
 			outfit.shoes = /obj/item/clothing/shoes/sneakers/orange
 			outfit.back = /obj/item/storage/backpack
 		if(3)
 			flavour_text += "you were a doctor on one of Nanotrasen's space stations, but you left behind that damn corporation's tyranny and everything it stood for. From a metaphorical hell \
-			to a literal one, you find yourself nonetheless missing the recycled air and warm floors of what you left behind... but you'd still rather be here than there.</b>"
+			to a literal one, you find yourself nonetheless missing the recycled air and warm floors of what you left behind... but you'd still rather be here than there."
 			outfit.uniform = /obj/item/clothing/under/rank/medical
 			outfit.suit = /obj/item/clothing/suit/toggle/labcoat
 			outfit.back = /obj/item/storage/backpack/medic
 			outfit.shoes = /obj/item/clothing/shoes/sneakers/black
 		if(4)
-			flavour_text += "you were always joked about by your friends for \"not playing with a full deck\", as they so <i>kindly</i> put it. It seems that they were right when you, on a tour \
+			flavour_text += "you were always joked about by your friends for \"not playing with a full deck\", as they so kindly put it. It seems that they were right when you, on a tour \
 			at one of Nanotrasen's state-of-the-art research facilities, were in one of the escape pods alone and saw the red button. It was big and shiny, and it caught your eye. You pressed \
-			it, and after a terrifying and fast ride for days, you landed here. You've had time to wisen up since then, and you think that your old friends wouldn't be laughing now.</b>"
+			it, and after a terrifying and fast ride for days, you landed here. You've had time to wisen up since then, and you think that your old friends wouldn't be laughing now."
 			outfit.uniform = /obj/item/clothing/under/color/grey/glorf
 			outfit.shoes = /obj/item/clothing/shoes/sneakers/black
 			outfit.back = /obj/item/storage/backpack
@@ -258,9 +268,10 @@
 	desc = "A small sleeper typically used to instantly restore minor wounds. This one seems broken, and its occupant is comatose."
 	job_description = "Lavaland Veterinarian"
 	mob_name = "a translocated vet"
-	flavour_text = "<span class='big bold'>What...?</span><b> Where are you? Where are the others? This is still the animal hospital - you should know, you've been an intern here for weeks - but \
-	everyone's gone. One of the cats scratched you just a few minutes ago. That's why you were in the pod - to heal the scratch. The scabs are still fresh; you see them right now. So where is \
-	everyone? Where did they go? What happened to the hospital? And is that <i>smoke</i> you smell? You need to find someone else. Maybe they can tell you what happened.</b>"
+	short_desc = "You are an animal doctor who just woke up in lavaland"
+	flavour_text = "What...? Where are you? Where are the others? This is still the animal hospital - you should know, you've been an intern here for weeks - but \
+	you see them right now. So where is \
+	everyone? Where did they go? What happened to the hospital? And is that smoke you smell? You need to find someone else. Maybe everyone's gone. One of the cats scratched you just a few minutes ago. That's why you were in the pod - to heal the scratch. The scabs are still fresh; and tell you what happened."
 	assignedrole = "Translocated Vet"
 	mirrorcanloadappearance = TRUE
 
@@ -280,8 +291,9 @@
 	outfit = /datum/outfit/lavalandprisoner
 	roundstart = FALSE
 	death = FALSE
-	flavour_text = "<b>Good. It seems as though your ship crashed. <span class='big bold'>You're a prisoner,</span> sentenced to hard work in one of Nanotrasen's labor camps, but it seems as \
-	though fate has other plans for you. You remember that you were convicted of "
+	short_desc = "You're a prisoner, sentenced to hard work in one of Nanotrasen's labor camps, but it seems as \
+	though fate has other plans for you."
+	flavour_text = "Good. It seems as though your ship crashed. You remember that you were convicted of "
 	assignedrole = "Escaped Prisoner"
 
 /obj/effect/mob_spawn/human/prisoner_transport/special(mob/living/L)
@@ -293,7 +305,7 @@
 	var/list/crimes = list("murder", "larceny", "embezzlement", "unionization", "dereliction of duty", "kidnapping", "gross incompetence", "grand theft", "collaboration with the Syndicate", \
 	"worship of a forbidden deity", "interspecies relations", "mutiny")
 	flavour_text += "[pick(crimes)]. but regardless of that, it seems like your crime doesn't matter now. You don't know where you are, but you know that it's out to kill you, and you're not going \
-	to lose this opportunity. Find a way to get out of this mess and back to where you rightfully belong - your [pick("house", "apartment", "spaceship", "station")]</b>."
+	to lose this opportunity. Find a way to get out of this mess and back to where you rightfully belong - your [pick("house", "apartment", "spaceship", "station")]."
 
 /datum/outfit/lavalandprisoner
 	name = "Lavaland Prisoner"
@@ -320,8 +332,9 @@
 	roundstart = FALSE
 	random = TRUE
 	outfit = /datum/outfit/hotelstaff
-	flavour_text = "<span class='big bold'>You are a staff member of a top-of-the-line space hotel!</span><b> Cater to guests and <font size=6><b>DON'T</b></font> leave the hotel, lest the manager fire you for\
-		dereliction of duty!</b>"
+	short_desc = "You are a staff member of a top-of-the-line space hotel!"
+	flavour_text = "You are a staff member of a top-of-the-line space hotel! Cater to guests and make sure the manager doesn't fire you."
+	important_info = "DON'T leave the hotel"
 	assignedrole = "Hotel Staff"
 	mirrorcanloadappearance = TRUE
 
@@ -338,8 +351,10 @@
 	mob_name = "hotel security member"
 	job_description = "Hotel Security"
 	outfit = /datum/outfit/hotelstaff/security
-	flavour_text = "<span class='big bold'>You are a peacekeeper</span><b> assigned to this hotel to protect the interests of the company while keeping the peace between \
-		guests and the staff. Do <font size=6>NOT</font> leave the hotel, as that is grounds for contract termination.</b>"
+	short_desc = "You are a peacekeeper."
+	flavour_text = "You have been assigned to this hotel to protect the interests of the company while keeping the peace between \
+		guests and the staff."
+	important_info = "Do NOT leave the hotel, as that is grounds for contract termination."
 	objectives = "Do not leave your assigned hotel. Try and keep the peace between staff and guests, non-lethal force heavily advised if possible."
 	mirrorcanloadappearance = TRUE
 
@@ -376,7 +391,8 @@
 /obj/effect/mob_spawn/human/demonic_friend/Initialize(mapload, datum/mind/owner_mind, obj/effect/proc_holder/spell/targeted/summon_friend/summoning_spell)
 	. = ..()
 	owner = owner_mind
-	flavour_text = "<span class='big bold'>You have been given a reprieve from your eternity of torment, to be [owner.name]'s friend for [owner.p_their()] short mortal coil.</span><b> Be aware that if you do not live up to [owner.name]'s expectations, they can send you back to hell with a single thought.  [owner.name]'s death will also return you to hell.</b>"
+	flavour_text = "You have been given a reprieve from your eternity of torment, to be [owner.name]'s friend for [owner.p_their()] short mortal coil."
+	important_info = "Be aware that if you do not live up to [owner.name]'s expectations, they can send you back to hell with a single thought. [owner.name]'s death will also return you to hell."
 	var/area/A = get_area(src)
 	if(!mapload && A)
 		notify_ghosts("\A friendship shell has been completed in \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE)
@@ -434,9 +450,9 @@
 
 /obj/effect/mob_spawn/human/syndicate/battlecruiser
 	name = "Syndicate Battlecruiser Ship Operative"
-	flavour_text = "<span class='big bold'>You are a crewmember aboard the syndicate flagship: the SBC Starfury.</span><span class='big'> <span class='danger'><b>Your job is to follow your captain's orders, maintain the ship, and keep the engine running.</b></span> If you are not familiar with how the supermatter engine functions: <b>do not attempt to start it.</b><br>\
-	<br>\
-	<span class='danger'><b>The armory is not a candy store, and your role is not to assault the station directly, leave that work to the assault operatives.</b></span></font>"
+	short_desc = "You are a crewmember aboard the syndicate flagship: the SBC Starfury."
+	flavour_text = "Your job is to follow your captain's orders, maintain the ship, and keep the engine running. If you are not familiar with how the supermatter engine functions: do not attempt to start it."
+	important_info = "The armory is not a candy store, and your role is not to assault the station directly, leave that work to the assault operatives."
 	outfit = /datum/outfit/syndicate_empty/SBC
 	mirrorcanloadappearance = TRUE
 
@@ -447,10 +463,9 @@
 	belt = /obj/item/storage/belt/military/assault
 
 /obj/effect/mob_spawn/human/syndicate/battlecruiser/assault
-	name = "Syndicate Battlecruiser Assault Operative"
-	flavour_text = "<span class='big bold'>You are an assault operative aboard the syndicate flagship: the SBC Starfury.</span><span class='big'> <span class='danger'><b>Your job is to follow your captain's orders, keep intruders out of the ship, and assault Space Station 13.</b></span> There is an armory, multiple assault ships, and beam cannons to attack the station with.<br>\
-	<br>\
-	<span class='danger'><b>Work as a team with your fellow operatives and work out a plan of attack. If you are overwhelmed, escape back to your ship!</b></span></span>"
+	short_desc = "You are an assault operative aboard the syndicate flagship: the SBC Starfury."
+	flavour_text = "Your job is to follow your captain's orders, keep intruders out of the ship, and assault Space Station 13. There is an armory, multiple assault ships, and beam cannons to attack the station with."
+	important_info = "Work as a team with your fellow operatives and work out a plan of attack. If you are overwhelmed, escape back to your ship!"
 	outfit = /datum/outfit/syndicate_empty/SBC/assault
 	mirrorcanloadappearance = TRUE
 
@@ -467,9 +482,9 @@
 
 /obj/effect/mob_spawn/human/syndicate/battlecruiser/captain
 	name = "Syndicate Battlecruiser Captain"
-	flavour_text = "<span class='big bold'>You are the captain aboard the syndicate flagship: the SBC Starfury.</span><span class='big'> <span class='danger'><b>Your job is to oversee your crew, defend the ship, and destroy Space Station 13.</b></span> The ship has an armory, multiple ships, beam cannons, and multiple crewmembers to accomplish this goal.<br>\
-	<br>\
-	<span class='danger'><b>As the captain, this whole operation falls on your shoulders.</b></span> You do not need to nuke the station, causing sufficient damage and preventing your ship from being destroyed will be enough.</span>"
+	short_desc = "You are the captain aboard the syndicate flagship: the SBC Starfury."
+	flavour_text = "Your job is to oversee your crew, defend the ship, and destroy Space Station 13. The ship has an armory, multiple ships, beam cannons, and multiple crewmembers to accomplish this goal."
+	important_info = "As the captain, this whole operation falls on your shoulders. You do not need to nuke the station, causing sufficient damage and preventing your ship from being destroyed will be enough."
 	outfit = /datum/outfit/syndicate_empty/SBC/assault/captain
 	id_access_list = list(150,151)
 	mirrorcanloadappearance = TRUE
@@ -496,10 +511,11 @@
 	death = FALSE
 	random = TRUE
 	mob_species = /datum/species/human
-	flavour_text = "<span class='big bold'>You are a security officer working for Nanotrasen,</span><b> stationed onboard a state of the art research station. You vaguely recall rushing into a \
-	cryogenics pod due to an oncoming radiation storm. The last thing you remember is the station's Artificial Program telling you that you would only be asleep for eight hours. As you open \
-	your eyes, everything seems rusted and broken, a dark feeling swells in your gut as you climb out of your pod. \
-	Work as a team with your fellow survivors and do not abandon them.</b>"
+	short_desc = "You are a security officer working for Nanotrasen, stationed onboard a state of the art research station."
+	flavour_text = "You vaguely recall rushing into a cryogenics pod due to an oncoming radiation storm. \
+	The last thing you remember is the station's Artificial Program telling you that you would only be asleep for eight hours. As you open \
+	your eyes, everything seems rusted and broken, a dark feeling swells in your gut as you climb out of your pod."
+	important_info = "Work as a team with your fellow survivors and do not abandon them."
 	uniform = /obj/item/clothing/under/rank/security
 	shoes = /obj/item/clothing/shoes/jackboots
 	id = /obj/item/card/id/away/old/sec
@@ -524,10 +540,11 @@
 	death = FALSE
 	random = TRUE
 	mob_species = /datum/species/human
-	flavour_text = "<span class='big bold'>You are an engineer working for Nanotrasen,</span><b> stationed onboard a state of the art research station. You vaguely recall rushing into a \
-	cryogenics pod due to an oncoming radiation storm. The last thing you remember is the station's Artificial Program telling you that you would only be asleep for eight hours. As you open \
-	your eyes, everything seems rusted and broken, a dark feeling swells in your gut as you climb out of your pod. \
-	Work as a team with your fellow survivors and do not abandon them.</b>"
+	short_desc = "You are an engineer working for Nanotrasen, stationed onboard a state of the art research station."
+	flavour_text = "You vaguely recall rushing into a cryogenics pod due to an oncoming radiation storm. The last thing \
+	you remember is the station's Artificial Program telling you that you would only be asleep for eight hours. As you open \
+	your eyes, everything seems rusted and broken, a dark feeling swells in your gut as you climb out of your pod."
+	important_info = "Work as a team with your fellow survivors and do not abandon them."
 	uniform = /obj/item/clothing/under/rank/engineer
 	shoes = /obj/item/clothing/shoes/workboots
 	id = /obj/item/card/id/away/old/eng
@@ -550,10 +567,11 @@
 	death = FALSE
 	random = TRUE
 	mob_species = /datum/species/human
-	flavour_text = "<span class='big bold'>You are a scientist working for Nanotrasen,</span><b> stationed onboard a state of the art research station. You vaguely recall rushing into a \
-	cryogenics pod due to an oncoming radiation storm. The last thing you remember is the station's Artificial Program telling you that you would only be asleep for eight hours. As you open \
-	your eyes, everything seems rusted and broken, a dark feeling swells in your gut as you climb out of your pod. \
-	Work as a team with your fellow survivors and do not abandon them.</b>"
+	short_desc = "You are a scientist working for Nanotrasen, stationed onboard a state of the art research station."
+	flavour_text = "You vaguely recall rushing into a cryogenics pod due to an oncoming radiation storm. \
+	The last thing you remember is the station's Artificial Program telling you that you would only be asleep for eight hours. As you open \
+	your eyes, everything seems rusted and broken, a dark feeling swells in your gut as you climb out of your pod."
+	important_info = "Work as a team with your fellow survivors and do not abandon them."
 	uniform = /obj/item/clothing/under/rank/scientist
 	shoes = /obj/item/clothing/shoes/laceup
 	id = /obj/item/card/id/away/old/sci
@@ -581,7 +599,8 @@
 	anchored = TRUE
 	density = FALSE
 	show_flavour = FALSE //Flavour only exists for spawners menu
-	flavour_text = "<span class='big bold'>You are a space pirate.</span><b> The station refused to pay for your protection, protect the ship, siphon the credits from the station and raid it for even more loot.</b>"
+	short_desc = "You are a space pirate."
+	flavour_text = "The station refused to pay for your protection, protect the ship, siphon the credits from the station and raid it for even more loot."
 	assignedrole = "Space Pirate"
 	var/rank = "Mate"
 

code/game/objects/structures/loom.dm

@@ -1,21 +1,44 @@
-//Loom, turns raw cotton and durathread into their respective fabrics.
-
-/obj/structure/loom
-	name = "loom"
-	desc = "A simple device used to weave cloth and other thread-based fabrics together into usable material."
-	icon = 'icons/obj/hydroponics/equipment.dmi'
-	icon_state = "loom"
-	density = TRUE
-	anchored = TRUE
-
-/obj/structure/loom/attackby(obj/item/stack/sheet/W, mob/user)
-	if(W.is_fabric && W.amount > 1)
-		user.show_message("<span class='notice'>You start weaving the [W.name] through the loom..</span>", 1)
-		if(W.use_tool(src, user, W.pull_effort))
-			new W.loom_result(drop_location())
-			user.show_message("<span class='notice'>You weave the [W.name] into a workable fabric.</span>", 1)
-			W.amount = (W.amount - 2)
-			if(W.amount < 1)
-				qdel(W)
-	else
-		user.show_message("<span class='notice'>You need a valid fabric and at least 2 of said fabric before using this.</span>", 1)
+#define FABRIC_PER_SHEET 4
+
+
+///This is a loom. It's usually made out of wood and used to weave fabric like durathread or cotton into their respective cloth types.
+/obj/structure/loom
+	name = "loom"
+	desc = "A simple device used to weave cloth and other thread-based fabrics together into usable material."
+	icon = 'icons/obj/hydroponics/equipment.dmi'
+	icon_state = "loom"
+	density = TRUE
+	anchored = TRUE
+
+/obj/structure/loom/attackby(obj/item/I, mob/user)
+	if(weave(I, user))
+		return
+	return ..()
+
+/obj/structure/loom/wrench_act(mob/living/user, obj/item/I)
+	..()
+	default_unfasten_wrench(user, I, 5)
+	return TRUE
+
+///Handles the weaving.
+/obj/structure/loom/proc/weave(obj/item/stack/sheet/S, mob/user)
+	if(!istype(S) || !S.is_fabric)
+		return FALSE
+	if(!anchored)
+		user.show_message("<span class='notice'>The loom needs to be wrenched down.</span>", 1)
+		return FALSE
+	if(S.amount < FABRIC_PER_SHEET)
+		user.show_message("<span class='notice'>You need at least [FABRIC_PER_SHEET] units of fabric before using this.</span>", 1)
+		return FALSE
+	user.show_message("<span class='notice'>You start weaving \the [S.name] through the loom..</span>", 1)
+	if(S.use_tool(src, user, S.pull_effort))
+		if(S.amount >= FABRIC_PER_SHEET)
+			new S.loom_result(drop_location())
+			S.use(FABRIC_PER_SHEET)
+			user.show_message("<span class='notice'>You weave \the [S.name] into a workable fabric.</span>", 1)
+	return TRUE
+
+/obj/structure/loom/unanchored
+	anchored = FALSE
+
+#undef FABRIC_PER_SHEET

code/game/objects/structures/mirror.dm

@@ -133,7 +133,7 @@
 
 	switch(choice)
 		if("name")
-			var/newname = copytext(sanitize(input(H, "Who are we again?", "Name change", H.name) as null|text),1,MAX_NAME_LEN)
+			var/newname = reject_bad_name(stripped_input(H, "Who are we again?", "Name change", H.name, MAX_NAME_LEN), TRUE)
 
 			if(!newname)
 				return

code/game/objects/structures/morgue.dm

@@ -1,444 +1,445 @@
-/* Morgue stuff
- * Contains:
- *		Morgue
- *		Morgue tray
- *		Crematorium
- *		Creamatorium
- *		Crematorium tray
- *		Crematorium button
- */
-
-/*
- * Bodycontainer
- * Parent class for morgue and crematorium
- * For overriding only
- */
-GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants and other ghosties.
-
-/obj/structure/bodycontainer
-	icon = 'icons/obj/stationobjs.dmi'
-	icon_state = "morgue1"
-	density = TRUE
-	anchored = TRUE
-	max_integrity = 400
-
-	var/obj/structure/tray/connected = null
-	var/locked = FALSE
-	dir = SOUTH
-	var/message_cooldown
-	var/breakout_time = 600
-	var/obj/item/radio/radio = null
-	var/hasradio = FALSE
-
-/obj/structure/bodycontainer/Initialize()
-	. = ..()
-	GLOB.bodycontainers += src
-	recursive_organ_check(src)
-
-/obj/structure/bodycontainer/Destroy()
-	GLOB.bodycontainers -= src
-	open()
-	if(connected)
-		qdel(connected)
-		connected = null
-	return ..()
-
-/obj/structure/bodycontainer/on_log(login)
-	..()
-	update_icon()
-
-/obj/structure/bodycontainer/update_icon()
-	return
-
-/obj/structure/bodycontainer/relaymove(mob/user)
-	if(user.stat || !isturf(loc))
-		return
-	if(locked)
-		if(message_cooldown <= world.time)
-			message_cooldown = world.time + 50
-			to_chat(user, "<span class='warning'>[src]'s door won't budge!</span>")
-		return
-	open()
-
-/obj/structure/bodycontainer/attack_paw(mob/user)
-	return attack_hand(user)
-
-/obj/structure/bodycontainer/attack_hand(mob/user)
-	. = ..()
-	if(.)
-		return
-	if(locked)
-		to_chat(user, "<span class='danger'>It's locked.</span>")
-		return
-	if(!connected)
-		to_chat(user, "That doesn't appear to have a tray.")
-		return
-	if(connected.loc == src)
-		open()
-	else
-		close()
-	add_fingerprint(user)
-
-/obj/structure/bodycontainer/attack_robot(mob/user)
-	if(!user.Adjacent(src))
-		return
-	return attack_hand(user)
-
-/obj/structure/bodycontainer/attackby(obj/P, mob/user, params)
-	add_fingerprint(user)
-	if(istype(P, /obj/item/pen))
-		if(!user.is_literate())
-			to_chat(user, "<span class='notice'>You scribble illegibly on the side of [src]!</span>")
-			return
-		var/t = stripped_input(user, "What would you like the label to be?", text("[]", name), null)
-		if (user.get_active_held_item() != P)
-			return
-		if(!user.canUseTopic(src, BE_CLOSE))
-			return
-		if (t)
-			name = text("[]- '[]'", initial(name), t)
-		else
-			name = initial(name)
-	else
-		return ..()
-
-/obj/structure/bodycontainer/deconstruct(disassembled = TRUE)
-	new /obj/item/stack/sheet/metal (loc, 5)
-	recursive_organ_check(src)
-	qdel(src)
-
-/obj/structure/bodycontainer/container_resist(mob/living/user)
-	if(!locked)
-		open()
-		return
-	user.changeNext_move(CLICK_CD_BREAKOUT)
-	user.last_special = world.time + CLICK_CD_BREAKOUT
-	user.visible_message(null, \
-		"<span class='notice'>You lean on the back of [src] and start pushing the tray open... (this will take about [DisplayTimeText(breakout_time)].)</span>", \
-		"<span class='italics'>You hear a metallic creaking from [src].</span>")
-	if(do_after(user,(breakout_time), target = src))
-		if(!user || user.stat != CONSCIOUS || user.loc != src )
-			return
-		user.visible_message("<span class='warning'>[user] successfully broke out of [src]!</span>", \
-			"<span class='notice'>You successfully break out of [src]!</span>")
-		open()
-
-/obj/structure/bodycontainer/proc/open()
-	recursive_organ_check(src)
-	playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)
-	playsound(src, 'sound/effects/roll.ogg', 5, 1)
-	var/turf/T = get_step(src, dir)
-	connected.setDir(dir)
-	for(var/atom/movable/AM in src)
-		if(AM != radio)
-			AM.forceMove(T)
-	update_icon()
-
-/obj/structure/bodycontainer/proc/close()
-	playsound(src, 'sound/effects/roll.ogg', 5, 1)
-	playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)
-	for(var/atom/movable/AM in connected.loc)
-		if(!AM.anchored || AM == connected)
-			AM.forceMove(src)
-	recursive_organ_check(src)
-	update_icon()
-
-/obj/structure/bodycontainer/get_remote_view_fullscreens(mob/user)
-	if(user.stat == DEAD || !(user.sight & (SEEOBJS|SEEMOBS)))
-		user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 2)
-/*
- * Morgue
- */
-/obj/structure/bodycontainer/morgue
-	name = "morgue"
-	desc = "Used to keep bodies in until someone fetches them. Now includes a high-tech alert system."
-	icon_state = "morgue1"
-	dir = EAST
-	var/beeper = TRUE
-	var/beep_cooldown = 50
-	var/next_beep = 0
-	//Hyperstation edit
-	var/radio_key = /obj/item/encryptionkey/headset_med
-	var/medical_channel = "Medical"
-	var/inuse = FALSE
-	hasradio = TRUE
-
-/obj/structure/bodycontainer/morgue/Initialize()
-	. = ..()
-	radio = new(src)
-	radio.anchored = TRUE
-	radio.keyslot = new radio_key
-	radio.listening = 0
-	radio.recalculateChannels()
-
-/obj/structure/bodycontainer/morgue/Destroy()
-	QDEL_NULL(radio)
-	GLOB.bodycontainers -= src
-	open()
-	if(connected)
-		qdel(connected)
-		connected = null
-	return ..()
-/*
-/obj/structure/bodycontainer/morgue/proc/open2()
-	recursive_organ_check(src)
-	playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)
-	playsound(src, 'sound/effects/roll.ogg', 5, 1)
-	var/turf/T = get_step(src, dir)
-	connected.setDir(dir)
-	for(var/atom/movable/AM in src)
-		if(AM != radio)
-			AM.forceMove(T)
-	update_icon()
-*/
-//end of edit
-/obj/structure/bodycontainer/morgue/New()
-	connected = new/obj/structure/tray/m_tray(src)
-	connected.connected = src
-	..()
-
-/obj/structure/bodycontainer/morgue/examine(mob/user)
-	. = ..()
-	. += "<span class='notice'>The speaker is [beeper ? "enabled" : "disabled"]. Alt-click to toggle it.</span>"
-
-/obj/structure/bodycontainer/morgue/AltClick(mob/user)
-	..()
-	if(!user.canUseTopic(src, !issilicon(user)))
-		return
-	beeper = !beeper
-	to_chat(user, "<span class='notice'>You turn the speaker function [beeper ? "on" : "off"].</span>")
-
-/obj/structure/bodycontainer/morgue/update_icon()
-	if (!connected || connected.loc != src) // Open or tray is gone.
-		icon_state = "morgue0"
-	else
-		if(contents.len == 2)  // Empty. Was length 1 because of the tray, is now length 2 because it includes a radio.
-			icon_state = "morgue1"
-		else
-			icon_state = "morgue2" // Dead, brainded mob.
-			var/list/compiled = recursive_mob_check(src, 0, 0) // Search for mobs in all contents.
-			if(!length(compiled)) // No mobs?
-				icon_state = "morgue3"
-				return
-
-			for(var/mob/living/M in compiled)
-				var/mob/living/mob_occupant = get_mob_or_brainmob(M)
-				if(mob_occupant.client && !mob_occupant.suiciding && !(HAS_TRAIT(mob_occupant, TRAIT_NOCLONE)) && !mob_occupant.hellbound)
-					icon_state = "morgue4" // Cloneable
-					if(mob_occupant.stat == DEAD && beeper)
-						if(world.time > next_beep)
-							playsound(src, 'sound/weapons/smg_empty_alarm.ogg', 50, 0) //Clone them you blind fucks
-							next_beep = world.time + beep_cooldown
-					break
-
-
-/obj/item/paper/guides/jobs/medical/morgue
-	name = "morgue memo"
-	info = "<font size='2'>Since this station's medbay never seems to fail to be staffed by the mindless monkeys meant for genetics experiments, I'm leaving a reminder here for anyone handling the pile of cadavers the quacks are sure to leave.</font><BR><BR><font size='4'><font color=red>Red lights mean there's a plain ol' dead body inside.</font><BR><BR><font color=orange>Yellow lights mean there's non-body objects inside.</font><BR><font size='2'>Probably stuff pried off a corpse someone grabbed, or if you're lucky it's stashed booze.</font><BR><BR><font color=green>Green lights mean the morgue system detects the body may be able to be cloned.</font></font><BR><font size='2'>I don't know how that works, but keep it away from the kitchen and go yell at the geneticists.</font><BR><BR>- CentCom medical inspector"
-
-/*
- * Crematorium
- */
-GLOBAL_LIST_EMPTY(crematoriums)
-/obj/structure/bodycontainer/crematorium
-	name = "crematorium"
-	desc = "A human incinerator. Works well on barbecue nights."
-	icon_state = "crema1"
-	dir = SOUTH
-	var/id = 1
-
-/obj/structure/bodycontainer/crematorium/attack_robot(mob/user) //Borgs can't use crematoriums without help
-	to_chat(user, "<span class='warning'>[src] is locked against you.</span>")
-	return
-
-/obj/structure/bodycontainer/crematorium/Destroy()
-	GLOB.crematoriums.Remove(src)
-	return ..()
-
-/obj/structure/bodycontainer/crematorium/New()
-	connected = new/obj/structure/tray/c_tray(src)
-	connected.connected = src
-
-	GLOB.crematoriums.Add(src)
-	..()
-
-/obj/structure/bodycontainer/crematorium/update_icon()
-	if(!connected || connected.loc != src)
-		icon_state = "crema0"
-	else
-
-		if(src.contents.len > 1)
-			src.icon_state = "crema2"
-		else
-			src.icon_state = "crema1"
-
-		if(locked)
-			src.icon_state = "crema_active"
-
-	return
-
-/obj/structure/bodycontainer/crematorium/proc/cremate(mob/user)
-	if(locked)
-		return //don't let you cremate something twice or w/e
-	// Make sure we don't delete the actual morgue and its tray
-	var/list/conts = GetAllContents() - src - connected
-
-	if(!conts.len)
-		audible_message("<span class='italics'>You hear a hollow crackle.</span>")
-		return
-
-	else
-		audible_message("<span class='italics'>You hear a roar as the crematorium activates.</span>")
-
-		locked = TRUE
-		update_icon()
-
-		for(var/mob/living/M in conts)
-			if (M.stat != DEAD)
-				M.emote("scream")
-			if(user)
-				log_combat(user, M, "cremated")
-			else
-				M.log_message("was cremated", LOG_ATTACK)
-
-			M.death(1)
-			if(M) //some animals get automatically deleted on death.
-				M.ghostize()
-				qdel(M)
-
-		for(var/obj/O in conts) //conts defined above, ignores crematorium and tray
-			qdel(O)
-
-		if(!locate(/obj/effect/decal/cleanable/ash) in get_step(src, dir))//prevent pile-up
-			new/obj/effect/decal/cleanable/ash/crematorium(src)
-
-		sleep(30)
-
-		if(!QDELETED(src))
-			locked = FALSE
-			update_icon()
-			playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) //you horrible people
-
-/obj/structure/bodycontainer/crematorium/creamatorium
-	name = "creamatorium"
-	desc = "A human incinerator. Works well during ice cream socials."
-
-/obj/structure/bodycontainer/crematorium/creamatorium/cremate(mob/user)
-	var/list/icecreams = new()
-	for(var/mob/living/i_scream in GetAllContents())
-		var/obj/item/reagent_containers/food/snacks/icecream/IC = new()
-		IC.set_cone_type("waffle")
-		IC.add_mob_flavor(i_scream)
-		icecreams += IC
-	. = ..()
-	for(var/obj/IC in icecreams)
-		IC.forceMove(src)
-
-/*
- * Generic Tray
- * Parent class for morguetray and crematoriumtray
- * For overriding only
- */
-/obj/structure/tray
-	icon = 'icons/obj/stationobjs.dmi'
-	density = TRUE
-	layer = BELOW_OBJ_LAYER
-	var/obj/structure/bodycontainer/connected = null
-	anchored = TRUE
-	pass_flags = LETPASSTHROW
-	max_integrity = 350
-
-/obj/structure/tray/Destroy()
-	if(connected)
-		connected.connected = null
-		connected.update_icon()
-		connected = null
-	return ..()
-
-/obj/structure/tray/deconstruct(disassembled = TRUE)
-	new /obj/item/stack/sheet/metal (loc, 2)
-	qdel(src)
-
-/obj/structure/tray/attack_paw(mob/user)
-	return attack_hand(user)
-
-/obj/structure/tray/attack_hand(mob/user)
-	. = ..()
-	if(.)
-		return
-	if (src.connected)
-		connected.close()
-		add_fingerprint(user)
-	else
-		to_chat(user, "<span class='warning'>That's not connected to anything!</span>")
-
-/obj/structure/tray/MouseDrop_T(atom/movable/O as mob|obj, mob/user)
-	if(!ismovableatom(O) || O.anchored || !Adjacent(user) || !user.Adjacent(O) || O.loc == user)
-		return
-	if(!ismob(O))
-		if(!istype(O, /obj/structure/closet/body_bag))
-			return
-	else
-		var/mob/M = O
-		if(M.buckled)
-			return
-	if(!ismob(user) || user.lying || user.incapacitated())
-		return
-	O.forceMove(src.loc)
-	if (user != O)
-		visible_message("<span class='warning'>[user] stuffs [O] into [src].</span>")
-	return
-
-/*
- * Crematorium tray
- */
-/obj/structure/tray/c_tray
-	name = "crematorium tray"
-	desc = "Apply body before burning."
-	icon_state = "cremat"
-
-/*
- * Morgue tray
- */
-/obj/structure/tray/m_tray
-	name = "morgue tray"
-	desc = "Apply corpse before closing."
-	icon_state = "morguet"
-
-/obj/structure/tray/m_tray/CanPass(atom/movable/mover, turf/target)
-	if(istype(mover) && (mover.pass_flags & PASSTABLE))
-		return 1
-	if(locate(/obj/structure/table) in get_turf(mover))
-		return 1
-	else
-		return 0
-
-/obj/structure/tray/m_tray/CanAStarPass(ID, dir, caller)
-	. = !density
-	if(ismovableatom(caller))
-		var/atom/movable/mover = caller
-		. = . || (mover.pass_flags & PASSTABLE)
-
-//Hyperstation edit starts here
-/obj/structure/bodycontainer/morgue/attack_ghost(mob/user)
-	. = ..()
-	if(!beeper || inuse)
-		return
-
-	var/list/compiled = recursive_mob_check(src, 0, 0) // Search for mobs in all contents.
-	if(!length(compiled)) // No mobs?
-		return
-
-	for(var/mob/living/M in compiled)
-		var/mob/living/mob_occupant = get_mob_or_brainmob(M)
-		if(!mob_occupant.suiciding && !mob_occupant.hellbound)
-			if(mob_occupant.stat == DEAD && mob_occupant.mind.key == user.client.key)
-				inuse = TRUE
-				visible_message("One of the morgue coffins currently holds a soul that is eager to have its body revived.")
-				radio.talk_into(src, "One of the morgue coffins currently holds a soul that is eager to have its body revived.", medical_channel)
-				playsound(loc, 'sound/machines/ping.ogg', 50)
-				addtimer(CALLBACK(src, .proc/liftcooldown), 500)
-
-/obj/structure/bodycontainer/morgue/proc/liftcooldown()
-	inuse = FALSE
-//Hyperstation edit ends here
+/* Morgue stuff
+ * Contains:
+ *		Morgue
+ *		Morgue tray
+ *		Crematorium
+ *		Creamatorium
+ *		Crematorium tray
+ *		Crematorium button
+ */
+
+/*
+ * Bodycontainer
+ * Parent class for morgue and crematorium
+ * For overriding only
+ */
+GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants and other ghosties.
+
+/obj/structure/bodycontainer
+	icon = 'icons/obj/stationobjs.dmi'
+	icon_state = "morgue1"
+	density = TRUE
+	anchored = TRUE
+	max_integrity = 400
+
+	var/obj/structure/tray/connected = null
+	var/locked = FALSE
+	dir = SOUTH
+	var/message_cooldown
+	var/breakout_time = 600
+	var/obj/item/radio/radio = null
+	var/hasradio = FALSE
+
+/obj/structure/bodycontainer/Initialize()
+	. = ..()
+	GLOB.bodycontainers += src
+	recursive_organ_check(src)
+
+/obj/structure/bodycontainer/Destroy()
+	GLOB.bodycontainers -= src
+	open()
+	if(connected)
+		qdel(connected)
+		connected = null
+	return ..()
+
+/obj/structure/bodycontainer/on_log(login)
+	..()
+	update_icon()
+
+/obj/structure/bodycontainer/update_icon()
+	return
+
+/obj/structure/bodycontainer/relaymove(mob/user)
+	if(user.stat || !isturf(loc))
+		return
+	if(locked)
+		if(message_cooldown <= world.time)
+			message_cooldown = world.time + 50
+			to_chat(user, "<span class='warning'>[src]'s door won't budge!</span>")
+		return
+	open()
+
+/obj/structure/bodycontainer/attack_paw(mob/user)
+	return attack_hand(user)
+
+/obj/structure/bodycontainer/attack_hand(mob/user)
+	. = ..()
+	if(.)
+		return
+	if(locked)
+		to_chat(user, "<span class='danger'>It's locked.</span>")
+		return
+	if(!connected)
+		to_chat(user, "That doesn't appear to have a tray.")
+		return
+	if(connected.loc == src)
+		open()
+	else
+		close()
+	add_fingerprint(user)
+
+/obj/structure/bodycontainer/attack_robot(mob/user)
+	if(!user.Adjacent(src))
+		return
+	return attack_hand(user)
+
+/obj/structure/bodycontainer/attackby(obj/P, mob/user, params)
+	add_fingerprint(user)
+	if(istype(P, /obj/item/pen))
+		if(!user.is_literate())
+			to_chat(user, "<span class='notice'>You scribble illegibly on the side of [src]!</span>")
+			return
+		var/t = stripped_input(user, "What would you like the label to be?", text("[]", name), null)
+		if (user.get_active_held_item() != P)
+			return
+		if(!user.canUseTopic(src, BE_CLOSE))
+			return
+		if (t)
+			name = text("[]- '[]'", initial(name), t)
+		else
+			name = initial(name)
+	else
+		return ..()
+
+/obj/structure/bodycontainer/deconstruct(disassembled = TRUE)
+	new /obj/item/stack/sheet/metal (loc, 5)
+	recursive_organ_check(src)
+	qdel(src)
+
+/obj/structure/bodycontainer/container_resist(mob/living/user)
+	if(!locked)
+		open()
+		return
+	user.changeNext_move(CLICK_CD_BREAKOUT)
+	user.last_special = world.time + CLICK_CD_BREAKOUT
+	user.visible_message(null, \
+		"<span class='notice'>You lean on the back of [src] and start pushing the tray open... (this will take about [DisplayTimeText(breakout_time)].)</span>", \
+		"<span class='italics'>You hear a metallic creaking from [src].</span>")
+	if(do_after(user,(breakout_time), target = src))
+		if(!user || user.stat != CONSCIOUS || user.loc != src )
+			return
+		user.visible_message("<span class='warning'>[user] successfully broke out of [src]!</span>", \
+			"<span class='notice'>You successfully break out of [src]!</span>")
+		open()
+
+/obj/structure/bodycontainer/proc/open()
+	recursive_organ_check(src)
+	playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)
+	playsound(src, 'sound/effects/roll.ogg', 5, 1)
+	var/turf/T = get_step(src, dir)
+	connected.setDir(dir)
+	for(var/atom/movable/AM in src)
+		if(AM != radio)
+			AM.forceMove(T)
+	update_icon()
+
+/obj/structure/bodycontainer/proc/close()
+	playsound(src, 'sound/effects/roll.ogg', 5, 1)
+	playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)
+	for(var/atom/movable/AM in connected.loc)
+		if(!AM.anchored || AM == connected)
+			AM.forceMove(src)
+	recursive_organ_check(src)
+	update_icon()
+
+/obj/structure/bodycontainer/get_remote_view_fullscreens(mob/user)
+	if(user.stat == DEAD || !(user.sight & (SEEOBJS|SEEMOBS)))
+		user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 2)
+/*
+ * Morgue
+ */
+/obj/structure/bodycontainer/morgue
+	name = "morgue"
+	desc = "Used to keep bodies in until someone fetches them. Now includes a high-tech alert system."
+	icon_state = "morgue1"
+	dir = EAST
+	var/beeper = TRUE
+	var/beep_cooldown = 50
+	var/next_beep = 0
+	//Hyperstation edit
+	var/radio_key = /obj/item/encryptionkey/headset_med
+	var/medical_channel = "Medical"
+	var/inuse = FALSE
+	hasradio = TRUE
+
+/obj/structure/bodycontainer/morgue/Initialize()
+	. = ..()
+	radio = new(src)
+	radio.anchored = TRUE
+	radio.keyslot = new radio_key
+	radio.listening = 0
+	radio.recalculateChannels()
+
+/obj/structure/bodycontainer/morgue/Destroy()
+	QDEL_NULL(radio)
+	GLOB.bodycontainers -= src
+	open()
+	if(connected)
+		qdel(connected)
+		connected = null
+	return ..()
+/*
+/obj/structure/bodycontainer/morgue/proc/open2()
+	recursive_organ_check(src)
+	playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)
+	playsound(src, 'sound/effects/roll.ogg', 5, 1)
+	var/turf/T = get_step(src, dir)
+	connected.setDir(dir)
+	for(var/atom/movable/AM in src)
+		if(AM != radio)
+			AM.forceMove(T)
+	update_icon()
+*/
+//end of edit
+/obj/structure/bodycontainer/morgue/New()
+	connected = new/obj/structure/tray/m_tray(src)
+	connected.connected = src
+	..()
+
+/obj/structure/bodycontainer/morgue/examine(mob/user)
+	. = ..()
+	. += "<span class='notice'>The speaker is [beeper ? "enabled" : "disabled"]. Alt-click to toggle it.</span>"
+
+/obj/structure/bodycontainer/morgue/AltClick(mob/user)
+	. = ..()
+	if(!user.canUseTopic(src, !issilicon(user)))
+		return
+	beeper = !beeper
+	to_chat(user, "<span class='notice'>You turn the speaker function [beeper ? "on" : "off"].</span>")
+	return TRUE
+
+/obj/structure/bodycontainer/morgue/update_icon()
+	if (!connected || connected.loc != src) // Open or tray is gone.
+		icon_state = "morgue0"
+	else
+		if(contents.len == 2)  // Empty. Was length 1 because of the tray, is now length 2 because it includes a radio.
+			icon_state = "morgue1"
+		else
+			icon_state = "morgue2" // Dead, brainded mob.
+			var/list/compiled = recursive_mob_check(src, 0, 0) // Search for mobs in all contents.
+			if(!length(compiled)) // No mobs?
+				icon_state = "morgue3"
+				return
+
+			for(var/mob/living/M in compiled)
+				var/mob/living/mob_occupant = get_mob_or_brainmob(M)
+				if(mob_occupant.client && !mob_occupant.suiciding && !(HAS_TRAIT(mob_occupant, TRAIT_NOCLONE)) && !mob_occupant.hellbound)
+					icon_state = "morgue4" // Cloneable
+					if(mob_occupant.stat == DEAD && beeper)
+						if(world.time > next_beep)
+							playsound(src, 'sound/weapons/smg_empty_alarm.ogg', 50, 0) //Clone them you blind fucks
+							next_beep = world.time + beep_cooldown
+					break
+
+
+/obj/item/paper/guides/jobs/medical/morgue
+	name = "morgue memo"
+	info = "<font size='2'>Since this station's medbay never seems to fail to be staffed by the mindless monkeys meant for genetics experiments, I'm leaving a reminder here for anyone handling the pile of cadavers the quacks are sure to leave.</font><BR><BR><font size='4'><font color=red>Red lights mean there's a plain ol' dead body inside.</font><BR><BR><font color=orange>Yellow lights mean there's non-body objects inside.</font><BR><font size='2'>Probably stuff pried off a corpse someone grabbed, or if you're lucky it's stashed booze.</font><BR><BR><font color=green>Green lights mean the morgue system detects the body may be able to be cloned.</font></font><BR><font size='2'>I don't know how that works, but keep it away from the kitchen and go yell at the geneticists.</font><BR><BR>- CentCom medical inspector"
+
+/*
+ * Crematorium
+ */
+GLOBAL_LIST_EMPTY(crematoriums)
+/obj/structure/bodycontainer/crematorium
+	name = "crematorium"
+	desc = "A human incinerator. Works well on barbecue nights."
+	icon_state = "crema1"
+	dir = SOUTH
+	var/id = 1
+
+/obj/structure/bodycontainer/crematorium/attack_robot(mob/user) //Borgs can't use crematoriums without help
+	to_chat(user, "<span class='warning'>[src] is locked against you.</span>")
+	return
+
+/obj/structure/bodycontainer/crematorium/Destroy()
+	GLOB.crematoriums.Remove(src)
+	return ..()
+
+/obj/structure/bodycontainer/crematorium/New()
+	connected = new/obj/structure/tray/c_tray(src)
+	connected.connected = src
+
+	GLOB.crematoriums.Add(src)
+	..()
+
+/obj/structure/bodycontainer/crematorium/update_icon()
+	if(!connected || connected.loc != src)
+		icon_state = "crema0"
+	else
+
+		if(src.contents.len > 1)
+			src.icon_state = "crema2"
+		else
+			src.icon_state = "crema1"
+
+		if(locked)
+			src.icon_state = "crema_active"
+
+	return
+
+/obj/structure/bodycontainer/crematorium/proc/cremate(mob/user)
+	if(locked)
+		return //don't let you cremate something twice or w/e
+	// Make sure we don't delete the actual morgue and its tray
+	var/list/conts = GetAllContents() - src - connected
+
+	if(!conts.len)
+		audible_message("<span class='italics'>You hear a hollow crackle.</span>")
+		return
+
+	else
+		audible_message("<span class='italics'>You hear a roar as the crematorium activates.</span>")
+
+		locked = TRUE
+		update_icon()
+
+		for(var/mob/living/M in conts)
+			if (M.stat != DEAD)
+				M.emote("scream")
+			if(user)
+				log_combat(user, M, "cremated")
+			else
+				M.log_message("was cremated", LOG_ATTACK)
+
+			M.death(1)
+			if(M) //some animals get automatically deleted on death.
+				M.ghostize()
+				qdel(M)
+
+		for(var/obj/O in conts) //conts defined above, ignores crematorium and tray
+			qdel(O)
+
+		if(!locate(/obj/effect/decal/cleanable/ash) in get_step(src, dir))//prevent pile-up
+			new/obj/effect/decal/cleanable/ash/crematorium(src)
+
+		sleep(30)
+
+		if(!QDELETED(src))
+			locked = FALSE
+			update_icon()
+			playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) //you horrible people
+
+/obj/structure/bodycontainer/crematorium/creamatorium
+	name = "creamatorium"
+	desc = "A human incinerator. Works well during ice cream socials."
+
+/obj/structure/bodycontainer/crematorium/creamatorium/cremate(mob/user)
+	var/list/icecreams = new()
+	for(var/mob/living/i_scream in GetAllContents())
+		var/obj/item/reagent_containers/food/snacks/icecream/IC = new()
+		IC.set_cone_type("waffle")
+		IC.add_mob_flavor(i_scream)
+		icecreams += IC
+	. = ..()
+	for(var/obj/IC in icecreams)
+		IC.forceMove(src)
+
+/*
+ * Generic Tray
+ * Parent class for morguetray and crematoriumtray
+ * For overriding only
+ */
+/obj/structure/tray
+	icon = 'icons/obj/stationobjs.dmi'
+	density = TRUE
+	layer = BELOW_OBJ_LAYER
+	var/obj/structure/bodycontainer/connected = null
+	anchored = TRUE
+	pass_flags = LETPASSTHROW
+	max_integrity = 350
+
+/obj/structure/tray/Destroy()
+	if(connected)
+		connected.connected = null
+		connected.update_icon()
+		connected = null
+	return ..()
+
+/obj/structure/tray/deconstruct(disassembled = TRUE)
+	new /obj/item/stack/sheet/metal (loc, 2)
+	qdel(src)
+
+/obj/structure/tray/attack_paw(mob/user)
+	return attack_hand(user)
+
+/obj/structure/tray/attack_hand(mob/user)
+	. = ..()
+	if(.)
+		return
+	if (src.connected)
+		connected.close()
+		add_fingerprint(user)
+	else
+		to_chat(user, "<span class='warning'>That's not connected to anything!</span>")
+
+/obj/structure/tray/MouseDrop_T(atom/movable/O as mob|obj, mob/user)
+	if(!ismovableatom(O) || O.anchored || !Adjacent(user) || !user.Adjacent(O) || O.loc == user)
+		return
+	if(!ismob(O))
+		if(!istype(O, /obj/structure/closet/body_bag))
+			return
+	else
+		var/mob/M = O
+		if(M.buckled)
+			return
+	if(!ismob(user) || user.lying || user.incapacitated())
+		return
+	O.forceMove(src.loc)
+	if (user != O)
+		visible_message("<span class='warning'>[user] stuffs [O] into [src].</span>")
+	return
+
+/*
+ * Crematorium tray
+ */
+/obj/structure/tray/c_tray
+	name = "crematorium tray"
+	desc = "Apply body before burning."
+	icon_state = "cremat"
+
+/*
+ * Morgue tray
+ */
+/obj/structure/tray/m_tray
+	name = "morgue tray"
+	desc = "Apply corpse before closing."
+	icon_state = "morguet"
+
+/obj/structure/tray/m_tray/CanPass(atom/movable/mover, turf/target)
+	if(istype(mover) && (mover.pass_flags & PASSTABLE))
+		return 1
+	if(locate(/obj/structure/table) in get_turf(mover))
+		return 1
+	else
+		return 0
+
+/obj/structure/tray/m_tray/CanAStarPass(ID, dir, caller)
+	. = !density
+	if(ismovableatom(caller))
+		var/atom/movable/mover = caller
+		. = . || (mover.pass_flags & PASSTABLE)
+
+//Hyperstation edit starts here
+/obj/structure/bodycontainer/morgue/attack_ghost(mob/user)
+	. = ..()
+	if(!beeper || inuse)
+		return
+
+	var/list/compiled = recursive_mob_check(src, 0, 0) // Search for mobs in all contents.
+	if(!length(compiled)) // No mobs?
+		return
+
+	for(var/mob/living/M in compiled)
+		var/mob/living/mob_occupant = get_mob_or_brainmob(M)
+		if(!mob_occupant.suiciding && !mob_occupant.hellbound)
+			if(mob_occupant.stat == DEAD && mob_occupant.mind.key == user.client.key)
+				inuse = TRUE
+				visible_message("One of the morgue coffins currently holds a soul that is eager to have its body revived.")
+				radio.talk_into(src, "One of the morgue coffins currently holds a soul that is eager to have its body revived.", medical_channel)
+				playsound(loc, 'sound/machines/ping.ogg', 50)
+				addtimer(CALLBACK(src, .proc/liftcooldown), 500)
+
+/obj/structure/bodycontainer/morgue/proc/liftcooldown()
+	inuse = FALSE
+//Hyperstation edit ends here

code/game/objects/structures/musician.dm

@@ -109,8 +109,10 @@
 					var/cur_note = text2ascii(note) - 96
 					if(cur_note < 1 || cur_note > 7)
 						continue
-					for(var/i=2 to length(note))
-						var/ni = copytext(note,i,i+1)
+					var/notelen = length(note)
+					var/ni = ""
+					for(var/i = length(note[1]) + 1, i <= notelen, i += length(ni))
+						ni = note[i]
 						if(!text2num(ni))
 							if(ni == "#" || ni == "b" || ni == "n")
 								cur_acc[cur_note] = ni
@@ -199,9 +201,10 @@
 	//split into lines
 	lines = splittext(text, "\n")
 	if(lines.len)
-		if(copytext(lines[1],1,6) == "BPM: ")
-			tempo = sanitize_tempo(600 / text2num(copytext(lines[1],6)))
-			lines.Cut(1,2)
+		var/bpm_string = "BPM: "
+		if(findtext(lines[1], bpm_string, 1, length(bpm_string) + 1))
+			tempo = sanitize_tempo(600 / text2num(copytext(lines[1], length(bpm_string) + 1)))
+			lines.Cut(1, 2)
 		else
 			tempo = sanitize_tempo(5) // default 120 BPM
 		if(lines.len > MUSIC_MAXLINES)
@@ -209,7 +212,7 @@
 			lines.Cut(MUSIC_MAXLINES + 1)
 		var/linenum = 1
 		for(var/l in lines)
-			if(length(l) > MUSIC_MAXLINECHARS)
+			if(length_char(l) > MUSIC_MAXLINECHARS)
 				to_chat(usr, "Line [linenum] too long!")
 				lines.Remove(l)
 			else
@@ -236,11 +239,11 @@
 			if(!in_range(instrumentObj, usr))
 				return
 
-			if(length(t) >= MUSIC_MAXLINES * MUSIC_MAXLINECHARS)
+			if(length_char(t) >= MUSIC_MAXLINES * MUSIC_MAXLINECHARS)
 				var/cont = input(usr, "Your message is too long! Would you like to continue editing it?", "", "yes") in list("yes", "no")
 				if(cont == "no")
 					break
-		while(length(t) > MUSIC_MAXLINES * MUSIC_MAXLINECHARS)
+		while(length_char(t) > MUSIC_MAXLINES * MUSIC_MAXLINECHARS)
 		ParseSong(t)
 
 	else if(href_list["help"])
@@ -284,11 +287,9 @@
 
 	else if(href_list["modifyline"])
 		var/num = round(text2num(href_list["modifyline"]),1)
-		var/content = html_encode(input("Enter your line: ", instrumentObj.name, lines[num]) as text|null)
+		var/content = stripped_input(usr, "Enter your line: ", instrumentObj.name, lines[num], MUSIC_MAXLINECHARS)
 		if(!content || !in_range(instrumentObj, usr))
 			return
-		if(length(content) > MUSIC_MAXLINECHARS)
-			content = copytext(content, 1, MUSIC_MAXLINECHARS)
 		if(num > lines.len || num < 1)
 			return
 		lines[num] = content

code/game/objects/structures/reflector.dm

@@ -168,10 +168,12 @@
 	return TRUE
 
 /obj/structure/reflector/AltClick(mob/user)
+	. = ..()
 	if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
 		return
 	else if(finished)
 		rotate(user)
+	return TRUE
 
 
 //TYPES OF REFLECTORS, SINGLE, DOUBLE, BOX

code/game/objects/structures/tank_dispenser.dm

@@ -71,9 +71,12 @@
 										datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "tank_dispenser", name, 275, 100, master_ui, state)
+		ui = new(user, src, ui_key, "tank_dispenser", name, 275, 103, master_ui, state)
 		ui.open()
 
+/obj/structure/tank_dispenser/attack_robot(mob/user)
+	ui_interact(user)
+
 /obj/structure/tank_dispenser/ui_data(mob/user)
 	var/list/data = list()
 	data["oxygen"] = oxygentanks

code/game/objects/structures/watercloset.dm

@@ -101,7 +101,7 @@
 		if (!open)
 			return
 		var/obj/item/reagent_containers/RG = I
-		RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
+		RG.reagents.add_reagent(/datum/reagent/water, min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
 		to_chat(user, "<span class='notice'>You fill [RG] from [src]. Gross.</span>")
 	else
 		return ..()
@@ -199,8 +199,7 @@
 	icon = 'icons/obj/items_and_weapons.dmi'
 	icon_state = "urinalcake"
 	w_class = WEIGHT_CLASS_TINY
-	list_reagents = list(chlorine = 3, ammonia = 1)
-	foodtype = TOXIC | GROSS
+	list_reagents = list(/datum/reagent/chlorine = 3, /datum/reagent/ammonia = 1)
 
 /obj/item/reagent_containers/food/snacks/urinalcake/attack_self(mob/living/user)
 	user.visible_message("<span class='notice'>[user] squishes [src]!</span>", "<span class='notice'>You squish [src].</span>", "<i>You hear a squish.</i>")
@@ -209,7 +208,7 @@
 
 /obj/machinery/shower
 	name = "shower"
-	desc = "The HS-451. Installed in the 2550s by the Nanotrasen Hygiene Division."
+	desc = "The HS-451. Installed in the 2550s by the Kinaris Hygiene Division."
 	icon = 'icons/obj/watercloset.dmi'
 	icon_state = "shower"
 	density = FALSE
@@ -220,6 +219,9 @@
 	var/watertemp = "normal"	//freezing, normal, or boiling
 	var/datum/looping_sound/showering/soundloop
 
+/obj/machinery/shower/crafted	//When created from sheets of metal
+	anchored = FALSE
+
 /obj/machinery/shower/Initialize()
 	. = ..()
 	soundloop = new(list(src), FALSE)
@@ -228,6 +230,29 @@
 	QDEL_NULL(soundloop)
 	return ..()
 
+/obj/machinery/shower/deconstruct(disassembled = TRUE)
+	new /obj/item/stack/sheet/metal (get_turf(src), 2)
+	Destroy()
+
+//Copy from /obj/structure/chair
+/obj/machinery/shower/ComponentInitialize()
+	. = ..()
+	AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE, CALLBACK(src, .proc/can_user_rotate),CALLBACK(src, .proc/can_be_rotated),null)
+
+/obj/machinery/shower/proc/can_be_rotated(mob/user)
+	return !anchored
+
+/obj/machinery/shower/proc/can_user_rotate(mob/user)
+	if(istype(user, /mob/living))
+		if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
+			return FALSE
+		else
+			return TRUE
+	else if(isobserver(user) && CONFIG_GET(flag/ghost_interaction))
+		return TRUE
+	return FALSE
+////
+
 /obj/effect/mist
 	name = "mist"
 	icon = 'icons/obj/watercloset.dmi'
@@ -237,6 +262,8 @@
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 
 /obj/machinery/shower/interact(mob/M)
+	if (!anchored)
+		return to_chat(M, "<span class='warning'>You have to connect [src] to the floor first!</span>")
 	on = !on
 	update_icon()
 	add_fingerprint(M)
@@ -259,25 +286,56 @@
 
 /obj/machinery/shower/attackby(obj/item/I, mob/user, params)
 	if(I.type == /obj/item/analyzer)
-		to_chat(user, "<span class='notice'>The water temperature seems to be [watertemp].</span>")
-	else
+		to_chat(user, "<span class='notice'>The water temperature seems to be <span class='bold'>[watertemp]</span>.</span>")
+		return
+
+	if (user.a_intent != INTENT_HELP)
 		return ..()
 
-/obj/machinery/shower/wrench_act(mob/living/user, obj/item/I)
-	to_chat(user, "<span class='notice'>You begin to adjust the temperature valve with \the [I]...</span>")
-	if(I.use_tool(src, user, 50))
-		switch(watertemp)
-			if("normal")
-				watertemp = "freezing"
-			if("freezing")
-				watertemp = "boiling"
-			if("boiling")
-				watertemp = "normal"
-		user.visible_message("<span class='notice'>[user] adjusts the shower with \the [I].</span>", "<span class='notice'>You adjust the shower with \the [I] to [watertemp] temperature.</span>")
-		log_game("[key_name(user)] has wrenched a shower to [watertemp] at ([x],[y],[z])")
-		add_hiddenprint(user)
-	return TRUE
+	switch (I.tool_behaviour)
+		if (TOOL_WRENCH)
+			if (!anchored)
+				user.visible_message("<span class='notice'>[user] starts to take apart [src]...</span>", "<span class='notice'>You start dismantling [src]...</span>")
+				I.play_tool_sound(src)
+				if(I.use_tool(src, user, 20))
+					deconstruct(TRUE)
+			else
+				to_chat(user, "<span class='notice'>You begin to adjust the temperature valve with \the [I]...</span>")
+				if(I.use_tool(src, user, 50))
+					switch(watertemp)
+						if("normal")
+							watertemp = "freezing"
+						if("freezing")
+							watertemp = "boiling"
+						if("boiling")
+							watertemp = "normal"
+					user.visible_message("<span class='notice'>[user] adjusts the shower with \the [I].</span>", "<span class='notice'>You adjust the shower with \the [I] to [watertemp] temperature.</span>")
+					log_game("[key_name(user)] has wrenched a shower to [watertemp] at ([x],[y],[z])")
+					add_hiddenprint(user)
 
+		if (TOOL_SCREWDRIVER)
+			if (!anchored)
+				to_chat(user, "<span class='notice'>You begin screwing in [src] to the floor...</span>")
+				I.play_tool_sound(src)
+				if(I.use_tool(src, user, 30))
+					user.visible_message("<span class='notice'>[user] connects [src] to the floor.</span>", "<span class='notice'>You connect [src] to the floor.</span>")
+					anchored = TRUE
+			else
+				to_chat(user, "<span class='notice'>You start to take out [src]'s screws...</span>")
+				on = FALSE
+				soundloop.stop()
+				update_icon()
+				I.play_tool_sound(src)
+				if(I.use_tool(src, user, 20))
+					user.visible_message("<span class='notice'>[user] disconnects [src] from the floor.</span>", "<span class='notice'>You disconnect [src] from the floor.</span>")
+					anchored = FALSE
+
+/obj/machinery/shower/examine()
+	. += ..()
+	if (anchored)
+		. += "<span class='info'>It looks like it can be taken apart with a <span class='bold'>screwdriver</span>...</span>"
+	else
+		. += "<span class='info'>Its <span class='bold'>screws</span> are out of place, allowing it to be <span class='bold'>dismantled with a wrench</span>.</span>"
 
 /obj/machinery/shower/update_icon()	//this is terribly unreadable, but basically it makes the shower mist up
 	cut_overlays()					//once it's been on for a while, in addition to handling the water overlay.
@@ -320,6 +378,7 @@
 /obj/machinery/shower/proc/wash_obj(obj/O)
 	. = SEND_SIGNAL(O, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
 	. = O.clean_blood()
+	. = O.wash_cum()
 	O.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
 	if(isitem(O))
 		var/obj/item/I = O
@@ -341,6 +400,7 @@
 /obj/machinery/shower/proc/wash_mob(mob/living/L)
 	SEND_SIGNAL(L, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
 	L.wash_cream()
+	L.wash_cum()
 	L.ExtinguishMob()
 	L.adjust_fire_stacks(-20) //Douse ourselves with water to avoid fire more easily
 	L.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
@@ -462,7 +522,28 @@
 	desc = "A sink used for washing one's hands and face."
 	anchored = TRUE
 	var/busy = FALSE 	//Something's being washed at the moment
-	var/dispensedreagent = "water" // for whenever plumbing happens
+	var/dispensedreagent = /datum/reagent/water // for whenever plumbing happens
+	layer = WALL_OBJ_LAYER
+
+/*/obj/structure/sink/Initialize()	//This doesn't work in the slightest. It used to at some point through development, but that made it so you cant interact with the object whatsoever. I hate this.
+	. = ..()
+	switch (dir)	//Thinking about moving this into its own construction sequence so it can actually work, like using a screwdriver will set its pixel offset, but I feel like that's too much
+		if (NORTH)	//Or maybe putting it in lateinit... but that's sloppy and I feel like it wont work when spawning it in after the round starts
+			pixel_x = pixel_y = 0
+			layer = WALL_OBJ_LAYER
+		if (EAST)
+			pixel_x = 12
+			pixel_y = 3
+			layer = WALL_OBJ_LAYER
+		if (SOUTH)
+			pixel_y = 24
+			pixel_x = 0
+			layer = ABOVE_OBJ_LAYER
+		if (WEST)
+			pixel_x = -12
+			pixel_y = 3
+			layer = WALL_OBJ_LAYER
+*/
 
 
 /obj/structure/sink/attack_hand(mob/living/user)
@@ -501,6 +582,7 @@
 			H.lip_style = null //Washes off lipstick
 			H.lip_color = initial(H.lip_color)
 			H.wash_cream()
+			H.wash_cum()
 			H.regenerate_icons()
 		user.drowsyness = max(user.drowsyness - rand(2,3), 0) //Washing your face wakes you up if you're falling asleep
 	else
@@ -509,7 +591,16 @@
 
 /obj/structure/sink/attackby(obj/item/O, mob/living/user, params)
 	if(busy)
-		to_chat(user, "<span class='warning'>Someone's already washing here!</span>")
+		to_chat(user, "<span class='warning'>Someone's already washing here.</span>")
+		return
+
+	if (istype(O, /obj/item/wrench) && user.a_intent == INTENT_HELP)
+		to_chat(user, "<span class='notice'>You start deconstructing [src]...</span>")
+		O.play_tool_sound(src)
+
+		if(O.use_tool(src, user, 20))
+			playsound(src.loc, 'sound/items/deconstruct.ogg', 50, TRUE)
+			deconstruct(TRUE)
 		return
 
 	if(istype(O, /obj/item/reagent_containers))
@@ -537,7 +628,7 @@
 				return
 
 	if(istype(O, /obj/item/mop))
-		O.reagents.add_reagent("[dispensedreagent]", 5)
+		O.reagents.add_reagent(dispensedreagent, 5)
 		to_chat(user, "<span class='notice'>You wet [O] in [src].</span>")
 		playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
 		return
@@ -563,6 +654,7 @@
 		busy = FALSE
 		SEND_SIGNAL(O, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
 		O.clean_blood()
+		O.wash_cum()
 		O.acid_level = 0
 		create_reagents(5)
 		reagents.add_reagent(dispensedreagent, 5)
@@ -574,16 +666,13 @@
 		return ..()
 
 /obj/structure/sink/deconstruct(disassembled = TRUE)
-	new /obj/item/stack/sheet/metal (loc, 3)
+	new /obj/item/stack/sheet/metal (loc, 2)
 	qdel(src)
 
-
-
 /obj/structure/sink/kitchen
 	name = "kitchen sink"
 	icon_state = "sink_alt"
 
-
 /obj/structure/sink/puddle	//splishy splashy ^_^
 	name = "puddle"
 	desc = "A puddle used for washing one's hands and face."