Merge branch 'master' into xantholne-berets02

2019-11-25 20:16:15 -07:00
parent 495b4b6ddc 56bdb36058
commit 4e20f576e6
521 changed files with 3130 additions and 1877 deletions
@@ -20,7 +20,7 @@

 /obj/effect/countdown/examine(mob/user)
 	. = ..()
-	to_chat(user, "This countdown is displaying: [displayed_text].")
+	. += "This countdown is displaying: [displayed_text]."

 /obj/effect/countdown/proc/attach(atom/A)
 	attached_to = A
@@ -130,12 +130,10 @@
 /obj/effect/decal/cleanable/blood/footprints/examine(mob/user)
 	. = ..()
 	if(shoe_types.len)
-		. += "You recognise the footprints as belonging to:\n"
+		. += "You recognise the footprints as belonging to:"
 		for(var/shoe in shoe_types)
 			var/obj/item/clothing/shoes/S = shoe
-			. += "some <B>[initial(S.name)]</B> [icon2html(initial(S.icon), user)]\n"
-
-	to_chat(user, .)
+			. += "some <B>[initial(S.name)]</B> [icon2html(initial(S.icon), user)]"

 /obj/effect/decal/cleanable/blood/footprints/replace_decal(obj/effect/decal/cleanable/C)
 	if(blood_state != C.blood_state) //We only replace footprints of the same type as us
@@ -36,7 +36,7 @@

 /obj/structure/glowshroom/examine(mob/user)
 	. = ..()
-	to_chat(user, "This is a [generation]\th generation [name]!")
+	. += "This is a [generation]\th generation [name]!"

 /obj/structure/glowshroom/Destroy()
 	if(myseed)
@@ -315,6 +315,11 @@
 	randomdir = 0
 	duration = 6

+/obj/effect/temp_visual/desynchronizer
+	name = "desynchronizer field"
+	icon_state = "chronofield"
+	duration = 3
+
 /obj/effect/temp_visual/impact_effect
 	icon_state = "impact_bullet"
 	duration = 5
@@ -183,14 +183,24 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 	src.loc = T

 /obj/item/examine(mob/user) //This might be spammy. Remove?
-	..()
-	var/pronoun
-	if(src.gender == PLURAL)
-		pronoun = "They are"
+	. = ..()
+
+	. += "[gender == PLURAL ? "They are" : "It is"] a [weightclass2text(w_class)] item."
+
+	if(resistance_flags & INDESTRUCTIBLE)
+		. += "[src] seems extremely robust! It'll probably withstand anything that could happen to it!"
 	else
-		pronoun = "It is"
-	var/size = weightclass2text(src.w_class)
-	to_chat(user, "[pronoun] a [size] item." )
+		if(resistance_flags & LAVA_PROOF)
+			. += "[src] is made of an extremely heat-resistant material, it'd probably be able to withstand lava!"
+		if(resistance_flags & (ACID_PROOF | UNACIDABLE))
+			. += "[src] looks pretty robust! It'd probably be able to withstand acid!"
+		if(resistance_flags & FREEZE_PROOF)
+			. += "[src] is made of cold-resistant materials."
+		if(resistance_flags & FIRE_PROOF)
+			. += "[src] is made of fire-retardant materials."
+
+
+

 	if(!user.research_scanner)
 		return
@@ -227,7 +237,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 	else
 		research_msg += "None"
 	research_msg += "."
-	to_chat(user, research_msg.Join())
+	. += research_msg.Join()

 /obj/item/interact(mob/user)
 	add_fingerprint(user)
@@ -25,7 +25,7 @@ AI MODULES
 	materials = list(MAT_GOLD=50)

 /obj/item/aiModule/examine(var/mob/user as mob)
-	..()
+	. = ..()
 	if(Adjacent(user))
 		show_laws(user)

@@ -46,8 +46,8 @@ RLD
 	spark_system.attach(src)

 /obj/item/construction/examine(mob/user)
-	..()
-	to_chat(user, "\A [src]. It currently holds [matter]/[max_matter] matter-units." )
+	. = ..()
+	. += "\A [src]. It currently holds [matter]/[max_matter] matter-units."

 /obj/item/construction/Destroy()
 	QDEL_NULL(spark_system)
@@ -79,9 +79,9 @@
 		..()

 /obj/item/twohanded/rcl/examine(mob/user)
-	..()
+	. = ..()
 	if(loaded)
-		to_chat(user, "<span class='info'>It contains [loaded.amount]/[max_amount] cables.</span>")
+		. += "<span class='info'>It contains [loaded.amount]/[max_amount] cables.</span>"

 /obj/item/twohanded/rcl/Destroy()
 	QDEL_NULL(loaded)
@@ -20,8 +20,8 @@ RSF
 	w_class = WEIGHT_CLASS_NORMAL

 /obj/item/rsf/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>It currently holds [matter]/30 fabrication-units.</span>")
+	. = ..()
+	. += "<span class='notice'>It currently holds [matter]/30 fabrication-units.</span>"

 /obj/item/rsf/cyborg
 	matter = 30
@@ -127,8 +127,8 @@ RSF
 	w_class = WEIGHT_CLASS_NORMAL

 /obj/item/cookiesynth/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>It currently holds [matter]/10 cookie-units.</span>")
+	. = ..()
+	. += "<span class='notice'>It currently holds [matter]/10 cookie-units.</span>"

 /obj/item/cookiesynth/attackby()
 	return
@@ -91,9 +91,9 @@


 /obj/item/airlock_painter/examine(mob/user)
-	..()
+	. = ..()
 	if(!ink)
-		to_chat(user, "<span class='notice'>It doesn't have a toner cartridge installed.</span>")
+		. += "<span class='notice'>It doesn't have a toner cartridge installed.</span>"
 		return
 	var/ink_level = "high"
 	if(ink.charges < 1)
@@ -102,7 +102,7 @@
 		ink_level = "low"
 	else if((ink.charges/ink.max_charges) > 1) //Over 100% (admin var edit)
 		ink_level = "dangerously high"
-	to_chat(user, "<span class='notice'>Its ink levels look [ink_level].</span>")
+	. += "<span class='notice'>Its ink levels look [ink_level].</span>"


 /obj/item/airlock_painter/attackby(obj/item/W, mob/user, params)
@@ -46,10 +46,10 @@


 /obj/item/bodybag/bluespace/examine(mob/user)
-	..()
+	. = ..()
 	if(contents.len)
 		var/s = contents.len == 1 ? "" : "s"
-		to_chat(user, "<span class='notice'>You can make out the shape[s] of [contents.len] object[s] through the fabric.</span>")
+		. += "<span class='notice'>You can make out the shape[s] of [contents.len] object[s] through the fabric.</span>"

 /obj/item/bodybag/bluespace/Destroy()
 	for(var/atom/movable/A in contents)
@@ -113,7 +113,7 @@

 /obj/item/card/emag/examine(mob/user)
 	. = ..()
-	to_chat(user, "<span class='notice'>It has <b>[uses ? uses : "no"]</b> charges left.</span>")
+	. += "<span class='notice'>It has <b>[uses ? uses : "no"]</b> charges left.</span>"

 /obj/item/card/emag/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/emagrecharge))
@@ -139,9 +139,9 @@
 /obj/item/emagrecharge/examine(mob/user)
 	. = ..()
 	if(uses)
-		to_chat(user, "<span class='notice'>It can add up to [uses] charges to compatible devices</span>")
+		. += "<span class='notice'>It can add up to [uses] charges to compatible devices</span>"
 	else
-		to_chat(user, "<span class='warning'>It has a small, red, blinking light coming from inside of it. It's spent.</span>")
+		. += "<span class='warning'>It has a small, red, blinking light coming from inside of it. It's spent.</span>"

 /obj/item/card/emagfake
 	desc = "It's a card with a magnetic strip attached to some circuitry. Closer inspection shows that this card is a poorly made replica, with a \"DonkCo\" logo stamped on the back."
@@ -193,9 +193,9 @@
 		return

 /obj/item/card/id/examine(mob/user)
-	..()
+	. = ..()
 	if(mining_points)
-		to_chat(user, "There's [mining_points] mining equipment redemption point\s loaded onto this card.")
+		. += "There's [mining_points] mining equipment redemption point\s loaded onto this card."

 /obj/item/card/id/GetAccess()
 	return access
@@ -405,13 +405,13 @@ update_label("John Doe", "Clowny")
 /obj/item/card/id/prisoner/examine(mob/user)
 	. = ..()
 	if(sentence && world.time < sentence)
-		to_chat(user, "<span class='notice'>You're currently serving a sentence for [crime]. <b>[DisplayTimeText(sentence - world.time)]</b> left.</span>")
+		. += "<span class='notice'>You're currently serving a sentence for [crime]. <b>[DisplayTimeText(sentence - world.time)]</b> left.</span>"
 	else if(goal)
-		to_chat(user, "<span class='notice'>You have accumulated [points] out of the [goal] points you need for freedom.</span>")
+		. += "<span class='notice'>You have accumulated [points] out of the [goal] points you need for freedom.</span>"
 	else if(!sentence)
-		to_chat(user, "<span class='warning'>You are currently serving a permanent sentence for [crime].</span>")
+		. += "<span class='warning'>You are currently serving a permanent sentence for [crime].</span>"
 	else
-		to_chat(user, "<span class='notice'>Your sentence is up! You're free!</span>")
+		. += "<span class='notice'>Your sentence is up! You're free!</span>"

 /obj/item/card/id/prisoner/one
 	name = "Prisoner #13-001"
@@ -533,8 +533,8 @@ update_label("John Doe", "Clowny")
 	update_icon()

 /obj/item/card/id/knight/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>Alt-click to recolor it.</span>")
+	. = ..()
+	. += "<span class='notice'>Alt-click to recolor it.</span>"

 /obj/item/card/id/knight/blue
 	id_color = "#0000FF"
@@ -56,7 +56,7 @@ micro-manipulator, console screen, beaker, Microlaser, matter bin, power cells.
 	M.RefreshParts()

 /obj/item/circuitboard/machine/examine(mob/user)
-	..()
+	. = ..()
 	if(LAZYLEN(req_components))
 		var/list/nice_list = list()
 		for(var/B in req_components)
@@ -64,4 +64,4 @@ micro-manipulator, console screen, beaker, Microlaser, matter bin, power cells.
 			if(!ispath(A))
 				continue
 			nice_list += list("[req_components[A]] [initial(A.name)]")
-		to_chat(user,"<span class='notice'>Required components: [english_list(nice_list)].</span>")
+		. += "<span class='notice'>Required components: [english_list(nice_list)].</span>"
@@ -69,8 +69,8 @@
 		return ..()

 /obj/item/circuitboard/computer/card/minor/examine(user)
-	..()
-	to_chat(user, "Currently set to \"[dept_list[target_dept]]\".")
+	. = ..()
+	. += "Currently set to \"[dept_list[target_dept]]\"."

 //obj/item/circuitboard/computer/shield
 //	name = "Shield Control (Computer Board)"
@@ -429,8 +429,8 @@
 		return ..()

 /obj/item/circuitboard/machine/smartfridge/examine(mob/user)
-	..()
-	to_chat(user, "<span class='info'>[src] is set to [fridges_name_paths[build_path]]. You can use a screwdriver to reconfigure it.</span>")
+	. = ..()
+	. += "<span class='info'>[src] is set to [fridges_name_paths[build_path]]. You can use a screwdriver to reconfigure it.</span>"

 /obj/item/circuitboard/machine/biogenerator
 	name = "Biogenerator (Machine Board)"
@@ -775,7 +775,7 @@

 /obj/item/circuitboard/machine/public_nanite_chamber/examine(mob/user)
 	. = ..()
-	to_chat(user, "Cloud ID is currently set to [cloud_id].")
+	. += "Cloud ID is currently set to [cloud_id]."

 /obj/item/circuitboard/machine/nanite_program_hub
 	name = "Nanite Program Hub (Machine Board)"
@@ -936,9 +936,9 @@
 	needs_anchored = FALSE

 /obj/item/circuitboard/machine/dish_drive/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>Its suction function is [suction ? "enabled" : "disabled"]. Use it in-hand to switch.</span>")
-	to_chat(user, "<span class='notice'>Its disposal auto-transmit function is [transmit ? "enabled" : "disabled"]. Alt-click it to switch.</span>")
+	. = ..()
+	. += "<span class='notice'>Its suction function is [suction ? "enabled" : "disabled"]. Use it in-hand to switch.</span>"
+	. += "<span class='notice'>Its disposal auto-transmit function is [transmit ? "enabled" : "disabled"]. Alt-click it to switch.</span>"

 /obj/item/circuitboard/machine/dish_drive/attack_self(mob/living/user)
 	suction = !suction
@@ -112,11 +112,11 @@
 	throw_range = 7
 	attack_verb = list("HONKED")
 	var/moodlet = "honk" //used to define which kind of moodlet is added to the honked target
-	var/honksound = 'sound/items/bikehorn.ogg'
+	var/list/honksounds = list('sound/items/bikehorn.ogg' = 1)

-/obj/item/bikehorn/Initialize()
+/obj/item/bikehorn/ComponentInitialize()
 	. = ..()
-	AddComponent(/datum/component/squeak, list(honksound=1), 50)
+	AddComponent(/datum/component/squeak, honksounds, 50)

 /obj/item/bikehorn/attack(mob/living/carbon/M, mob/living/carbon/user)
 	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, moodlet, /datum/mood_event/honk)
@@ -124,7 +124,7 @@

 /obj/item/bikehorn/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] solemnly points the horn at [user.p_their()] temple! It looks like [user.p_theyre()] trying to commit suicide!</span>")
-	playsound(src, 'sound/items/bikehorn.ogg', 50, 1)
+	playsound(src, pickweight(honksounds), 50, 1)
 	return (BRUTELOSS)

 //air horn
@@ -132,7 +132,7 @@
 	name = "air horn"
 	desc = "Damn son, where'd you find this?"
 	icon_state = "air_horn"
-	honksound = 'sound/items/airhorn2.ogg'
+	honksounds = list('sound/items/airhorn2.ogg' = 1)

 //golden bikehorn
 /obj/item/bikehorn/golden
@@ -665,10 +665,10 @@
 /obj/item/toy/crayon/spraycan/examine(mob/user)
 	. = ..()
 	if(charges_left)
-		to_chat(user, "It has [charges_left] use\s left.")
+		. += "It has [charges_left] use\s left."
 	else
-		to_chat(user, "It is empty.")
-	to_chat(user, "<span class='notice'>Alt-click [src] to [ is_capped ? "take the cap off" : "put the cap on"].</span>")
+		. += "It is empty."
+	. += "<span class='notice'>Alt-click [src] to [ is_capped ? "take the cap off" : "put the cap on"].</span>"

 /obj/item/toy/crayon/spraycan/afterattack(atom/target, mob/user, proximity, params)
 	if(!proximity)
@@ -829,7 +829,7 @@
 /obj/item/toy/crayon/spraycan/gang/examine(mob/user)
 	. = ..()
 	if(user.mind && user.mind.has_antag_datum(/datum/antagonist/gang) || isobserver(user))
-		to_chat(user, "This spraycan has been specially modified with a stage 2 nozzle kit, making it faster.")
+		. += "This spraycan has been specially modified with a stage 2 nozzle kit, making it faster."

 /obj/item/toy/crayon/spraycan/infinite
 	name = "infinite spraycan"
@@ -103,12 +103,11 @@ GLOBAL_LIST_EMPTY(PDAs)

 /obj/item/pda/examine(mob/user)
 	. = ..()
-	var/dat = id ? "<span class='notice'>Alt-click to remove the id.</span>" : ""
+	. += id ? "<span class='notice'>Alt-click to remove the id.</span>" : ""
 	if(inserted_item && (!isturf(loc)))
-		dat += "\n<span class='notice'>Ctrl-click to remove [inserted_item].</span>"
+		. += "<span class='notice'>Ctrl-click to remove [inserted_item].</span>"
 	if(LAZYLEN(GLOB.pda_reskins))
-		dat += "\n<span class='notice'>Ctrl-shift-click it to reskin it.</span>"
-	to_chat(user, dat)
+		. += "<span class='notice'>Ctrl-shift-click it to reskin it.</span>"

 /obj/item/pda/Initialize()
 	. = ..()
@@ -162,31 +161,33 @@ GLOBAL_LIST_EMPTY(PDAs)

 /obj/item/pda/equipped(mob/user, slot)
 	. = ..()
-	if(equipped)
+	if(equipped || !user.client)
 		return
-	if(user.client)
-		background_color = user.client.prefs.pda_color
-		switch(user.client.prefs.pda_style)
-			if(MONO)
-				font_index = MODE_MONO
-				font_mode = FONT_MONO
-			if(SHARE)
-				font_index = MODE_SHARE
-				font_mode = FONT_SHARE
-			if(ORBITRON)
-				font_index = MODE_ORBITRON
-				font_mode = FONT_ORBITRON
-			if(VT)
-				font_index = MODE_VT
-				font_mode = FONT_VT
-			else
-				font_index = MODE_MONO
-				font_mode = FONT_MONO
-		var/pref_skin = GLOB.pda_reskins[user.client.prefs.pda_skin]
-		if(icon != pref_skin)
-			icon = pref_skin
-			update_icon(FALSE, TRUE)
-		equipped = TRUE
+	update_style(user.client)
+
+/obj/item/pda/proc/update_style(client/C)
+	background_color = C.prefs.pda_color
+	switch(C.prefs.pda_style)
+		if(MONO)
+			font_index = MODE_MONO
+			font_mode = FONT_MONO
+		if(SHARE)
+			font_index = MODE_SHARE
+			font_mode = FONT_SHARE
+		if(ORBITRON)
+			font_index = MODE_ORBITRON
+			font_mode = FONT_ORBITRON
+		if(VT)
+			font_index = MODE_VT
+			font_mode = FONT_VT
+		else
+			font_index = MODE_MONO
+			font_mode = FONT_MONO
+	var/pref_skin = GLOB.pda_reskins[C.prefs.pda_skin]
+	if(icon != pref_skin)
+		icon = pref_skin
+		update_icon(FALSE, TRUE)
+	equipped = TRUE

 /obj/item/pda/proc/update_label()
 	name = "PDA-[owner] ([ownjob])" //Name generalisation
@@ -12,9 +12,9 @@
 	var/mode = 0

 /obj/item/compressionkit/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>It has [charges] charges left. Recharge with bluespace crystals.</span>")
-	to_chat(user, "<span class='notice'>Use in-hand to swap toggle compress/expand mode (expand mode not yet implemented).</span>")
+	. = ..()
+	. += "<span class='notice'>It has [charges] charges left. Recharge with bluespace crystals.</span>"
+	. += "<span class='notice'>Use in-hand to swap toggle compress/expand mode (expand mode not yet implemented).</span>"

 /obj/item/compressionkit/attack_self(mob/user)
 	if(mode == 0)
@@ -0,0 +1,87 @@
+/obj/item/desynchronizer
+	name = "desynchronizer"
+	desc = "An experimental device that can temporarily desynchronize the user from spacetime, effectively making them disappear while it's active."
+	icon = 'icons/obj/device.dmi'
+	icon_state = "desynchronizer"
+	item_state = "electronic"
+	w_class = WEIGHT_CLASS_SMALL
+	item_flags = NOBLUDGEON
+	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
+	materials = list(MAT_METAL = 250, MAT_GLASS = 500)
+	var/max_duration = 3000
+	var/duration = 300
+	var/last_use = 0
+	var/next_use = 0
+	var/obj/effect/abstract/sync_holder/sync_holder
+
+/obj/item/desynchronizer/attack_self(mob/living/user)
+	if(world.time < next_use)
+		to_chat(user, "<span class='warning'>[src] is still recharging.</span>")
+		return
+	if(!sync_holder)
+		desync(user)
+	else
+		resync()
+
+/obj/item/desynchronizer/examine(mob/user)
+	. = ..()
+	if(world.time < next_use)
+		. += "<span class='warning'>Time left to recharge: [DisplayTimeText(next_use - world.time)]</span>"
+	. += "<span class='notice'>Alt-click to customize the duration. Current duration: [DisplayTimeText(duration)].</span>"
+	. += "<span class='notice'>Can be used again to interrupt the effect early. The recharge time is the same as the time spent in desync.</span>"
+
+/obj/item/desynchronizer/AltClick(mob/living/user)
+	if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
+		return
+	var/new_duration = input(user, "Set the duration (5-300):", "Desynchronizer", duration / 10) as null|num
+	if(new_duration)
+		new_duration = new_duration SECONDS
+		new_duration = CLAMP(new_duration, 50, max_duration)
+		duration = new_duration
+		to_chat(user, "<span class='notice'>You set the duration to [DisplayTimeText(duration)].</span>")
+
+/obj/item/desynchronizer/proc/desync(mob/living/user)
+	if(sync_holder)
+		return
+	sync_holder = new(drop_location())
+	new /obj/effect/temp_visual/desynchronizer(drop_location())
+	to_chat(user, "<span class='notice'>You activate [src], desynchronizing yourself from the present. You can still see your surroundings, but you feel eerily dissociated from reality.</span>")
+	user.forceMove(sync_holder)
+	SEND_SIGNAL(user, COMSIG_MOVABLE_SECLUDED_LOCATION)
+	for(var/thing in user)
+		var/atom/movable/AM = thing
+		SEND_SIGNAL(AM, COMSIG_MOVABLE_SECLUDED_LOCATION)
+	last_use = world.time
+	icon_state = "desynchronizer-on"
+	addtimer(CALLBACK(src, .proc/resync), duration)
+
+/obj/item/desynchronizer/proc/resync()
+	new /obj/effect/temp_visual/desynchronizer(sync_holder.drop_location())
+	QDEL_NULL(sync_holder)
+	icon_state = initial(icon_state)
+	next_use = world.time + (world.time - last_use) // Could be 2*world.time-last_use but that would just be confusing
+
+/obj/item/desynchronizer/Destroy()
+	resync()
+	return ..()
+
+/obj/effect/abstract/sync_holder
+	name = "desyncronized pocket"
+	desc = "A pocket in spacetime, keeping the user a fraction of a second in the future."
+	icon = null
+	icon_state = null
+	alpha = 0
+	invisibility = INVISIBILITY_ABSTRACT
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+	anchored = TRUE
+	resistance_flags = INDESTRUCTIBLE
+
+/obj/effect/abstract/sync_holder/Destroy()
+	for(var/I in contents)
+		var/atom/movable/AM = I
+		AM.forceMove(drop_location())
+	return ..()
+
+/obj/effect/abstract/sync_holder/AllowDrop()
+	return TRUE //no dropping spaghetti out of your spacetime pocket
@@ -35,8 +35,8 @@
 	return ..()

 /obj/item/doorCharge/examine(mob/user)
-	..()
+	. = ..()
 	if(user.mind && user.mind.has_antag_datum(/datum/antagonist/traitor)) //No nuke ops because the device is excluded from nuclear
-		to_chat(user, "A small explosive device that can be used to sabotage airlocks to cause an explosion upon opening. To apply, remove the airlock's maintenance panel and place it within.")
+		. += "A small explosive device that can be used to sabotage airlocks to cause an explosion upon opening. To apply, remove the airlock's maintenance panel and place it within."
 	else
-		to_chat(user, "A small, suspicious object that feels lukewarm when held.")
+		. += "A small, suspicious object that feels lukewarm when held."
@@ -16,11 +16,11 @@
 	maptext = "[circuits]"

 /obj/item/electroadaptive_pseudocircuit/examine(mob/user)
-	..()
+	. = ..()
 	if(iscyborg(user))
-		to_chat(user, "<span class='notice'>It has material for <b>[circuits]</b> circuit[circuits == 1 ? "" : "s"]. Use the pseudocircuit on existing circuits to gain material.</span>")
-		to_chat(user, "<span class='notice'>Serves as a substitute for <b>fire/air alarm</b>, <b>firelock</b>, and <b>APC</b> electronics.</span>")
-		to_chat(user, "<span class='notice'>It can also be used on an APC with no power cell to <b>fabricate a low-capacity cell</b> at a high power cost.</span>")
+		. += "<span class='notice'>It has material for <b>[circuits]</b> circuit[circuits == 1 ? "" : "s"]. Use the pseudocircuit on existing circuits to gain material.</span>"
+		. += "<span class='notice'>Serves as a substitute for <b>fire/air alarm</b>, <b>firelock</b>, and <b>APC</b> electronics.</span>"
+		. += "<span class='notice'>It can also be used on an APC with no power cell to <b>fabricate a low-capacity cell</b> at a high power cost.</span>"

 /obj/item/electroadaptive_pseudocircuit/proc/adapt_circuit(mob/living/silicon/robot/R, circuit_cost = 0)
 	if(QDELETED(R) || !istype(R))
@@ -52,9 +52,9 @@
 			qdel(F)

 /obj/item/forcefield_projector/examine(mob/user)
-	..()
+	. = ..()
 	var/percent_charge = round((shield_integrity/max_shield_integrity)*100)
-	to_chat(user, "<span class='notice'>It is currently sustaining [LAZYLEN(current_fields)]/[max_fields] fields, and it's [percent_charge]% charged.</span>")
+	. += "<span class='notice'>It is currently sustaining [LAZYLEN(current_fields)]/[max_fields] fields, and it's [percent_charge]% charged.</span>"

 /obj/item/forcefield_projector/Initialize(mapload)
 	. = ..()
@@ -63,28 +63,28 @@
 	current_tick_amount = 0

 /obj/item/geiger_counter/examine(mob/user)
-	..()
+	. = ..()
 	if(!scanning)
-		return 1
-	to_chat(user, "<span class='info'>Alt-click it to clear stored radiation levels.</span>")
+		return
+	. += "<span class='info'>Alt-click it to clear stored radiation levels.</span>"
 	if(obj_flags & EMAGGED)
-		to_chat(user, "<span class='warning'>The display seems to be incomprehensible.</span>")
-		return 1
+		. += "<span class='warning'>The display seems to be incomprehensible.</span>"
+		return
 	switch(radiation_count)
 		if(-INFINITY to RAD_LEVEL_NORMAL)
-			to_chat(user, "<span class='notice'>Ambient radiation level count reports that all is well.</span>")
+			. += "<span class='notice'>Ambient radiation level count reports that all is well.</span>"
 		if(RAD_LEVEL_NORMAL + 1 to RAD_LEVEL_MODERATE)
-			to_chat(user, "<span class='disarm'>Ambient radiation levels slightly above average.</span>")
+			. += "<span class='disarm'>Ambient radiation levels slightly above average.</span>"
 		if(RAD_LEVEL_MODERATE + 1 to RAD_LEVEL_HIGH)
-			to_chat(user, "<span class='warning'>Ambient radiation levels above average.</span>")
+			. += "<span class='warning'>Ambient radiation levels above average.</span>"
 		if(RAD_LEVEL_HIGH + 1 to RAD_LEVEL_VERY_HIGH)
-			to_chat(user, "<span class='danger'>Ambient radiation levels highly above average.</span>")
+			. += "<span class='danger'>Ambient radiation levels highly above average.</span>"
 		if(RAD_LEVEL_VERY_HIGH + 1 to RAD_LEVEL_CRITICAL)
-			to_chat(user, "<span class='suicide'>Ambient radiation levels nearing critical level.</span>")
+			. += "<span class='suicide'>Ambient radiation levels nearing critical level.</span>"
 		if(RAD_LEVEL_CRITICAL + 1 to INFINITY)
-			to_chat(user, "<span class='boldannounce'>Ambient radiation levels above critical level!</span>")
+			. += "<span class='boldannounce'>Ambient radiation levels above critical level!</span>"

-	to_chat(user, "<span class='notice'>The last radiation amount detected was [last_tick_amount]</span>")
+	. += "<span class='notice'>The last radiation amount detected was [last_tick_amount]</span>"

 /obj/item/geiger_counter/update_icon()
 	if(!scanning)
@@ -14,10 +14,10 @@ GLOBAL_LIST_EMPTY(GPS_list)
 	var/global_mode = TRUE //If disabled, only GPS signals of the same Z level are shown

 /obj/item/gps/examine(mob/user)
-	..()
+	. = ..()
 	var/turf/curr = get_turf(src)
-	to_chat(user, "The screen says: [get_area_name(curr, TRUE)] ([curr.x], [curr.y], [curr.z])")
-	to_chat(user, "<span class='notice'>Alt-click to switch it [tracking ? "off":"on"].</span>")
+	. += "The screen says: [get_area_name(curr, TRUE)] ([curr.x], [curr.y], [curr.z])"
+	. += "<span class='notice'>Alt-click to switch it [tracking ? "off":"on"].</span>"

 /obj/item/gps/Initialize()
 	. = ..()
@@ -73,8 +73,8 @@
 	..()

 /obj/item/lightreplacer/examine(mob/user)
-	..()
-	to_chat(user, status_string())
+	. = ..()
+	. += status_string()

 /obj/item/lightreplacer/attackby(obj/item/W, mob/user, params)

@@ -51,11 +51,11 @@
 	AddComponent(/datum/component/anti_magic, TRUE, TRUE, FALSE, null, null, FALSE)

 /obj/item/multitool/examine(mob/user)
-	..()
+	. = ..()
 	if(selected_io)
-		to_chat(user, "<span class='notice'>Activate [src] to detach the data wire.</span>")
+		. += "<span class='notice'>Activate [src] to detach the data wire.</span>"
 	if(buffer)
-		to_chat(user, "<span class='notice'>Its buffer contains [buffer].</span>")
+		. += "<span class='notice'>Its buffer contains [buffer].</span>"

 /obj/item/multitool/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] puts the [src] to [user.p_their()] chest. It looks like [user.p_theyre()] trying to pulse [user.p_their()] heart off!</span>")
@@ -26,5 +26,5 @@
 	paint_color = input("Which colour do you want to use?","Pipe painter") in GLOB.pipe_paint_colors

 /obj/item/pipe_painter/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>It is set to [paint_color].</span>")
+	. = ..()
+	. += "<span class='notice'>It is set to [paint_color].</span>"
@@ -10,12 +10,12 @@
 	var/obj/machinery/quantumpad/qpad

 /obj/item/quantum_keycard/examine(mob/user)
-	..()
+	. = ..()
 	if(qpad)
-		to_chat(user, "It's currently linked to a quantum pad.")
-		to_chat(user, "<span class='notice'>Alt-click to unlink the keycard.</span>")
+		. += "It's currently linked to a quantum pad."
+		. += "<span class='notice'>Alt-click to unlink the keycard.</span>"
 	else
-		to_chat(user, "<span class='notice'>Insert [src] into an active quantum pad to link it.</span>")
+		. += "<span class='notice'>Insert [src] into an active quantum pad to link it.</span>"

 /obj/item/quantum_keycard/AltClick(mob/living/user)
 	if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
@@ -21,7 +21,7 @@
 		for(var/i in channels)
 			examine_text_list += "[GLOB.channel_tokens[i]] - [lowertext(i)]"

-		to_chat(user, "<span class='notice'>It can access the following channels; [jointext(examine_text_list, ", ")].</span>")
+		. += "<span class='notice'>It can access the following channels; [jointext(examine_text_list, ", ")].</span>"

 /obj/item/encryptionkey/syndicate
 	name = "syndicate encryption key"
@@ -32,7 +32,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
 	return TOXLOSS

 /obj/item/radio/headset/examine(mob/user)
-	..()
+	. = ..()

 	if(item_flags & IN_INVENTORY && loc == user)
 		// construction of frequency description
@@ -45,12 +45,12 @@ GLOBAL_LIST_INIT(channel_tokens, list(
 					avail_chans += "use [MODE_TOKEN_DEPARTMENT] or [GLOB.channel_tokens[channels[i]]] for [lowertext(channels[i])]"
 				else
 					avail_chans += "use [GLOB.channel_tokens[channels[i]]] for [lowertext(channels[i])]"
-		to_chat(user, "<span class='notice'>A small screen on the headset displays the following available frequencies:\n[english_list(avail_chans)].")
+		. += "<span class='notice'>A small screen on the headset displays the following available frequencies:\n[english_list(avail_chans)]."

 		if(command)
-			to_chat(user, "<span class='info'>Alt-click to toggle the high-volume mode.</span>")
+			. += "<span class='info'>Alt-click to toggle the high-volume mode.</span>"
 	else
-		to_chat(user, "<span class='notice'>A small screen on the headset flashes, it's too small to read without holding or wearing the headset.</span>")
+		. += "<span class='notice'>A small screen on the headset flashes, it's too small to read without holding or wearing the headset.</span>"

 /obj/item/radio/headset/Initialize()
 	. = ..()
@@ -49,11 +49,11 @@
 	return ..()

 /obj/item/radio/intercom/examine(mob/user)
-	..()
+	. = ..()
 	if(!unfastened)
-		to_chat(user, "<span class='notice'>It's <b>screwed</b> and secured to the wall.</span>")
+		. += "<span class='notice'>It's <b>screwed</b> and secured to the wall.</span>"
 	else
-		to_chat(user, "<span class='notice'>It's <i>unscrewed</i> from the wall, and can be <b>detached</b>.</span>")
+		. += "<span class='notice'>It's <i>unscrewed</i> from the wall, and can be <b>detached</b>.</span>"

 /obj/item/radio/intercom/attackby(obj/item/I, mob/living/user, params)
 	if(istype(I, /obj/item/screwdriver))
@@ -319,11 +319,11 @@


 /obj/item/radio/examine(mob/user)
-	..()
+	. = ..()
 	if (unscrewed)
-		to_chat(user, "<span class='notice'>It can be attached and modified.</span>")
+		. += "<span class='notice'>It can be attached and modified.</span>"
 	else
-		to_chat(user, "<span class='notice'>It cannot be modified or attached.</span>")
+		. += "<span class='notice'>It cannot be modified or attached.</span>"

 /obj/item/radio/attackby(obj/item/W, mob/user, params)
 	add_fingerprint(user)
@@ -382,7 +382,7 @@ SLIME SCANNER
 		else if (S.mutantstomach != initial(S.mutantstomach))
 			mutant = TRUE

-		msg += "\t<span class='info'>Reported Species: [H.dna.custom_species ? H.dna.custom_species : S.name]</span>\n" 
+		msg += "\t<span class='info'>Reported Species: [H.dna.custom_species ? H.dna.custom_species : S.name]</span>\n"
 		msg += "\t<span class='info'>Base Species: [S.name]</span>\n"
 		if(mutant)
 			msg += "\t<span class='info'>Subject has mutations present.</span>\n"
@@ -523,7 +523,7 @@ SLIME SCANNER

 /obj/item/analyzer/examine(mob/user)
 	. = ..()
-	to_chat(user, "<span class='notice'>Alt-click [src] to activate the barometer function.</span>")
+	. += "<span class='notice'>Alt-click [src] to activate the barometer function.</span>"

 /obj/item/analyzer/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] begins to analyze [user.p_them()]self with [src]! The display shows that [user.p_theyre()] dead!</span>")
@@ -29,8 +29,8 @@


 /obj/item/taperecorder/examine(mob/user)
-	..()
-	to_chat(user, "The wire panel is [open_panel ? "opened" : "closed"].")
+	. = ..()
+	. += "The wire panel is [open_panel ? "opened" : "closed"]."


 /obj/item/taperecorder/attackby(obj/item/I, mob/user, params)
@@ -106,11 +106,11 @@
 		return ..()

 /obj/item/extinguisher/examine(mob/user)
-	..()
-	to_chat(user, "The safety is [safety ? "on" : "off"].")
+	. = ..()
+	. += "The safety is [safety ? "on" : "off"]."

 	if(reagents.total_volume)
-		to_chat(user, "<span class='notice'>You can loose its <b>screws</b> to empty it.</span>")
+		. += "<span class='notice'>You can loose its <b>screws</b> to empty it.</span>"

 /obj/item/extinguisher/proc/AttemptRefill(atom/target, mob/user)
 	if(istype(target, tanktype) && target.Adjacent(user))
@@ -145,9 +145,9 @@
 		update_icon()

 /obj/item/flamethrower/examine(mob/user)
-	..()
+	. = ..()
 	if(ptank)
-		to_chat(user, "<span class='notice'>\The [src] has \a [ptank] attached. Alt-click to remove it.</span>")
+		. += "<span class='notice'>\The [src] has \a [ptank] attached. Alt-click to remove it.</span>"

 /obj/item/flamethrower/proc/toggle_igniter(mob/user)
 	if(!ptank)
@@ -27,19 +27,19 @@

 /obj/item/grenade/chem_grenade/examine(mob/user)
 	display_timer = (stage == READY && !nadeassembly)	//show/hide the timer based on assembly state
-	..()
+	. = ..()
 	if(user.can_see_reagents())
 		var/count = 0
 		if(beakers.len)
-			to_chat(user, "<span class='notice'>You scan the grenade and detect the following reagents:</span>")
+			. += "<span class='notice'>You scan the grenade and detect the following reagents:</span>"
 			for(var/obj/item/reagent_containers/glass/G in beakers)
 				var/textcount = thtotext(++count)
 				for(var/datum/reagent/R in G.reagents.reagent_list)
-					to_chat(user, "<span class='notice'>[R.volume] units of [R.name] in the [textcount] beaker.</span>")
+					. += "<span class='notice'>[R.volume] units of [R.name] in the [textcount] beaker.</span>"
 			if(beakers.len == 1)
-				to_chat(user, "<span class='notice'>You detect no second beaker in the grenade.</span>")
+				. += "<span class='notice'>You detect no second beaker in the grenade.</span>"
 		else
-			to_chat(user, "<span class='notice'>You scan the grenade, but detect nothing.</span>")
+			. += "<span class='notice'>You scan the grenade, but detect nothing.</span>"


 /obj/item/grenade/chem_grenade/attack_self(mob/user)
@@ -56,5 +56,5 @@
 	qdel(src)

 /obj/item/grenade/iedcasing/examine(mob/user)
-	..()
-	to_chat(user, "You can't tell when it will explode!")
+	. = ..()
+	. += "You can't tell when it will explode!"
@@ -47,12 +47,12 @@


 /obj/item/grenade/examine(mob/user)
-	..()
+	. = ..()
 	if(display_timer)
 		if(det_time > 1)
-			to_chat(user, "The timer is set to [DisplayTimeText(det_time)].")
+			. += "The timer is set to [DisplayTimeText(det_time)]."
 		else
-			to_chat(user, "\The [src] is set for instant detonation.")
+			. += "\The [src] is set for instant detonation."


 /obj/item/grenade/attack_self(mob/user)
@@ -52,23 +52,23 @@
 	return

 /obj/item/his_grace/examine(mob/user)
-	..()
+	. = ..()
 	if(awakened)
 		switch(bloodthirst)
 			if(HIS_GRACE_SATIATED to HIS_GRACE_PECKISH)
-				to_chat(user, "<span class='his_grace'>[src] isn't very hungry. Not yet.</span>")
+				. += "<span class='his_grace'>[src] isn't very hungry. Not yet.</span>"
 			if(HIS_GRACE_PECKISH to HIS_GRACE_HUNGRY)
-				to_chat(user, "<span class='his_grace'>[src] would like a snack.</span>")
+				. += "<span class='his_grace'>[src] would like a snack.</span>"
 			if(HIS_GRACE_HUNGRY to HIS_GRACE_FAMISHED)
-				to_chat(user, "<span class='his_grace'>[src] is quite hungry now.</span>")
+				. += "<span class='his_grace'>[src] is quite hungry now.</span>"
 			if(HIS_GRACE_FAMISHED to HIS_GRACE_STARVING)
-				to_chat(user, "<span class='his_grace'>[src] is openly salivating at the sight of you. Be careful.</span>")
+				. += "<span class='his_grace'>[src] is openly salivating at the sight of you. Be careful.</span>"
 			if(HIS_GRACE_STARVING to HIS_GRACE_CONSUME_OWNER)
-				to_chat(user, "<span class='his_grace bold'>You walk a fine line. [src] is very close to devouring you.</span>")
+				. += "<span class='his_grace bold'>You walk a fine line. [src] is very close to devouring you.</span>"
 			if(HIS_GRACE_CONSUME_OWNER to HIS_GRACE_FALL_ASLEEP)
-				to_chat(user, "<span class='his_grace bold'>[src] is shaking violently and staring directly at you.</span>")
+				. += "<span class='his_grace bold'>[src] is shaking violently and staring directly at you.</span>"
 	else
-		to_chat(user, "<span class='his_grace'>[src] is latched closed.</span>")
+		. += "<span class='his_grace'>[src] is latched closed.</span>"

 /obj/item/his_grace/relaymove(mob/living/user) //Allows changelings, etc. to climb out of Him after they revive, provided He isn't active
 	if(!awakened)
@@ -81,9 +81,9 @@
 /obj/item/hot_potato/examine(mob/user)
 	. = ..()
 	if(active)
-		to_chat(user, "<span class='warning'>[src] is flashing red-hot! You should probably get rid of it!</span>")
+		. += "<span class='warning'>[src] is flashing red-hot! You should probably get rid of it!</span>"
 		if(show_timer)
-			to_chat(user, "<span class='warning'>[src]'s timer looks to be at [DisplayTimeText(activation_time - world.time)]!</span>")
+			. += "<span class='warning'>[src]'s timer looks to be at [DisplayTimeText(activation_time - world.time)]!</span>"

 /obj/item/hot_potato/equipped(mob/user)
 	. = ..()
@@ -155,13 +155,13 @@


 /obj/item/inducer/examine(mob/living/M)
-	..()
+	. = ..()
 	if(cell)
-		to_chat(M, "<span class='notice'>Its display shows: [DisplayEnergy(cell.charge)].</span>")
+		. += "<span class='notice'>Its display shows: [DisplayEnergy(cell.charge)].</span>"
 	else
-		to_chat(M,"<span class='notice'>Its display is dark.</span>")
+		. += "<span class='notice'>Its display is dark.</span>"
 	if(opened)
-		to_chat(M,"<span class='notice'>Its battery compartment is open.</span>")
+		. += "<span class='notice'>Its battery compartment is open.</span>"

 /obj/item/inducer/update_icon()
 	cut_overlays()
@@ -334,8 +334,8 @@
 		update_light()

 /obj/item/melee/transforming/energy/sword/cx/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>Alt-click to recolor it.</span>")
+	. = ..()
+	. += "<span class='notice'>Alt-click to recolor it.</span>"

 /obj/item/melee/transforming/energy/sword/cx/worn_overlays(isinhands, icon_file)
 	. = ..()
@@ -119,8 +119,8 @@
 		reagents.add_reagent(refill_reagent, refill_rate)

 /obj/item/mop/advanced/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>The condenser switch is set to <b>[refill_enabled ? "ON" : "OFF"]</b>.</span>")
+	. = ..()
+	. += "<span class='notice'>The condenser switch is set to <b>[refill_enabled ? "ON" : "OFF"]</b>.</span>"

 /obj/item/mop/advanced/Destroy()
 	if(refill_enabled)
@@ -43,17 +43,17 @@
 	..()

 /obj/item/pet_carrier/examine(mob/user)
-	..()
+	. = ..()
 	if(occupants.len)
 		for(var/V in occupants)
 			var/mob/living/L = V
-			to_chat(user, "<span class='notice'>It has [L] inside.</span>")
+			. += "<span class='notice'>It has [L] inside.</span>"
 	else
-		to_chat(user, "<span class='notice'>It has nothing inside.</span>")
+		. += "<span class='notice'>It has nothing inside.</span>"
 	if(user.canUseTopic(src))
-		to_chat(user, "<span class='notice'>Activate it in your hand to [open ? "close" : "open"] its door.</span>")
+		. += "<span class='notice'>Activate it in your hand to [open ? "close" : "open"] its door.</span>"
 		if(!open)
-			to_chat(user, "<span class='notice'>Alt-click to [locked ? "unlock" : "lock"] its door.</span>")
+			. += "<span class='notice'>Alt-click to [locked ? "unlock" : "lock"] its door.</span>"

 /obj/item/pet_carrier/attack_self(mob/living/user)
 	if(open)
@@ -55,17 +55,15 @@
 	return automatic

 /obj/item/pneumatic_cannon/examine(mob/user)
-	..()
-	var/list/out = list()
+	. = ..()
 	if(!in_range(user, src))
-		out += "<span class='notice'>You'll need to get closer to see any more.</span>"
+		. += "<span class='notice'>You'll need to get closer to see any more.</span>"
 		return
 	for(var/obj/item/I in loadedItems)
-		out += "<span class='info'>[icon2html(I, user)] It has \a [I] loaded.</span>"
+		. += "<span class='info'>[icon2html(I, user)] It has \a [I] loaded.</span>"
 		CHECK_TICK
 	if(tank)
-		out += "<span class='notice'>[icon2html(tank, user)] It has \a [tank] mounted onto it.</span>"
-	to_chat(user, out.Join("<br>"))
+		. += "<span class='notice'>[icon2html(tank, user)] It has \a [tank] mounted onto it.</span>"

 /obj/item/pneumatic_cannon/attackby(obj/item/W, mob/user, params)
 	if(user.a_intent == INTENT_HARM)
@@ -20,12 +20,12 @@


 /obj/item/melee/powerfist/examine(mob/user)
-	..()
+	. = ..()
 	if(!in_range(user, src))
-		to_chat(user, "<span class='notice'>You'll need to get closer to see any more.</span>")
+		. += "<span class='notice'>You'll need to get closer to see any more.</span>"
 		return
 	if(tank)
-		to_chat(user, "<span class='notice'>[icon2html(tank, user)] It has \a [tank] mounted onto it.</span>")
+		. += "<span class='notice'>[icon2html(tank, user)] It has \a [tank] mounted onto it.</span>"


 /obj/item/melee/powerfist/attackby(obj/item/W, mob/user, params)
@@ -16,9 +16,9 @@
 	var/warcry

 /obj/item/banner/examine(mob/user)
-	..()
+	. = ..()
 	if(inspiration_available)
-		to_chat(user, "<span class='notice'>Activate it in your hand to inspire nearby allies of this banner's allegiance!</span>")
+		. += "<span class='notice'>Activate it in your hand to inspire nearby allies of this banner's allegiance!</span>"

 /obj/item/banner/attack_self(mob/living/carbon/human/user)
 	if(!inspiration_available)
@@ -76,23 +76,23 @@
 	. = ..()

 /obj/item/stack/examine(mob/user)
-	..()
+	. = ..()
 	if (is_cyborg)
 		if(singular_name)
-			to_chat(user, "There is enough energy for [get_amount()] [singular_name]\s.")
+			. += "There is enough energy for [get_amount()] [singular_name]\s."
 		else
-			to_chat(user, "There is enough energy for [get_amount()].")
+			. += "There is enough energy for [get_amount()]."
 		return
 	if(singular_name)
 		if(get_amount()>1)
-			to_chat(user, "There are [get_amount()] [singular_name]\s in the stack.")
+			. += "There are [get_amount()] [singular_name]\s in the stack."
 		else
-			to_chat(user, "There is [get_amount()] [singular_name] in the stack.")
+			. += "There is [get_amount()] [singular_name] in the stack."
 	else if(get_amount()>1)
-		to_chat(user, "There are [get_amount()] in the stack.")
+		. += "There are [get_amount()] in the stack."
 	else
-		to_chat(user, "There is [get_amount()] in the stack.")
-	to_chat(user, "<span class='notice'>Alt-click to take a custom amount.</span>")
+		. += "There is [get_amount()] in the stack."
+	. += "<span class='notice'>Alt-click to take a custom amount.</span>"

 /obj/item/stack/proc/get_amount()
 	if(is_cyborg)
@@ -73,6 +73,15 @@
 	turf_type = /turf/open/floor/grass
 	resistance_flags = FLAMMABLE

+//Fairygrass
+/obj/item/stack/tile/fairygrass
+	name = "fairygrass tile"
+	singular_name = "fairygrass floor tile"
+	desc = "A patch of odd, glowing blue grass."
+	icon_state = "tile_fairygrass"
+	item_state = "tile-fairygrass"
+	turf_type = /turf/open/floor/grass/fairy
+	resistance_flags = FLAMMABLE

 //Wood
 /obj/item/stack/tile/wood
@@ -60,7 +60,7 @@
 	. = ..()
 	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
 	STR.allow_big_nesting = TRUE
-	STR.max_w_class = WEIGHT_CLASS_GIGANTIC
+	STR.max_w_class = WEIGHT_CLASS_BULKY
 	STR.max_combined_w_class = 35

 /obj/item/storage/backpack/holding/suicide_act(mob/living/user)
@@ -757,9 +757,9 @@
 	STR.can_hold = typecacheof(fitting_swords)

 /obj/item/storage/belt/sabre/examine(mob/user)
-	..()
+	. = ..()
 	if(length(contents))
-		to_chat(user, "<span class='notice'>Alt-click it to quickly draw the blade.</span>")
+		. += "<span class='notice'>Alt-click it to quickly draw the blade.</span>"

 /obj/item/storage/belt/sabre/AltClick(mob/user)
 	if(!iscarbon(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
@@ -36,12 +36,12 @@
 		icon_state = "[icon_type]box"

 /obj/item/storage/fancy/examine(mob/user)
-	..()
+	. = ..()
 	if(fancy_open)
 		if(length(contents) == 1)
-			to_chat(user, "There is one [icon_type] left.")
+			. += "There is one [icon_type] left."
 		else
-			to_chat(user, "There are [contents.len <= 0 ? "no" : "[contents.len]"] [icon_type]s left.")
+			. += "There are [contents.len <= 0 ? "no" : "[contents.len]"] [icon_type]s left."

 /obj/item/storage/fancy/attack_self(mob/user)
 	fancy_open = !fancy_open
@@ -143,8 +143,8 @@
 	STR.can_hold = typecacheof(list(/obj/item/clothing/mask/cigarette, /obj/item/lighter))

 /obj/item/storage/fancy/cigarettes/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>Alt-click to extract contents.</span>")
+	. = ..()
+	. += "<span class='notice'>Alt-click to extract contents.</span>"

 /obj/item/storage/fancy/cigarettes/AltClick(mob/living/carbon/user)
 	if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
@@ -108,10 +108,10 @@
 	STR.can_hold = typecacheof(list(/obj/item/clothing/accessory/medal))

 /obj/item/storage/lockbox/medal/examine(mob/user)
-	..()
+	. = ..()
 	var/locked = SEND_SIGNAL(src, COMSIG_IS_STORAGE_LOCKED)
 	if(!locked)
-		to_chat(user, "<span class='notice'>Alt-click to [open ? "close":"open"] it.</span>")
+		. += "<span class='notice'>Alt-click to [open ? "close":"open"] it.</span>"

 /obj/item/storage/lockbox/medal/AltClick(mob/user)
 	if(user.canUseTopic(src, BE_CLOSE))
@@ -31,8 +31,8 @@
 	STR.max_combined_w_class = 14

 /obj/item/storage/secure/examine(mob/user)
-	..()
-	to_chat(user, text("The service panel is currently <b>[open ? "unscrewed" : "screwed shut"]</b>."))
+	. = ..()
+	. += "The service panel is currently <b>[open ? "unscrewed" : "screwed shut"]</b>."

 /obj/item/storage/secure/attackby(obj/item/W, mob/user, params)
 	if(SEND_SIGNAL(src, COMSIG_IS_STORAGE_LOCKED))
@@ -239,8 +239,8 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
 /obj/item/storage/toolbox/gold_real
 	name = "golden toolbox"
 	desc = "A larger then normal toolbox made of gold plated plastitanium."
-	item_state = "gold"
 	icon_state = "gold"
+	item_state = "toolbox_gold"
 	has_latches = FALSE
 	force = 16 // Less then a spear
 	throwforce = 14
@@ -266,7 +266,7 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
 	name = "golden toolbox"
 	desc = "A gold plated toolbox, fancy and harmless due to the gold plating being on cardboard!"
 	icon_state = "gold"
-	item_state = "gold"
+	item_state = "toolbox_gold"
 	has_latches = FALSE
 	force = 0
 	throwforce = 0
@@ -91,9 +91,9 @@
 	. = ..()
 	var/obj/item/stock_parts/cell/copper_top = get_cell()
 	if(copper_top)
-		to_chat(user, "<span class='notice'>\The [src] is [round(copper_top.percent())]% charged.</span>")
+		. += "<span class='notice'>\The [src] is [round(copper_top.percent())]% charged.</span>"
 	else
-		to_chat(user, "<span class='warning'>\The [src] does not have a power source installed.</span>")
+		. += "<span class='warning'>\The [src] does not have a power source installed.</span>"

 /obj/item/melee/baton/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/stock_parts/cell))
@@ -74,15 +74,15 @@

 /obj/item/tank/examine(mob/user)
 	var/obj/icon = src
-	..()
+	. = ..()
 	if (istype(src.loc, /obj/item/assembly))
 		icon = src.loc
 	if(!in_range(src, user))
 		if (icon == src)
-			to_chat(user, "<span class='notice'>If you want any more information you'll need to get closer.</span>")
+			. += "<span class='notice'>If you want any more information you'll need to get closer.</span>"
 		return

-	to_chat(user, "<span class='notice'>The pressure gauge reads [round(src.air_contents.return_pressure(),0.01)] kPa.</span>")
+	. += "<span class='notice'>The pressure gauge reads [round(src.air_contents.return_pressure(),0.01)] kPa.</span>"

 	var/celsius_temperature = src.air_contents.temperature-T0C
 	var/descriptive
@@ -100,7 +100,7 @@
 	else
 		descriptive = "furiously hot"

-	to_chat(user, "<span class='notice'>It feels [descriptive].</span>")
+	. += "<span class='notice'>It feels [descriptive].</span>"

 /obj/item/tank/blob_act(obj/structure/blob/B)
 	if(B && B.loc == loc)
@@ -220,8 +220,8 @@


 /obj/item/weldingtool/examine(mob/user)
-	..()
-	to_chat(user, "It contains [get_fuel()] unit\s of fuel out of [max_fuel].")
+	. = ..()
+	. += "It contains [get_fuel()] unit\s of fuel out of [max_fuel]."

 /obj/item/weldingtool/get_temperature()
 	return welding * heat
@@ -148,8 +148,8 @@
 	var/bullets = 7

 /obj/item/toy/gun/examine(mob/user)
-	..()
-	to_chat(user, "There [bullets == 1 ? "is" : "are"] [bullets] cap\s left.")
+	. = ..()
+	. += "There [bullets == 1 ? "is" : "are"] [bullets] cap\s left."

 /obj/item/toy/gun/attackby(obj/item/toy/ammo/gun/A, mob/user, params)

@@ -204,8 +204,8 @@
 	src.icon_state = text("357OLD-[]", src.amount_left)

 /obj/item/toy/ammo/gun/examine(mob/user)
-	..()
-	to_chat(user, "There [amount_left == 1 ? "is" : "are"] [amount_left] cap\s left.")
+	. = ..()
+	. += "There [amount_left == 1 ? "is" : "are"] [amount_left] cap\s left."

 /*
 * Toy swords
@@ -373,8 +373,8 @@
 		return ..()

 /obj/item/toy/sword/cx/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>Alt-click to recolor it.</span>")
+	. = ..()
+	. += "<span class='notice'>Alt-click to recolor it.</span>"

 /*
 * Foam armblade
@@ -994,8 +994,7 @@
 		if(cardUser.is_holding(src))
 			cardUser.visible_message("[cardUser] checks [cardUser.p_their()] card.", "<span class='notice'>The card reads: [cardname].</span>")
 		else
-			to_chat(cardUser, "<span class='warning'>You need to have the card in your hand to check it!</span>")
-
+			. += "<span class='warning'>You need to have the card in your hand to check it!</span>"

 /obj/item/toy/cards/singlecard/verb/Flip()
 	set name = "Flip Card"
@@ -1221,8 +1220,8 @@
 		to_chat(user, "<span class='alert'>The cogwheels are already turning!</span>")

 /obj/item/toy/clockwork_watch/examine(mob/user)
-	..()
-	to_chat(user, "<span class='info'>Station Time: [STATION_TIME_TIMESTAMP("hh:mm:ss")]")
+	. = ..()
+	. += "<span class='info'>Station Time: [STATION_TIME_TIMESTAMP("hh:mm:ss")]"

 /*
 * Toy Dagger
@@ -566,9 +566,9 @@
 			. += blade_inhand

 /obj/item/twohanded/dualsaber/hypereutactic/examine(mob/user)
-	..()
+	. = ..()
 	if(!hacked)
-		to_chat(user, "<span class='notice'>Alt-click to recolor it.</span>")
+		. += "<span class='notice'>Alt-click to recolor it.</span>"

 /obj/item/twohanded/dualsaber/hypereutactic/rainbow_process()
 	. = ..()
@@ -634,9 +634,9 @@
 	AddComponent(/datum/component/jousting)

 /obj/item/twohanded/spear/examine(mob/user)
-	..()
+	. = ..()
 	if(explosive)
-		to_chat(user, "<span class='notice'>Use in your hands to activate the attached explosive.</span><br><span class='notice'>Alt-click to set your war cry.</span><br><span class='notice'>Right-click in combat mode to wield</span>")
+		. += "<span class='notice'>Use in your hands to activate the attached explosive.</span><br><span class='notice'>Alt-click to set your war cry.</span><br><span class='notice'>Right-click in combat mode to wield</span>"

 /obj/item/twohanded/spear/update_icon()
 	if(explosive)
@@ -30,14 +30,14 @@
 	name = "\improper [machine_name] restocking unit"

 /obj/item/vending_refill/examine(mob/user)
-	..()
+	. = ..()
 	var/num = get_part_rating()
 	if (num == INFINITY)
-		to_chat(user, "It's sealed tight, completely full of supplies.")
+		. += "It's sealed tight, completely full of supplies."
 	else if (num == 0)
-		to_chat(user, "It's empty!")
+		. += "It's empty!"
 	else
-		to_chat(user, "It can restock [num] item\s.")
+		. += "It can restock [num] item\s."

 /obj/item/vending_refill/get_part_rating()
 	if (!products || !contraband || !premium)
@@ -125,10 +125,10 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 		qdel(src) //If this ever happens, it's because you lost an arm

 /obj/item/claymore/highlander/examine(mob/user)
-	..()
-	to_chat(user, "It has [!notches ? "nothing" : "[notches] notches"] scratched into the blade.")
+	. = ..()
+	. += "It has [!notches ? "nothing" : "[notches] notches"] scratched into the blade."
 	if(nuke_disk)
-		to_chat(user, "<span class='boldwarning'>It's holding the nuke disk!</span>")
+		. += "<span class='boldwarning'>It's holding the nuke disk!</span>"

 /obj/item/claymore/highlander/attack(mob/living/target, mob/living/user)
 	. = ..()
@@ -216,7 +216,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 	slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
 	force = 40
 	throwforce = 10
-	w_class = WEIGHT_CLASS_HUGE
+	w_class = WEIGHT_CLASS_BULKY
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	block_chance = 50
@@ -427,7 +427,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 	lefthand_file = 'icons/mob/inhands/weapons/chainsaw_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/chainsaw_righthand.dmi'
 	item_flags = ABSTRACT | DROPDEL
-	w_class = WEIGHT_CLASS_HUGE
+	w_class = WEIGHT_CLASS_BULKY
 	force = 24
 	throwforce = 0
 	throw_range = 0
@@ -512,7 +512,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 	force = 10
 	throwforce = 12
 	attack_verb = list("beat", "smacked")
-	w_class = WEIGHT_CLASS_HUGE
+	w_class = WEIGHT_CLASS_BULKY
 	var/homerun_ready = 0
 	var/homerun_able = 0
 	total_mass = 2.7 //a regular wooden major league baseball bat weighs somewhere between 2 to 3.4 pounds, according to google
@@ -224,11 +224,11 @@
 	.["Modify armor values"] = "?_src_=vars;[HrefToken()];modarmor=[REF(src)]"

 /obj/examine(mob/user)
-	..()
+	. = ..()
 	if(obj_flags & UNIQUE_RENAME)
-		to_chat(user, "<span class='notice'>Use a pen on it to rename it or change its description.</span>")
+		. += "<span class='notice'>Use a pen on it to rename it or change its description.</span>"
 	if(unique_reskin && (!current_skin || always_reskinnable))
-		to_chat(user, "<span class='notice'>Alt-click it to reskin it.</span>")
+		. += "<span class='notice'>Alt-click it to reskin it.</span>"

 /obj/AltClick(mob/user)
 	. = ..()
@@ -89,15 +89,15 @@
 	structureclimber = null

 /obj/structure/examine(mob/user)
-	..()
+	. = ..()
 	if(!(resistance_flags & INDESTRUCTIBLE))
 		if(resistance_flags & ON_FIRE)
-			to_chat(user, "<span class='warning'>It's on fire!</span>")
+			. += "<span class='warning'>It's on fire!</span>"
 		if(broken)
-			to_chat(user, "<span class='notice'>It appears to be broken.</span>")
+			. += "<span class='notice'>It appears to be broken.</span>"
 		var/examine_status = examine_status(user)
 		if(examine_status)
-			to_chat(user, examine_status)
+			. +=  examine_status

 /obj/structure/proc/examine_status(mob/user) //An overridable proc, mostly for falsewalls.
 	var/healthpercent = (obj_integrity/max_integrity) * 100
@@ -39,7 +39,7 @@

 /obj/structure/AIcore/latejoin_inactive/examine(mob/user)
 	. = ..()
-	to_chat(user, "Its transmitter seems to be [active? "on" : "off"].")
+	. += "Its transmitter seems to be [active? "on" : "off"]."

 /obj/structure/AIcore/latejoin_inactive/proc/is_available()			//If people still manage to use this feature to spawn-kill AI latejoins ahelp them.
 	if(!available)
@@ -23,9 +23,9 @@
 	var/bolts = TRUE

 /obj/structure/bed/examine(mob/user)
-	..()
+	. = ..()
 	if(bolts)
-		to_chat(user, "<span class='notice'>It's held together by a couple of <b>bolts</b>.</span>")
+		. += "<span class='notice'>It's held together by a couple of <b>bolts</b>.</span>"

 /obj/structure/bed/deconstruct(disassembled = TRUE)
 	if(!(flags_1 & NODECONSTRUCT_1))
@@ -148,8 +148,8 @@
 	..()

 /obj/item/roller/robo/examine(mob/user)
-	..()
-	to_chat(user, "The dock is [loaded ? "loaded" : "empty"].")
+	. = ..()
+	. += "The dock is [loaded ? "loaded" : "empty"]."

 /obj/item/roller/robo/deploy_roller(mob/user, atom/location)
 	if(loaded)
@@ -15,10 +15,10 @@
 	layer = OBJ_LAYER

 /obj/structure/chair/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>It's held together by a couple of <b>bolts</b>.</span>")
+	. = ..()
+	. += "<span class='notice'>It's held together by a couple of <b>bolts</b>.</span>"
 	if(!has_buckled_mobs())
-		to_chat(user, "<span class='notice'>Drag your sprite to sit in it.</span>")
+		. += "<span class='notice'>Drag your sprite to sit in it.</span>"

 /obj/structure/chair/Initialize()
 	. = ..()
@@ -294,13 +294,13 @@ LINEN BINS
 	var/obj/item/hidden = null

 /obj/structure/bedsheetbin/examine(mob/user)
-	..()
+	. = ..()
 	if(amount < 1)
-		to_chat(user, "There are no sheets in the bin.")
+		. += "There are no sheets in the bin."
 	else if(amount == 1)
-		to_chat(user, "There is one sheet in the bin.")
+		. += "There is one sheet in the bin."
 	else
-		to_chat(user, "There are [amount] sheets in the bin.")
+		. += "There are [amount] sheets in the bin."


 /obj/structure/bedsheetbin/update_icon()
@@ -84,22 +84,22 @@
 		add_overlay("unlocked")

 /obj/structure/closet/examine(mob/user)
-	..()
+	. = ..()
 	if(welded)
-		to_chat(user, "<span class='notice'>It's <b>welded</b> shut.</span>")
+		. += "<span class='notice'>It's <b>welded</b> shut.</span>"
 	if(anchored)
-		to_chat(user, "<span class='notice'>It is <b>bolted</b> to the ground.</span>")
+		. += "<span class='notice'>It is <b>bolted</b> to the ground.</span>"
 	if(opened)
-		to_chat(user, "<span class='notice'>The parts are <b>welded</b> together.</span>")
+		. += "<span class='notice'>The parts are <b>welded</b> together.</span>"
 	else if(secure && !opened)
 	else if(broken)
-		to_chat(user, "<span class='notice'>The lock is <b>screwed</b> in.</span>")
+		. += "<span class='notice'>The lock is <b>screwed</b> in.</span>"
 	else if(secure)
-		to_chat(user, "<span class='notice'>Alt-click to [locked ? "unlock" : "lock"].</span>")
+		. += "<span class='notice'>Alt-click to [locked ? "unlock" : "lock"].</span>"
 	if(isliving(user))
 		var/mob/living/L = user
 		if(HAS_TRAIT(L, TRAIT_SKITTISH))
-			to_chat(user, "<span class='notice'>Ctrl-Shift-click [src] to jump inside.</span>")
+			. += "<span class='notice'>Ctrl-Shift-click [src] to jump inside.</span>"

 /obj/structure/closet/CanPass(atom/movable/mover, turf/target)
 	if(wall_mounted)
@@ -12,6 +12,9 @@
 	new /obj/item/clothing/under/shorts/blue(src)
 	new /obj/item/clothing/under/shorts/green(src)
 	new /obj/item/clothing/under/jabroni(src)
+	new /obj/item/clothing/under/polychromic/shortpants(src)
+	new /obj/item/clothing/under/polychromic/shortpants(src)
+	new /obj/item/clothing/under/polychromic/shortpants(src)


 /obj/structure/closet/boxinggloves
@@ -352,6 +352,7 @@
 	icon_door = "black"

 /obj/structure/closet/wardrobe/curator/PopulateContents()
+	new /obj/item/clothing/accessory/pocketprotector/full(src)
 	new /obj/item/clothing/head/fedora/curator(src)
 	new /obj/item/clothing/suit/curator(src)
 	new /obj/item/clothing/under/rank/curator/treasure_hunter(src)
@@ -11,7 +11,7 @@
 	new /obj/item/clothing/under/rank/cargo(src)
 	new /obj/item/clothing/under/rank/cargo/skirt(src)
 	new /obj/item/clothing/shoes/sneakers/brown(src)
-	new /obj/item/radio/headset/headset_cargo(src)
+	new /obj/item/radio/headset/heads/qm(src)
 	new /obj/item/clothing/suit/fire/firefighter(src)
 	new /obj/item/clothing/gloves/fingerless(src)
 	new /obj/item/megaphone/cargo(src)
@@ -23,3 +23,4 @@
 	new /obj/item/circuitboard/machine/techfab/department/cargo(src)
 	new /obj/item/storage/photo_album/QM(src)
 	new /obj/item/circuitboard/machine/ore_silo(src)
+	new /obj/item/clothing/suit/hooded/wintercoat/qm(src)
@@ -34,6 +34,7 @@
 	new /obj/item/storage/photo_album/CE(src)
 	new	/obj/item/storage/lockbox/medal/engineering(src)
 	new /obj/item/construction/rcd/loaded/upgraded(src)
+	new /obj/item/clothing/suit/hooded/wintercoat/ce(src)
 	new /obj/item/clothing/head/beret/ce/white(src)

 /obj/structure/closet/secure_closet/engineering_electrical
@@ -71,7 +71,7 @@
 	new /obj/item/storage/belt/medical(src)
 	new /obj/item/healthanalyzer/advanced(src)
 	new /obj/item/assembly/flash/handheld(src)
-//	new /obj/item/reagent_containers/hypospray/CMO(src) // CITADEL EDIT comments out the hypospray mk I. the MK II kit is modularized
+	new /obj/item/storage/hypospraykit/cmo(src)
 	new /obj/item/autosurgeon/cmo(src)
 	new /obj/item/door_remote/chief_medical_officer(src)
 	new /obj/item/clothing/neck/petcollar(src)
@@ -81,6 +81,7 @@
 	new /obj/item/circuitboard/machine/techfab/department/medical(src)
 	new /obj/item/storage/photo_album/CMO(src)
 	new	/obj/item/storage/lockbox/medal/medical(src)
+	new /obj/item/clothing/suit/hooded/wintercoat/cmo(src)
 	new /obj/item/clothing/head/beret/cmo/blue(src)

 /obj/structure/closet/secure_closet/animal
@@ -5,9 +5,9 @@
 	var/registered_name = null

 /obj/structure/closet/secure_closet/personal/examine(mob/user)
-	..()
+	. = ..()
 	if(registered_name)
-		to_chat(user, "<span class='notice'>The display reads, \"Owned by [registered_name]\".</span>")
+		. += "<span class='notice'>The display reads, \"Owned by [registered_name]\".</span>"

 /obj/structure/closet/secure_closet/personal/check_access(obj/item/card/id/I)
 	. = ..()
@@ -30,4 +30,5 @@
 	new /obj/item/door_remote/research_director(src)
 	new /obj/item/circuitboard/machine/techfab/department/science(src)
 	new /obj/item/storage/photo_album/RD(src)
+	new /obj/item/clothing/suit/hooded/wintercoat/rd(src)

@@ -63,6 +63,7 @@
 	new /obj/item/door_remote/civillian(src)
 	new /obj/item/circuitboard/machine/techfab/department/service(src)
 	new /obj/item/storage/photo_album/HoP(src)
+	new /obj/item/clothing/suit/hooded/wintercoat/hop(src)
 	new /obj/item/clothing/head/hopcap/beret/white(src)

 /obj/structure/closet/secure_closet/hos
@@ -98,6 +99,7 @@
 	new /obj/item/pinpointer/nuke(src)
 	new /obj/item/circuitboard/machine/techfab/department/security(src)
 	new /obj/item/storage/photo_album/HoS(src)
+	new /obj/item/clothing/suit/hooded/wintercoat/hos(src)
 /obj/structure/closet/secure_closet/warden
 	name = "\proper warden's locker"
 	req_access = list(ACCESS_ARMORY)
@@ -142,28 +142,21 @@
 		new /obj/item/clothing/suit/jacket(src)
 	if(prob(40))
 		new /obj/item/clothing/suit/jacket(src)
-	new /obj/item/clothing/under/color/white(src)
-	new /obj/item/clothing/under/skirt/color/white(src)
-	new /obj/item/clothing/under/color/blue(src)
-	new /obj/item/clothing/under/skirt/color/blue(src)
-	new /obj/item/clothing/under/color/yellow(src)
-	new /obj/item/clothing/under/skirt/color/yellow(src)
-	new /obj/item/clothing/under/color/green(src)
-	new /obj/item/clothing/under/skirt/color/green(src)
-	new /obj/item/clothing/under/color/orange(src)
-	new /obj/item/clothing/under/skirt/color/orange(src)
-	new /obj/item/clothing/under/color/pink(src)
-	new /obj/item/clothing/under/skirt/color/pink(src)
-	new /obj/item/clothing/under/color/red(src)
-	new /obj/item/clothing/under/skirt/color/red(src)
-	new /obj/item/clothing/under/color/darkblue(src)
-	new /obj/item/clothing/under/skirt/color/darkblue(src)
-	new /obj/item/clothing/under/color/teal(src)
-	new /obj/item/clothing/under/skirt/color/teal(src)
-	new /obj/item/clothing/under/color/lightpurple(src)
-	new /obj/item/clothing/under/skirt/color/lightpurple(src)
-	new /obj/item/clothing/under/color/green(src)
-	new /obj/item/clothing/under/skirt/color/green(src)
+	new /obj/item/clothing/under/polychromic/jumpsuit(src)
+	new /obj/item/clothing/under/polychromic/jumpsuit(src)
+	new /obj/item/clothing/under/polychromic/jumpsuit(src)
+	new /obj/item/clothing/under/polychromic/shirt(src)
+	new /obj/item/clothing/under/polychromic/shirt(src)
+	new /obj/item/clothing/under/polychromic/shirt(src)
+	new /obj/item/clothing/under/polychromic/kilt(src)
+	new /obj/item/clothing/under/polychromic/kilt(src)
+	new /obj/item/clothing/under/polychromic/kilt(src)
+	new /obj/item/clothing/under/polychromic/skirt(src)
+	new /obj/item/clothing/under/polychromic/skirt(src)
+	new /obj/item/clothing/under/polychromic/skirt(src)
+	new /obj/item/clothing/under/polychromic/shorts(src)
+	new /obj/item/clothing/under/polychromic/shorts(src)
+	new /obj/item/clothing/under/polychromic/shorts(src)
 	new /obj/item/clothing/mask/bandana/red(src)
 	new /obj/item/clothing/mask/bandana/red(src)
 	new /obj/item/clothing/mask/bandana/blue(src)
@@ -38,14 +38,14 @@
 	return ..()

 /obj/structure/displaycase/examine(mob/user)
-	..()
+	. = ..()
 	if(alert)
-		to_chat(user, "<span class='notice'>Hooked up with an anti-theft system.</span>")
+		. += "<span class='notice'>Hooked up with an anti-theft system.</span>"
 	if(showpiece)
-		to_chat(user, "<span class='notice'>There's [showpiece] inside.</span>")
+		. += "<span class='notice'>There's [showpiece] inside.</span>"
 	if(trophy_message)
-		to_chat(user, "The plaque reads:")
-		to_chat(user, trophy_message)
+		. += "The plaque reads:"
+		. += trophy_message


 /obj/structure/displaycase/proc/dump()
@@ -26,28 +26,28 @@
 	..()

 /obj/structure/door_assembly/examine(mob/user)
-	..()
+	. = ..()
 	var/doorname = ""
 	if(created_name)
 		doorname = ", written on it is '[created_name]'"
 	switch(state)
 		if(AIRLOCK_ASSEMBLY_NEEDS_WIRES)
 			if(anchored)
-				to_chat(user, "<span class='notice'>The anchoring bolts are <b>wrenched</b> in place, but the maintenance panel lacks <i>wiring</i>.</span>")
+				. += "<span class='notice'>The anchoring bolts are <b>wrenched</b> in place, but the maintenance panel lacks <i>wiring</i>.</span>"
 			else
-				to_chat(user, "<span class='notice'>The assembly is <b>welded together</b>, but the anchoring bolts are <i>unwrenched</i>.</span>")
+				. += "<span class='notice'>The assembly is <b>welded together</b>, but the anchoring bolts are <i>unwrenched</i>.</span>"
 		if(AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS)
-			to_chat(user, "<span class='notice'>The maintenance panel is <b>wired</b>, but the circuit slot is <i>empty</i>.</span>")
+			. += "<span class='notice'>The maintenance panel is <b>wired</b>, but the circuit slot is <i>empty</i>.</span>"
 		if(AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER)
-			to_chat(user, "<span class='notice'>The circuit is <b>connected loosely</b> to its slot, but the maintenance panel is <i>unscrewed and open</i>.</span>")
+			. += "<span class='notice'>The circuit is <b>connected loosely</b> to its slot, but the maintenance panel is <i>unscrewed and open</i>.</span>"
 	if(!mineral && !glass && !noglass)
-		to_chat(user, "<span class='notice'>There is a small <i>paper</i> placard on the assembly[doorname]. There are <i>empty</i> slots for glass windows and mineral covers.</span>")
+		. += "<span class='notice'>There is a small <i>paper</i> placard on the assembly[doorname]. There are <i>empty</i> slots for glass windows and mineral covers.</span>"
 	else if(!mineral && glass && !noglass)
-		to_chat(user, "<span class='notice'>There is a small <i>paper</i> placard on the assembly[doorname]. There are <i>empty</i> slots for mineral covers.</span>")
+		. += "<span class='notice'>There is a small <i>paper</i> placard on the assembly[doorname]. There are <i>empty</i> slots for mineral covers.</span>"
 	else if(mineral && !glass && !noglass)
-		to_chat(user, "<span class='notice'>There is a small <i>paper</i> placard on the assembly[doorname]. There are <i>empty</i> slots for glass windows.</span>")
+		. += "<span class='notice'>There is a small <i>paper</i> placard on the assembly[doorname]. There are <i>empty</i> slots for glass windows.</span>"
 	else
-		to_chat(user, "<span class='notice'>There is a small <i>paper</i> placard on the assembly[doorname].</span>")
+		. += "<span class='notice'>There is a small <i>paper</i> placard on the assembly[doorname].</span>"

 /obj/structure/door_assembly/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/pen))
@@ -22,8 +22,8 @@
 		stored_extinguisher = new /obj/item/extinguisher(src)

 /obj/structure/extinguisher_cabinet/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>Alt-click to [opened ? "close":"open"] it.</span>")
+	. = ..()
+	. += "<span class='notice'>Alt-click to [opened ? "close":"open"] it.</span>"

 /obj/structure/extinguisher_cabinet/Destroy()
 	if(stored_extinguisher)
@@ -23,24 +23,14 @@
 	var/current_action = 0 // What's currently happening to the femur breaker

 /obj/structure/femur_breaker/examine(mob/user)
-	..()
-
-	var/msg = ""
-
-	msg += "It is [anchored ? "secured to the floor." : "unsecured."]<br/>"
-
+	. = ..()
+	. += "It is [anchored ? "secured to the floor." : "unsecured."]"
 	if (slat_status == BREAKER_SLAT_RAISED)
-		msg += "The breaker slat is in a neutral position."
+		. += "The breaker slat is in a neutral position."
 	else
-		msg += "The breaker slat is lowered, and must be raised."
-
+		. += "The breaker slat is lowered, and must be raised."
 	if (LAZYLEN(buckled_mobs))
-		msg += "<br/>"
-		msg += "Someone appears to be strapped in. You can help them unbuckle, or activate the femur breaker."
-
-	to_chat(user, msg)
-
-	return msg
+		. += "Someone appears to be strapped in. You can help them unbuckle, or activate the femur breaker."

 /obj/structure/femur_breaker/attack_hand(mob/user)
 	add_fingerprint(user)
@@ -29,13 +29,12 @@
 	update_cut_status()

 /obj/structure/fence/examine(mob/user)
-	.=..()
-
+	. = ..()
 	switch(hole_size)
 		if(MEDIUM_HOLE)
-			user.show_message("There is a large hole in \the [src].")
+			. += "There is a large hole in \the [src]."
 		if(LARGE_HOLE)
-			user.show_message("\The [src] has been completely cut through.")
+			. += "\The [src] has been completely cut through."

 /obj/structure/fence/end
 	icon_state = "end"
@@ -422,7 +422,7 @@
 	implants = list(/obj/item/implant/weapons_auth)
 	id = /obj/item/card/id/syndicate

-/datum/outfit/syndicate_empty/post_equip(mob/living/carbon/human/H)
+/datum/outfit/syndicate_empty/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source)
 	H.faction |= ROLE_SYNDICATE

 /obj/effect/mob_spawn/human/syndicate/battlecruiser
@@ -15,16 +15,16 @@
 	. = ..()
 	switch(state)
 		if(GIRDER_REINF)
-			to_chat(user, "<span class='notice'>The support struts are <b>screwed</b> in place.</span>")
+			. += "<span class='notice'>The support struts are <b>screwed</b> in place.</span>"
 		if(GIRDER_REINF_STRUTS)
-			to_chat(user, "<span class='notice'>The support struts are <i>unscrewed</i> and the inner <b>grille</b> is intact.</span>")
+			. += "<span class='notice'>The support struts are <i>unscrewed</i> and the inner <b>grille</b> is intact.</span>"
 		if(GIRDER_NORMAL)
 			if(can_displace)
-				to_chat(user, "<span class='notice'>The bolts are <b>wrenched</b> in place.</span>")
+				. += "<span class='notice'>The bolts are <b>wrenched</b> in place.</span>"
 		if(GIRDER_DISPLACED)
-			to_chat(user, "<span class='notice'>The bolts are <i>loosened</i>, but the <b>screws</b> are holding [src] together.</span>")
+			. += "<span class='notice'>The bolts are <i>loosened</i>, but the <b>screws</b> are holding [src] together.</span>"
 		if(GIRDER_DISASSEMBLED)
-			to_chat(user, "<span class='notice'>[src] is disassembled! You probably shouldn't be able to see this examine message.</span>")
+			. += "<span class='notice'>[src] is disassembled! You probably shouldn't be able to see this examine message.</span>"

 /obj/structure/girder/attackby(obj/item/W, mob/user, params)
 	add_fingerprint(user)
@@ -37,11 +37,11 @@
 	icon_state = "grille50_[rand(0,3)]"

 /obj/structure/grille/examine(mob/user)
-	..()
+	. = ..()
 	if(anchored)
-		to_chat(user, "<span class='notice'>It's secured in place with <b>screws</b>. The rods look like they could be <b>cut</b> through.</span>")
-	if(!anchored)
-		to_chat(user, "<span class='notice'>The anchoring screws are <i>unscrewed</i>. The rods look like they could be <b>cut</b> through.</span>")
+		. += "<span class='notice'>It's secured in place with <b>screws</b>. The rods look like they could be <b>cut</b> through.</span>"
+	else
+		. += "<span class='notice'>The anchoring screws are <i>unscrewed</i>. The rods look like they could be <b>cut</b> through.</span>"

 /obj/structure/grille/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
 	switch(the_rcd.mode)
@@ -34,29 +34,22 @@
 	. = ..()

 /obj/structure/guillotine/examine(mob/user)
-	..()
-
-	var/msg = ""
-
-	msg += "It is [anchored ? "wrenched to the floor." : "unsecured. A wrench should fix that."]<br/>"
+	. = ..()

+	. += "It is [anchored ? "wrenched to the floor." : "unsecured. A wrench should fix that."]"
 	if (blade_status == GUILLOTINE_BLADE_RAISED)
-		msg += "The blade is raised, ready to fall, and"
+		var/msg = "The blade is raised, ready to fall, and"

 		if (blade_sharpness >= GUILLOTINE_DECAP_MIN_SHARP)
 			msg += " looks sharp enough to decapitate without any resistance."
 		else
 			msg += " doesn't look particularly sharp. Perhaps a whetstone can be used to sharpen it."
+		. += msg
 	else
-		msg += "The blade is hidden inside the stocks."
+		. += "The blade is hidden inside the stocks."

 	if (LAZYLEN(buckled_mobs))
-		msg += "<br/>"
-		msg += "Someone appears to be strapped in. You can help them out, or you can harm them by activating the guillotine."
-
-	to_chat(user, msg)
-
-	return msg
+		. += "Someone appears to be strapped in. You can help them out, or you can harm them by activating the guillotine."

 /obj/structure/guillotine/attack_hand(mob/user)
 	add_fingerprint(user)
@@ -9,11 +9,13 @@
 	armor = list("melee" = 0, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 20)
 	var/obj/item/holosign_creator/projector

-/obj/structure/holosign/New(loc, source_projector)
+/obj/structure/holosign/Initialize(mapload, source_projector)
+	. = ..()
 	if(source_projector)
 		projector = source_projector
 		projector.signs += src
-	..()
+	alpha = 0
+	SSvis_overlays.add_vis_overlay(src, icon, icon_state, ABOVE_MOB_LAYER, plane, dir, add_appearance_flags = RESET_ALPHA) //you see mobs under it, but you hit them like they are above it

 /obj/structure/holosign/Destroy()
 	if(projector)
@@ -71,10 +73,8 @@
 	desc = "A holographic barrier resembling a firelock. Though it does not prevent solid objects from passing through, gas is kept out."
 	icon_state = "holo_firelock"
 	density = FALSE
-	layer = ABOVE_MOB_LAYER
 	anchored = TRUE
 	CanAtmosPass = ATMOS_PASS_NO
-	layer = ABOVE_MOB_LAYER
 	alpha = 150

 /obj/structure/holosign/barrier/atmos/Initialize()
@@ -100,13 +100,12 @@
 	desc = "A holobarrier that uses biometrics to detect human viruses. Denies passing to personnel with easily-detected, malicious viruses. Good for quarantines."
 	icon_state = "holo_medical"
 	alpha = 125 //lazy :)
-	layer = ABOVE_MOB_LAYER
 	var/force_allaccess = FALSE
 	var/buzzcd = 0

 /obj/structure/holosign/barrier/medical/examine(mob/user)
-	..()
-	to_chat(user,"<span class='notice'>The biometric scanners are <b>[force_allaccess ? "off" : "on"]</b>.</span>")
+	. = ..()
+	. += "<span class='notice'>The biometric scanners are <b>[force_allaccess ? "off" : "on"]</b>.</span>"

 /obj/structure/holosign/barrier/medical/CanPass(atom/movable/mover, turf/target)
 	icon_state = "holo_medical"
@@ -19,10 +19,10 @@

 /obj/structure/lattice/examine(mob/user)
 	..()
-	deconstruction_hints(user)
+	. += deconstruction_hints(user)

 /obj/structure/lattice/proc/deconstruction_hints(mob/user)
-	to_chat(user, "<span class='notice'>The rods look like they could be <b>cut</b>. There's space for more <i>rods</i> or a <i>tile</i>.</span>")
+	return "<span class='notice'>The rods look like they could be <b>cut</b>. There's space for more <i>rods</i> or a <i>tile</i>.</span>"

 /obj/structure/lattice/Initialize(mapload)
 	. = ..()
@@ -55,9 +55,9 @@
 /obj/structure/life_candle/examine(mob/user)
 	. = ..()
 	if(linked_minds.len)
-		to_chat(user, "[src] is active, and linked to [linked_minds.len] souls.")
+		. += "[src] is active, and linked to [linked_minds.len] souls."
 	else
-		to_chat(user, "It is static, still, unmoving.")
+		. += "It is static, still, unmoving."

 /obj/structure/life_candle/process()
 	if(!linked_minds.len)
@@ -163,8 +163,8 @@ GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants an
 	..()

 /obj/structure/bodycontainer/morgue/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>The speaker is [beeper ? "enabled" : "disabled"]. Alt-click to toggle it.</span>")
+	. = ..()
+	. += "<span class='notice'>The speaker is [beeper ? "enabled" : "disabled"]. Alt-click to toggle it.</span>"

 /obj/structure/bodycontainer/morgue/AltClick(mob/user)
 	..()
@@ -6,18 +6,22 @@
 	armor = list("melee" = 100, "bullet" = 80, "laser" = 80, "energy" = 100, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 50, "acid" = 50)
 	density = FALSE
 	anchored = TRUE
-	layer = ABOVE_MOB_LAYER
 	CanAtmosPass = ATMOS_PASS_NO

 /obj/structure/plasticflaps/opaque
 	opacity = TRUE

+/obj/structure/plasticflaps/Initialize()
+	. = ..()
+	alpha = 0
+	SSvis_overlays.add_vis_overlay(src, icon, icon_state, ABOVE_MOB_LAYER, plane, dir, add_appearance_flags = RESET_ALPHA) //you see mobs under it, but you hit them like they are above it
+
 /obj/structure/plasticflaps/examine(mob/user)
 	. = ..()
 	if(anchored)
-		to_chat(user, "<span class='notice'>[src] are <b>screwed</b> to the floor.</span>")
+		. += "<span class='notice'>[src] are <b>screwed</b> to the floor.</span>"
 	else
-		to_chat(user, "<span class='notice'>[src] are no longer <i>screwed</i> to the floor, and the flaps can be <b>cut</b> apart.</span>")
+		. += "<span class='notice'>[src] are no longer <i>screwed</i> to the floor, and the flaps can be <b>cut</b> apart.</span>"

 /obj/structure/plasticflaps/screwdriver_act(mob/living/user, obj/item/W)
 	if(..())
@@ -34,14 +34,14 @@
 		can_rotate = FALSE

 /obj/structure/reflector/examine(mob/user)
-	..()
+	. = ..()
 	if(finished)
-		to_chat(user, "It is set to [rotation_angle] degrees, and the rotation is [can_rotate ? "unlocked" : "locked"].")
+		. += "It is set to [rotation_angle] degrees, and the rotation is [can_rotate ? "unlocked" : "locked"]."
 		if(!admin)
 			if(can_rotate)
-				to_chat(user, "<span class='notice'>Alt-click to adjust its direction.</span>")
+				. += "<span class='notice'>Alt-click to adjust its direction.</span>"
 			else
-				to_chat(user, "<span class='notice'>Use screwdriver to unlock the rotation.</span>")
+				. += "<span class='notice'>Use screwdriver to unlock the rotation.</span>"

 /obj/structure/reflector/proc/setAngle(new_angle)
 	if(can_rotate)
@@ -131,12 +131,11 @@
 //Feedback is given in examine because showcases can basically have any sprite assigned to them

 /obj/structure/showcase/examine(mob/user)
-	..()
-
+	. = ..()
 	switch(deconstruction_state)
 		if(SHOWCASE_CONSTRUCTED)
-			to_chat(user, "The showcase is fully constructed.")
+			. += "The showcase is fully constructed."
 		if(SHOWCASE_SCREWDRIVERED)
-			to_chat(user, "The showcase has its screws loosened.")
+			. += "The showcase has its screws loosened."
 		else
-			to_chat(user, "If you see this, something is wrong.")
+			. += "If you see this, something is wrong."
@@ -12,7 +12,7 @@

 /obj/structure/spirit_board/examine()
 	desc = "[initial(desc)] The planchette is sitting at \"[planchette]\"."
-	..()
+	return ..()

 /obj/structure/spirit_board/attack_hand(mob/user)
 	. = ..()
@@ -36,11 +36,11 @@
 	canSmoothWith = list(/obj/structure/table, /obj/structure/table/reinforced)

 /obj/structure/table/examine(mob/user)
-	..()
-	deconstruction_hints(user)
+	. = ..()
+	. += deconstruction_hints(user)

 /obj/structure/table/proc/deconstruction_hints(mob/user)
-	to_chat(user, "<span class='notice'>The top is <b>screwed</b> on, but the main <b>bolts</b> are also visible.</span>")
+	return "<span class='notice'>The top is <b>screwed</b> on, but the main <b>bolts</b> are also visible.</span>"

 /obj/structure/table/update_icon()
 	if(smooth)
@@ -452,9 +452,8 @@

 /obj/structure/table/reinforced/deconstruction_hints(mob/user)
 	if(deconstruction_ready)
-		to_chat(user, "<span class='notice'>The top cover has been <i>welded</i> loose and the main frame's <b>bolts</b> are exposed.</span>")
-	else
-		to_chat(user, "<span class='notice'>The top cover is firmly <b>welded</b> on.</span>")
+		return "<span class='notice'>The top cover has been <i>welded</i> loose and the main frame's <b>bolts</b> are exposed.</span>"
+	return "<span class='notice'>The top cover is firmly <b>welded</b> on.</span>"

 /obj/structure/table/reinforced/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/weldingtool))
@@ -582,8 +581,8 @@
 	max_integrity = 20

 /obj/structure/rack/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>It's held together by a couple of <b>bolts</b>.</span>")
+	. = ..()
+	. += "<span class='notice'>It's held together by a couple of <b>bolts</b>.</span>"

 /obj/structure/rack/CanPass(atom/movable/mover, turf/target)
 	if(src.density == 0) //Because broken racks -Agouri |TODO: SPRITE!|
@@ -38,7 +38,7 @@
 	if(user.mind && user.mind in immune_minds)
 		return
 	if(get_dist(user, src) <= 1)
-		to_chat(user, "<span class='notice'>You reveal [src]!</span>")
+		. += "<span class='notice'>You reveal [src]!</span>"
 		flare()

 /obj/structure/trap/proc/flare()
@@ -29,21 +29,21 @@
 	rad_flags = RAD_PROTECT_CONTENTS

 /obj/structure/window/examine(mob/user)
-	..()
+	. = ..()
 	if(reinf)
 		if(anchored && state == WINDOW_SCREWED_TO_FRAME)
-			to_chat(user, "<span class='notice'>The window is <b>screwed</b> to the frame.</span>")
+			. += "<span class='notice'>The window is <b>screwed</b> to the frame.</span>"
 		else if(anchored && state == WINDOW_IN_FRAME)
-			to_chat(user, "<span class='notice'>The window is <i>unscrewed</i> but <b>pried</b> into the frame.</span>")
+			. += "<span class='notice'>The window is <i>unscrewed</i> but <b>pried</b> into the frame.</span>"
 		else if(anchored && state == WINDOW_OUT_OF_FRAME)
-			to_chat(user, "<span class='notice'>The window is out of the frame, but could be <i>pried</i> in. It is <b>screwed</b> to the floor.</span>")
+			. += "<span class='notice'>The window is out of the frame, but could be <i>pried</i> in. It is <b>screwed</b> to the floor.</span>"
 		else if(!anchored)
-			to_chat(user, "<span class='notice'>The window is <i>unscrewed</i> from the floor, and could be deconstructed by <b>wrenching</b>.</span>")
+			. += "<span class='notice'>The window is <i>unscrewed</i> from the floor, and could be deconstructed by <b>wrenching</b>.</span>"
 	else
 		if(anchored)
-			to_chat(user, "<span class='notice'>The window is <b>screwed</b> to the floor.</span>")
+			. += "<span class='notice'>The window is <b>screwed</b> to the floor.</span>"
 		else
-			to_chat(user, "<span class='notice'>The window is <i>unscrewed</i> from the floor, and could be deconstructed by <b>wrenching</b>.</span>")
+			. += "<span class='notice'>The window is <i>unscrewed</i> from the floor, and could be deconstructed by <b>wrenching</b>.</span>"

 /obj/structure/window/Initialize(mapload, direct)
 	. = ..()