Auto stash before revert of "Merge pull request #14289 from Dovixx/SSD-portal"

code/game/objects/effects/effect_system.dm

@@ -481,7 +481,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
 					var/more = ""
 					if(M)
 						more = " "
-					msg_admin_attack("A chemical smoke reaction has taken place in ([whereLink])[contained]. Last associated key is [carry.my_atom.fingerprintslast][more].", 0, 1)
+					add_attack_logs(M, location, "Caused a chemical smoke reaction containing [contained]. Last associated key is [carry.my_atom.fingerprintslast][more]", ATKLOG_FEW)
 					log_game("A chemical smoke reaction has taken place in ([where])[contained]. Last associated key is [carry.my_atom.fingerprintslast].")
 				else
 					msg_admin_attack("A chemical smoke reaction has taken place in ([whereLink]). No associated key.", 0, 1)

code/game/objects/effects/effect_system/effects_chem_smoke.dm

@@ -83,13 +83,13 @@
 				var/more = ""
 				if(M)
 					more = " "
-				msg_admin_attack("A chemical smoke reaction has taken place in ([whereLink])[contained]. Last associated key is [carry.my_atom.fingerprintslast][more].", ATKLOG_FEW)
+				add_attack_logs(M, location, "Caused a chemical smoke reaction containing [contained]. Last associated key is [carry.my_atom.fingerprintslast][more]", ATKLOG_FEW)
 				log_game("A chemical smoke reaction has taken place in ([where])[contained]. Last associated key is [carry.my_atom.fingerprintslast].")
 			else
-				msg_admin_attack("A chemical smoke reaction has taken place in ([whereLink]). No associated key.", ATKLOG_FEW)
+				msg_admin_attack("A chemical smoke reaction has taken place in ([whereLink])[contained]. No associated key.", ATKLOG_FEW)
 				log_game("A chemical smoke reaction has taken place in ([where])[contained]. No associated key.")
 		else
-			msg_admin_attack("A chemical smoke reaction has taken place in ([whereLink]). No associated key. CODERS: carry.my_atom may be null.", ATKLOG_FEW)
+			msg_admin_attack("A chemical smoke reaction has taken place in ([whereLink])[contained]. No associated key. CODERS: carry.my_atom may be null.", ATKLOG_FEW)
 			log_game("A chemical smoke reaction has taken place in ([where])[contained]. No associated key. CODERS: carry.my_atom may be null.")
 
 

code/game/objects/effects/portals.dm

@@ -88,9 +88,6 @@
 	if(!M.simulated || iseffect(M))
 		. = FALSE
 
-	if(M.anchored && ismecha(M))
-		. = FALSE
-
 /obj/effect/portal/proc/teleport(atom/movable/M)
 	if(!can_teleport(M))
 		return FALSE

code/game/objects/effects/spawners/bombspawner.dm

@@ -6,18 +6,18 @@
 	var/btemp1 = 1500
 	var/btemp2 = 1000	// tank temperatures
 
-	timer
-		btype = 2
+/obj/effect/spawner/newbomb/timer
+	btype = 2
 
-		syndicate
-			btemp1 = 150
-			btemp2 = 20
+/obj/effect/spawner/newbomb/timer/syndicate
+	btemp1 = 150
+	btemp2 = 20
 
-	proximity
-		btype = 1
+/obj/effect/spawner/newbomb/proximity
+	btype = 1
 
-	radio
-		btype = 0
+/obj/effect/spawner/newbomb/radio
+	btype = 0
 
 
 /obj/effect/spawner/newbomb/New()

code/game/objects/effects/spiders.dm

@@ -58,7 +58,7 @@
 	icon_state = "eggs"
 	var/amount_grown = 0
 	var/player_spiders = 0
-	var/list/faction = list()
+	var/list/faction = list("spiders")
 
 /obj/structure/spider/eggcluster/New()
 	..()
@@ -90,7 +90,7 @@
 	var/obj/machinery/atmospherics/unary/vent_pump/entry_vent
 	var/travelling_in_vent = 0
 	var/player_spiders = 0
-	var/list/faction = list()
+	var/list/faction = list("spiders")
 	var/selecting_player = 0
 
 /obj/structure/spider/spiderling/New()
@@ -180,7 +180,7 @@
 			if(player_spiders && !selecting_player)
 				selecting_player = 1
 				spawn()
-					var/list/candidates = pollCandidates("Do you want to play as a spider?", ROLE_GSPIDER, 1)
+					var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as a giant spider?", ROLE_GSPIDER, TRUE, source = S)
 
 					if(candidates.len)
 						var/mob/C = pick(candidates)

code/game/objects/explosion.dm

@@ -137,19 +137,7 @@
 						T.ex_act(3)
 
 			CHECK_TICK
-			//--- THROW ITEMS AROUND ---
-/*
-			if(throw_dist > 0)
-				var/throw_dir = get_dir(epicenter,T)
-				for(var/obj/item/I in T)
-					spawn(0) //Simultaneously not one at a time
-						if(I && !I.anchored)
-							var/throw_mult = 0.5 + (0.5 * rand()) // Between 0.5 and 1.0
-							var/throw_range = round((throw_dist + 1) * throw_mult) // Roughly 50% to 100% of throw_dist
-							if(throw_range > 0)
-								var/turf/throw_at = get_ranged_target_turf(I, throw_dir, throw_range)
-								I.throw_at(throw_at, throw_range, 2, no_spin = 1) //Throw it at 2 speed, this is purely visual anyway; don't spin the thrown items, it's very costly.
-*/
+
 		var/took = stop_watch(watch)
 		//You need to press the DebugGame verb to see these now....they were getting annoying and we've collected a fair bit of data. Just -test- changes  to explosion code using this please so we can compare
 		if(GLOB.debug2)

code/game/objects/items.dm

@@ -2,6 +2,8 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect
 /obj/item
 	name = "item"
 	icon = 'icons/obj/items.dmi'
+
+	move_resist = null // Set in the Initialise depending on the item size. Unless it's overriden by a specific item
 	var/discrete = 0 // used in item_attack.dm to make an item not show an attack message to viewers
 	var/image/blood_overlay = null //this saves our blood splatter overlay, which will be processed not to go over the edges of the sprite
 	var/blood_overlay_color = null
@@ -113,6 +115,23 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect
 			hitsound = 'sound/items/welder.ogg'
 		if(damtype == "brute")
 			hitsound = "swing_hit"
+	if(!move_resist)
+		determine_move_resist()
+
+/obj/item/proc/determine_move_resist()
+	switch(w_class)
+		if(WEIGHT_CLASS_TINY)
+			move_resist = MOVE_FORCE_EXTREMELY_WEAK
+		if(WEIGHT_CLASS_SMALL)
+			move_resist = MOVE_FORCE_VERY_WEAK
+		if(WEIGHT_CLASS_NORMAL)
+			move_resist = MOVE_FORCE_WEAK
+		if(WEIGHT_CLASS_BULKY)
+			move_resist = MOVE_FORCE_NORMAL
+		if(WEIGHT_CLASS_HUGE)
+			move_resist = MOVE_FORCE_NORMAL
+		if(WEIGHT_CLASS_GIGANTIC)
+			move_resist = MOVE_FORCE_NORMAL
 
 /obj/item/Destroy()
 	flags &= ~DROPDEL	//prevent reqdels
@@ -506,7 +525,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect
 			"<span class='userdanger'>You stab yourself in the eyes with [src]!</span>" \
 		)
 
-	add_attack_logs(user, M, "Eye-stabbed with [src] (INTENT: [uppertext(user.a_intent)])")
+	add_attack_logs(user, M, "Eye-stabbed with [src] ([uppertext(user.a_intent)])")
 
 	if(istype(H))
 		var/obj/item/organ/internal/eyes/eyes = H.get_int_organ(/obj/item/organ/internal/eyes)

code/game/objects/items/blueprints.dm

@@ -221,6 +221,12 @@
 		A.contents += thing
 		thing.change_area(old_area, A)
 
+	var/area/oldA = get_area(get_turf(usr))
+	var/list/firedoors = oldA.firedoors
+	for(var/door in firedoors)
+		var/obj/machinery/door/firedoor/FD = door
+		FD.CalculateAffectingAreas()
+
 	interact()
 	area_created = TRUE
 	return area_created
@@ -236,6 +242,10 @@
 		return
 	set_area_machinery_title(A,str,prevname)
 	A.name = str
+	if(A.firedoors)
+		for(var/D in A.firedoors)
+			var/obj/machinery/door/firedoor/FD = D
+			FD.CalculateAffectingAreas()
 	to_chat(usr, "<span class='notice'>You rename the '[prevname]' to '[str]'.</span>")
 	interact()
 	return 1

code/game/objects/items/bodybag.dm

@@ -7,10 +7,10 @@
 	icon_state = "bodybag_folded"
 	w_class = WEIGHT_CLASS_SMALL
 
-	attack_self(mob/user)
-		var/obj/structure/closet/body_bag/R = new /obj/structure/closet/body_bag(user.loc)
-		R.add_fingerprint(user)
-		qdel(src)
+/obj/item/bodybag/attack_self(mob/user)
+	var/obj/structure/closet/body_bag/R = new /obj/structure/closet/body_bag(user.loc)
+	R.add_fingerprint(user)
+	qdel(src)
 
 /obj/structure/closet/body_bag
 	name = "body bag"
@@ -56,16 +56,13 @@
 
 
 /obj/structure/closet/body_bag/MouseDrop(over_object, src_location, over_location)
-	..()
+	. = ..()
 	if((over_object == usr && (in_range(src, usr) || usr.contents.Find(src))))
-		if(!ishuman(usr))	return
-		if(opened)	return 0
-		if(contents.len)	return 0
-		visible_message("[usr] folds up the [src.name]")
+		if(!ishuman(usr) || opened || length(contents))
+			return FALSE
+		visible_message("[usr] folds up the [name]")
 		new item_path(get_turf(src))
-		spawn(0)
-			qdel(src)
-		return
+		qdel(src)
 
 /obj/structure/closet/body_bag/relaymove(mob/user as mob)
 	if(user.stat)

code/game/objects/items/changestone.dm

@@ -4,7 +4,7 @@
 	icon = 'icons/obj/artifacts.dmi'
 	icon_state = "changerock"
 
-obj/item/changestone/attack_hand(var/mob/user as mob)
+/obj/item/changestone/attack_hand(var/mob/user as mob)
 	if(istype(user,/mob/living/carbon/human))
 		var/mob/living/carbon/human/H = user
 		if(!H.gloves)

code/game/objects/items/crayons.dm

@@ -11,7 +11,7 @@
 	slot_flags = SLOT_BELT | SLOT_EARS
 	attack_verb = list("attacked", "coloured")
 	toolspeed = 1
-	var/colour = "#FF0000" //RGB
+	var/colour = COLOR_RED
 	var/drawtype = "rune"
 	var/list/graffiti = list("body","amyjon","face","matt","revolution","engie","guy","end","dwarf","uboa","up","down","left","right","heart","borgsrogue","voxpox","shitcurity","catbeast","hieroglyphs1","hieroglyphs2","hieroglyphs3","security","syndicate1","syndicate2","nanotrasen","lie","valid","arrowleft","arrowright","arrowup","arrowdown","chicken","hailcrab","brokenheart","peace","scribble","scribble2","scribble3","skrek","squish","tunnelsnake","yip","youaredead")
 	var/list/letters = list("a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z")
@@ -123,54 +123,54 @@
 
 /obj/item/toy/crayon/red
 	icon_state = "crayonred"
-	colour = "#DA0000"
+	colour = COLOR_RED
 	colourName = "red"
 
 /obj/item/toy/crayon/orange
 	icon_state = "crayonorange"
-	colour = "#FF9300"
+	colour = COLOR_ORANGE
 	colourName = "orange"
 
 /obj/item/toy/crayon/yellow
 	icon_state = "crayonyellow"
-	colour = "#FFF200"
+	colour = COLOR_YELLOW
 	colourName = "yellow"
 
 /obj/item/toy/crayon/green
 	icon_state = "crayongreen"
-	colour = "#A8E61D"
+	colour = COLOR_GREEN
 	colourName = "green"
 
 /obj/item/toy/crayon/blue
 	icon_state = "crayonblue"
-	colour = "#00B7EF"
+	colour = COLOR_BLUE
 	colourName = "blue"
 
 /obj/item/toy/crayon/purple
 	icon_state = "crayonpurple"
-	colour = "#DA00FF"
+	colour = COLOR_PURPLE
 	colourName = "purple"
 
 /obj/item/toy/crayon/random/New()
 	icon_state = pick(list("crayonred", "crayonorange", "crayonyellow", "crayongreen", "crayonblue", "crayonpurple"))
 	switch(icon_state)
 		if("crayonred")
-			colour = "#DA0000"
+			colour = COLOR_RED
 			colourName = "red"
 		if("crayonorange")
-			colour = "#FF9300"
+			colour = COLOR_ORANGE
 			colourName = "orange"
 		if("crayonyellow")
-			colour = "#FFF200"
+			colour = COLOR_YELLOW
 			colourName = "yellow"
 		if("crayongreen")
-			colour = "#A8E61D"
+			colour =COLOR_GREEN
 			colourName = "green"
 		if("crayonblue")
-			colour = "#00B7EF"
+			colour = COLOR_BLUE
 			colourName = "blue"
 		if("crayonpurple")
-			colour = "#DA00FF"
+			colour = COLOR_PURPLE
 			colourName = "purple"
 	..()
 
@@ -197,10 +197,10 @@
 	if(!Adjacent(usr) || usr.incapacitated())
 		return
 	if(href_list["color"])
-		if(colour != "#FFFFFF")
-			colour = "#FFFFFF"
+		if(colour != COLOR_WHITE)
+			colour = COLOR_WHITE
 		else
-			colour = "#000000"
+			colour = COLOR_BLACK
 		update_window(usr)
 	else
 		..()

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

@@ -1,192 +0,0 @@
-//copy pasta of the space piano, don't hurt me -Pete
-/obj/item/instrument
-	name = "generic instrument"
-	icon = 'icons/obj/musician.dmi'
-	lefthand_file = 'icons/mob/inhands/equipment/instruments_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/equipment/instruments_righthand.dmi'
-	resistance_flags = FLAMMABLE
-	max_integrity = 100
-	var/datum/song/handheld/song
-	var/instrumentId = "generic"
-	var/instrumentExt = "mid"
-
-/obj/item/instrument/New()
-	song = new(instrumentId, src, instrumentExt)
-	..()
-
-/obj/item/instrument/Destroy()
-	QDEL_NULL(song)
-	return ..()
-
-/obj/item/instrument/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] begins to play 'Gloomy Sunday'! It looks like [user.p_theyre()] trying to commit suicide!</span>")
-	return BRUTELOSS
-
-/obj/item/instrument/Initialize(mapload)
-	song.tempo = song.sanitize_tempo(song.tempo) // tick_lag isn't set when the map is loaded
-	..()
-
-/obj/item/instrument/attack_self(mob/user)
-	ui_interact(user)
-
-/obj/item/instrument/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1)
-	if(!isliving(user) || user.incapacitated())
-		return
-
-	song.ui_interact(user, ui_key, ui, force_open)
-
-/obj/item/instrument/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
-	return song.ui_data(user, ui_key, state)
-
-/obj/item/instrument/Topic(href, href_list)
-	song.Topic(href, href_list)
-
-/obj/item/instrument/violin
-	name = "space violin"
-	desc = "A wooden musical instrument with four strings and a bow. \"The devil went down to space, he was looking for an assistant to grief.\""
-	icon_state = "violin"
-	item_state = "violin"
-	instrumentExt = "ogg"
-	force = 10
-	hitsound = "swing_hit"
-	instrumentId = "violin"
-
-/obj/item/instrument/violin/golden
-	name = "golden violin"
-	desc = "A golden musical instrument with four strings and a bow. \"The devil went down to space, he was looking for an assistant to grief.\""
-	icon_state = "golden_violin"
-	item_state = "golden_violin"
-	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
-
-/obj/item/instrument/piano_synth
-	name = "synthesizer"
-	desc = "An advanced electronic synthesizer that can be used as various instruments."
-	icon_state = "synth"
-	item_state = "synth"
-	instrumentId = "piano"
-	instrumentExt = "ogg"
-	var/static/list/insTypes = list("accordion" = "mid", "glockenspiel" = "mid", "guitar" = "ogg", "eguitar" = "ogg", "harmonica" = "mid", "piano" = "ogg", "recorder" = "mid", "saxophone" = "mid", "trombone" = "mid", "violin" = "ogg", "xylophone" = "mid")
-	actions_types = list(/datum/action/item_action/synthswitch)
-
-/obj/item/instrument/piano_synth/proc/changeInstrument(name = "piano")
-	song.instrumentDir = name
-	song.instrumentExt = insTypes[name]
-
-/obj/item/instrument/guitar
-	name = "guitar"
-	desc = "It's made of wood and has bronze strings."
-	icon_state = "guitar"
-	item_state = "guitar"
-	instrumentExt = "ogg"
-	force = 10
-	attack_verb = list("played metal on", "serenaded", "crashed", "smashed")
-	hitsound = 'sound/effects/guitarsmash.ogg'
-	instrumentId = "guitar"
-
-/obj/item/instrument/eguitar
-	name = "electric guitar"
-	desc = "Makes all your shredding needs possible."
-	icon_state = "eguitar"
-	item_state = "eguitar"
-	instrumentExt = "ogg"
-	force = 12
-	attack_verb = list("played metal on", "shredded", "crashed", "smashed")
-	hitsound = 'sound/weapons/stringsmash.ogg'
-	instrumentId = "eguitar"
-
-/obj/item/instrument/glockenspiel
-	name = "glockenspiel"
-	desc = "Smooth metal bars perfect for any marching band."
-	icon_state = "glockenspiel"
-	item_state = "glockenspiel"
-	instrumentId = "glockenspiel"
-
-/obj/item/instrument/accordion
-	name = "accordion"
-	desc = "Pun-Pun not included."
-	icon_state = "accordion"
-	item_state = "accordion"
-	instrumentId = "accordion"
-
-/obj/item/instrument/saxophone
-	name = "saxophone"
-	desc = "This soothing sound will be sure to leave your audience in tears."
-	icon_state = "saxophone"
-	item_state = "saxophone"
-	instrumentId = "saxophone"
-
-/obj/item/instrument/trombone
-	name = "trombone"
-	desc = "How can any pool table ever hope to compete?"
-	icon_state = "trombone"
-	item_state = "trombone"
-	instrumentId = "trombone"
-
-/obj/item/instrument/recorder
-	name = "recorder"
-	desc = "Just like in school, playing ability and all."
-	icon_state = "recorder"
-	item_state = "recorder"
-	instrumentId = "recorder"
-
-/obj/item/instrument/harmonica
-	name = "harmonica"
-	desc = "For when you get a bad case of the space blues."
-	icon_state = "harmonica"
-	item_state = "harmonica"
-	instrumentId = "harmonica"
-	force = 5
-	w_class = WEIGHT_CLASS_SMALL
-
-/obj/item/instrument/xylophone
-	name = "xylophone"
-	desc = "a percussion instrument with a bright tone."
-	icon_state = "xylophone"
-	item_state = "xylophone"
-	instrumentId = "xylophone"
-
-/obj/item/instrument/bikehorn
-	name = "gilded bike horn"
-	desc = "An exquisitely decorated bike horn, capable of honking in a variety of notes."
-	icon_state = "bike_horn"
-	item_state = "bike_horn"
-	lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/items_righthand.dmi'
-	attack_verb = list("beautifully honks")
-	instrumentId = "bikehorn"
-	instrumentExt = "ogg"
-	w_class = WEIGHT_CLASS_TINY
-	force = 0
-	throw_speed = 3
-	throw_range = 7
-	hitsound = 'sound/items/bikehorn.ogg'
-
-/datum/crafting_recipe/violin
-	name = "Violin"
-	result = /obj/item/instrument/violin
-	reqs = list(/obj/item/stack/sheet/wood = 5,
-				/obj/item/stack/cable_coil = 6,
-				/obj/item/stack/tape_roll = 5)
-	tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
-	time = 80
-	category = CAT_MISC
-
-/datum/crafting_recipe/guitar
-	name = "Guitar"
-	result = /obj/item/instrument/guitar
-	reqs = list(/obj/item/stack/sheet/wood = 5,
-				/obj/item/stack/cable_coil = 6,
-				/obj/item/stack/tape_roll = 5)
-	tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
-	time = 80
-	category = CAT_MISC
-
-/datum/crafting_recipe/eguitar
-	name = "Electric Guitar"
-	result = /obj/item/instrument/eguitar
-	reqs = list(/obj/item/stack/sheet/metal = 5,
-				/obj/item/stack/cable_coil = 6,
-				/obj/item/stack/tape_roll = 5)
-	tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
-	time = 80
-	category = CAT_MISC

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

@@ -191,7 +191,7 @@
 		if(CanUse(U))
 			if(!Use(U))
 				return
-			to_chat(U, "<span class='notice'>You replace [target.fitting] with [src].</span>")
+			to_chat(U, "<span class='notice'>You replace the light [target.fitting] with [src].</span>")
 
 			if(target.status != LIGHT_EMPTY)
 				AddShards(1, U)

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

@@ -18,13 +18,6 @@
 	name = "syndicate personal AI device"
 	faction = list("syndicate")
 
-/obj/item/paicard/relaymove(var/mob/user, var/direction)
-	if(user.stat || user.stunned)
-		return
-	var/obj/item/rig/rig = get_rig()
-	if(istype(rig))
-		rig.forced_move(direction, user)
-
 /obj/item/paicard/New()
 	..()
 	overlays += "pai-off"

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

@@ -10,8 +10,6 @@
 	materials = list(MAT_METAL=10000, MAT_GLASS=2500)
 	var/code = 2
 
-	is_special = 1
-
 /obj/item/radio/electropack/attack_hand(mob/user as mob)
 	if(src == user.back)
 		to_chat(user, "<span class='notice'>You need help taking this off!</span>")
@@ -54,23 +52,6 @@
 		if(src.flags & NODROP)
 			A.flags |= NODROP
 
-/obj/item/radio/electropack/Topic(href, href_list)
-	if(..())
-		return 1
-
-	if(href_list["freq"])
-		var/new_frequency = sanitize_frequency(frequency + text2num(href_list["freq"]))
-		set_frequency(new_frequency)
-
-	else if(href_list["code"])
-		code += text2num(href_list["code"])
-		code = round(code)
-		code = clamp(code, 1, 100)
-
-	else if(href_list["power"])
-		on = !on
-
-	add_fingerprint(usr)
 
 /obj/item/radio/electropack/receive_signal(datum/signal/signal)
 	if(!signal || signal.encryption != code)
@@ -96,18 +77,48 @@
 	return
 
 
-/obj/item/radio/electropack/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
-	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/item/radio/electropack/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_inventory_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "radio_electro.tmpl", "[name]", 400, 500)
+		ui = new(user, src, ui_key, "Electropack", name, 360, 150, master_ui, state)
 		ui.open()
-		ui.set_auto_update(1)
-
-/obj/item/radio/electropack/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
-	var/data[0]
 
+/obj/item/radio/electropack/tgui_data(mob/user)
+	var/list/data = list()
 	data["power"] = on
-	data["freq"] = format_frequency(frequency)
+	data["frequency"] = frequency
 	data["code"] = code
-
+	data["minFrequency"] = PUBLIC_LOW_FREQ
+	data["maxFrequency"] = PUBLIC_HIGH_FREQ
 	return data
+
+/obj/item/radio/electropack/tgui_act(action, params)
+	if(..())
+		return
+	. = TRUE
+	switch(action)
+		if("power")
+			on = !on
+		if("freq")
+			var/value = params["freq"]
+			if(value)
+				frequency = sanitize_frequency(value)
+				set_frequency(frequency)
+			else
+				. = FALSE
+		if("code")
+			var/value = text2num(params["code"])
+			if(value)
+				value = round(value)
+				code = clamp(value, 1, 100)
+			else
+				. = FALSE
+		if("reset")
+			if(params["reset"] == "freq")
+				frequency = initial(frequency)
+			else if(params["reset"] == "code")
+				code = initial(code)
+			else
+				. = FALSE
+	if(.)
+		add_fingerprint(usr)

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

@@ -9,7 +9,6 @@
 		"Vox Armalis" = 'icons/mob/species/armalis/ears.dmi'
 		) //We read you loud and skree-er.
 	materials = list(MAT_METAL=75)
-	subspace_transmission = TRUE
 	canhear_range = 0 // can't hear headsets from very far away
 
 	slot_flags = SLOT_EARS
@@ -91,6 +90,7 @@
 	ks1type = /obj/item/encryptionkey/syndicate/nukeops
 	requires_tcomms = FALSE
 	instant = TRUE // Work instantly if there are no comms
+	freqlock = TRUE
 
 /obj/item/radio/headset/syndicate/alt //undisguised bowman with flash protection
 	name = "syndicate headset"
@@ -289,6 +289,7 @@
 	icon_state = "com_headset"
 	item_state = "headset"
 	ks2type = /obj/item/encryptionkey/ert
+	freqlock = TRUE
 
 /obj/item/radio/headset/ert/alt
 	name = "\proper emergency response team's bowman headset"
@@ -367,7 +368,7 @@
 	else
 		to_chat(user, "This headset doesn't have any encryption keys!  How useless...")
 
-/obj/item/radio/headset/proc/recalculateChannels(var/setDescription = FALSE)
+/obj/item/radio/headset/recalculateChannels(setDescription = FALSE)
 	channels = list()
 	translate_binary = FALSE
 	translate_hive = FALSE

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

@@ -75,7 +75,6 @@
 	name = "illicit intercom"
 	desc = "Talk through this. Evilly"
 	frequency = SYND_FREQ
-	subspace_transmission = TRUE
 	syndiekey = new /obj/item/encryptionkey/syndicate/nukeops
 
 /obj/item/radio/intercom/syndicate/New()
@@ -85,7 +84,6 @@
 /obj/item/radio/intercom/pirate
 	name = "pirate radio intercom"
 	desc = "You wouldn't steal a space shuttle. Piracy. It's a crime!"
-	subspace_transmission = 1
 
 /obj/item/radio/intercom/pirate/New()
 	..()
@@ -109,13 +107,13 @@
 	GLOB.global_intercoms.Remove(src)
 	return ..()
 
-/obj/item/radio/intercom/attack_ai(mob/user as mob)
+/obj/item/radio/intercom/attack_ai(mob/user)
 	add_hiddenprint(user)
 	add_fingerprint(user)
 	spawn(0)
 		attack_self(user)
 
-/obj/item/radio/intercom/attack_hand(mob/user as mob)
+/obj/item/radio/intercom/attack_hand(mob/user)
 	add_fingerprint(user)
 	spawn(0)
 		attack_self(user)
@@ -186,10 +184,10 @@
 	update_icon()
 	START_PROCESSING(SSobj, src)
 	for(var/i, i<= 5, i++)
-		wires.UpdateCut(i,1)
+		wires.on_cut(i, 1)
 
 /obj/item/radio/intercom/wirecutter_act(mob/user, obj/item/I)
-	if(!(buildstage == 3 && b_stat && wires.IsAllCut()))
+	if(!(buildstage == 3 && b_stat && wires.is_all_cut()))
 		return
 	. = TRUE
 	if(!I.use_tool(src, user, 0, volume = I.tool_volume))
@@ -270,4 +268,4 @@
 
 /obj/item/radio/intercom/locked/prison/New()
 	..()
-	wires.CutWireIndex(RADIO_WIRE_TRANSMIT)
+	wires.cut(WIRE_RADIO_TRANSMIT)

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

@@ -26,21 +26,37 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 	suffix = "\[3\]"
 	icon_state = "walkietalkie"
 	item_state = "walkietalkie"
-	var/on = 1 // 0 for off
+	/// boolean for radio enabled or not
+	var/on = TRUE
 	var/last_transmission
-	var/frequency = PUB_FREQ //common chat
-	var/traitor_frequency = 0 //tune to frequency to unlock traitor supplies
-	var/canhear_range = 3 // the range which mobs can hear this radio from
+	var/frequency = PUB_FREQ
+	/// tune to frequency to unlock traitor supplies
+	var/traitor_frequency = 0
+	/// the range which mobs can hear this radio from
+	var/canhear_range = 3
 	var/datum/wires/radio/wires = null
 	var/b_stat = 0
-	var/broadcasting = 0
-	var/listening = 1
-	var/list/channels = list() //see communications.dm for full list. First channes is a "default" for :h
-	var/subspace_transmission = 0
-	var/obj/item/encryptionkey/syndicate/syndiekey = null //Holder for the syndicate encryption key if present
-	var/disable_timer = 0 //How many times this is disabled by EMPs
 
-	var/is_special = 0 //For electropacks mostly, skips Topic() checks
+	/// Whether the radio will broadcast stuff it hears, out over the radio
+	var/broadcasting = FALSE
+	/// Whether the radio is currently receiving
+	var/listening = TRUE
+	/// Whether the radio can be re-tuned to restricted channels it has no key for
+	var/freerange = FALSE
+	/// Whether the radio is able to have its primary frequency changed. Used for radios with weird primary frequencies, like DS, syndi, etc
+	var/freqlock = FALSE
+
+	/// Whether the radio broadcasts to everyone within a few tiles, or not
+	var/loudspeaker = FALSE
+	/// Whether loudspeaker can be toggled by the user
+	var/has_loudspeaker = FALSE
+
+	/// see communications.dm for full list. First channes is a "default" for :h
+	var/list/channels = list()
+	/// Holder for the syndicate encryption key if present
+	var/obj/item/encryptionkey/syndicate/syndiekey = null
+	/// How many times this is disabled by EMPs
+	var/disable_timer = 0
 
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
@@ -76,6 +92,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 	GLOB.global_radios |= src
 
 /obj/item/radio/Destroy()
+	SStgui.close_uis(wires)
 	QDEL_NULL(wires)
 	if(SSradio)
 		SSradio.remove_object(src, frequency)
@@ -99,47 +116,87 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 /obj/item/radio/attack_ghost(mob/user)
 	return interact(user)
 
-/obj/item/radio/attack_self(mob/user as mob)
-	user.set_machine(src)
-	interact(user)
+/obj/item/radio/attack_self(mob/user)
+	tgui_interact(user)
 
 /obj/item/radio/interact(mob/user)
 	if(!user)
 		return 0
-
 	if(b_stat)
 		wires.Interact(user)
+	tgui_interact(user)
 
-	return ui_interact(user)
-
-/obj/item/radio/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
-	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/item/radio/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "radio_basic.tmpl", "[name]", 400, 550)
+		ui = new(user, src, ui_key, "Radio", name, 360, 150 + (length(channels) * 20), master_ui, state)
 		ui.open()
-		ui.set_auto_update(1)
 
-/obj/item/radio/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
-	var/data[0]
+/obj/item/radio/tgui_data(mob/user)
+	var/list/data = list()
 
-	data["mic_status"] = broadcasting
-	data["speaker"] = listening
-	data["freq"] = format_frequency(frequency)
-	data["rawfreq"] = num2text(frequency)
-
-	data["mic_cut"] = (wires.IsIndexCut(RADIO_WIRE_TRANSMIT) || wires.IsIndexCut(RADIO_WIRE_SIGNAL))
-	data["spk_cut"] = (wires.IsIndexCut(RADIO_WIRE_RECEIVE) || wires.IsIndexCut(RADIO_WIRE_SIGNAL))
-
-	var/list/chanlist = list_channels(user)
-	if(islist(chanlist) && chanlist.len)
-		data["chan_list"] = chanlist
-		data["chan_list_len"] = chanlist.len
-
-	if(syndiekey)
-		data["useSyndMode"] = 1
+	data["broadcasting"] = broadcasting
+	data["listening"] = listening
+	data["frequency"] = frequency
+	data["minFrequency"] = freerange ? RADIO_LOW_FREQ : PUBLIC_LOW_FREQ
+	data["maxFrequency"] = freerange ? RADIO_HIGH_FREQ : PUBLIC_HIGH_FREQ
+	data["canReset"] = frequency == initial(frequency) ? FALSE : TRUE
+	data["freqlock"] = freqlock
+	data["channels"] = list()
+	for(var/channel in channels)
+		data["channels"][channel] = channels[channel] & FREQ_LISTENING
 
+	data["has_loudspeaker"] = has_loudspeaker
+	data["loudspeaker"] = loudspeaker
 	return data
 
+/obj/item/radio/tgui_act(action, params, datum/tgui/ui)
+	if(..())
+		return
+	. = TRUE
+	switch(action)
+		if("frequency")
+			if(freqlock)
+				return
+			var/tune = params["tune"]
+			var/adjust = text2num(params["adjust"])
+			if(tune == "reset")
+				tune = initial(frequency)
+			else if(adjust)
+				tune = frequency + adjust * 10
+			else if(text2num(tune) != null)
+				tune = tune * 10
+			else
+				. = FALSE
+			if(hidden_uplink)
+				if(hidden_uplink.check_trigger(usr, frequency, traitor_frequency))
+					usr << browse(null, "window=radio")
+			if(.)
+				set_frequency(sanitize_frequency(tune, freerange))
+		if("listen")
+			listening = !listening
+		if("broadcast")
+			broadcasting = !broadcasting
+		if("channel")
+			var/channel = params["channel"]
+			if(!(channel in channels))
+				return
+			if(channels[channel] & FREQ_LISTENING)
+				channels[channel] &= ~FREQ_LISTENING
+			else
+				channels[channel] |= FREQ_LISTENING
+		if("loudspeaker")
+			// Toggle loudspeaker mode, AKA everyone around you hearing your radio.
+			if(has_loudspeaker)
+				loudspeaker = !loudspeaker
+				if(loudspeaker)
+					canhear_range = 3
+				else
+					canhear_range = 0
+		else
+			. = FALSE
+	if(.)
+		add_fingerprint(usr)
 
 /obj/item/radio/proc/list_channels(var/mob/user)
 	return list_internal_channels(user)
@@ -184,57 +241,10 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 	return can_admin_interact()
 
 /obj/item/radio/proc/ToggleBroadcast()
-	broadcasting = !broadcasting && !(wires.IsIndexCut(RADIO_WIRE_TRANSMIT) || wires.IsIndexCut(RADIO_WIRE_SIGNAL))
+	broadcasting = !broadcasting && !(wires.is_cut(WIRE_RADIO_TRANSMIT) || wires.is_cut(WIRE_RADIO_SIGNAL))
 
 /obj/item/radio/proc/ToggleReception()
-	listening = !listening && !(wires.IsIndexCut(RADIO_WIRE_RECEIVE) || wires.IsIndexCut(RADIO_WIRE_SIGNAL))
-
-/obj/item/radio/Topic(href, href_list)
-	if(..())
-		return 1
-
-	if(is_special)
-		return 0
-
-	if(href_list["track"])
-		var/mob/target = locate(href_list["track"])
-		var/mob/living/silicon/ai/A = locate(href_list["track2"])
-		if(A && target)
-			A.ai_actual_track(target)
-		. = 1
-
-	else if(href_list["freq"])
-		var/new_frequency = (frequency + text2num(href_list["freq"]))
-		if((new_frequency < PUBLIC_LOW_FREQ || new_frequency > PUBLIC_HIGH_FREQ))
-			new_frequency = sanitize_frequency(new_frequency)
-		set_frequency(new_frequency)
-		if(hidden_uplink)
-			if(hidden_uplink.check_trigger(usr, frequency, traitor_frequency))
-				usr << browse(null, "window=radio")
-		. = 1
-	else if(href_list["talk"])
-		ToggleBroadcast()
-		. = 1
-	else if(href_list["listen"])
-		var/chan_name = href_list["ch_name"]
-		if(!chan_name)
-			ToggleReception()
-		else
-			if(channels[chan_name] & FREQ_LISTENING)
-				channels[chan_name] &= ~FREQ_LISTENING
-			else
-				channels[chan_name] |= FREQ_LISTENING
-		. = 1
-	else if(href_list["spec_freq"])
-		var/freq = href_list["spec_freq"]
-		if(has_channel_access(usr, freq))
-			set_frequency(text2num(freq))
-		. = 1
-
-	if(href_list["nowindow"]) // here for pAIs, maybe others will want it, idk
-		return 1
-
-	add_fingerprint(usr)
+	listening = !listening && !(wires.is_cut(WIRE_RADIO_RECEIVER) || wires.is_cut(WIRE_RADIO_SIGNAL))
 
 /obj/item/radio/proc/autosay(message, from, channel, role = "Unknown") //BS12 EDIT
 	var/datum/radio_frequency/connection = null
@@ -325,7 +335,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 	// If we were to send to a channel we don't have, drop it.
 	return RADIO_CONNECTION_FAIL
 
-/obj/item/radio/talk_into(mob/living/M as mob, list/message_pieces, channel, var/verb = "says")
+/obj/item/radio/talk_into(mob/living/M as mob, list/message_pieces, channel, verbage = "says")
 	if(!on)
 		return 0 // the device has to be on
 	//  Fix for permacell radios, but kinda eh about actually fixing them.
@@ -334,7 +344,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 
 	//  Uncommenting this. To the above comment:
 	// 	The permacell radios aren't suppose to be able to transmit, this isn't a bug and this "fix" is just making radio wires useless. -Giacom
-	if(wires.IsIndexCut(RADIO_WIRE_TRANSMIT)) // The device has to have all its wires and shit intact
+	if(wires.is_cut(WIRE_RADIO_TRANSMIT)) // The device has to have all its wires and shit intact
 		return 0
 
 	if(!M.IsVocal())
@@ -411,11 +421,16 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 		jobname = "Unknown"
 		voicemask = TRUE
 
+	// Copy the message pieces so we can safely edit comms line without affecting the actual line
+	var/list/message_pieces_copy = list()
+	for(var/datum/multilingual_say_piece/S in message_pieces)
+		message_pieces_copy += new /datum/multilingual_say_piece(S.speaking, S.message)
+
 	// Make us a message datum!
 	var/datum/tcomms_message/tcm = new
 	tcm.sender_name = displayname
 	tcm.sender_job = jobname
-	tcm.message_pieces = message_pieces
+	tcm.message_pieces = message_pieces_copy
 	tcm.source_level = position.z
 	tcm.freq = connection.frequency
 	tcm.vmask = voicemask
@@ -423,6 +438,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 	tcm.connection = connection
 	tcm.vname = M.voice_name
 	tcm.sender = M
+	tcm.verbage = verbage
 	// Now put that through the stuff
 	var/handled = FALSE
 	if(connection)
@@ -509,7 +525,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 	var/is_listening = TRUE
 	if(!on)
 		is_listening = FALSE
-	if(!wires || wires.IsIndexCut(RADIO_WIRE_RECEIVE))
+	if(!wires || wires.is_cut(WIRE_RADIO_RECEIVER))
 		is_listening = FALSE
 	if(!listening)
 		is_listening = FALSE
@@ -575,19 +591,24 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 	if(!disable_timer)
 		on = 1
 
+/obj/item/radio/proc/recalculateChannels()
+	/// Exists so that borg radios and headsets can override it.
+	stack_trace("recalculateChannels() called on a radio which does not implement the proc.")
+
 ///////////////////////////////
 //////////Borg Radios//////////
 ///////////////////////////////
 //Giving borgs their own radio to have some more room to work with -Sieve
 
 /obj/item/radio/borg
+	name = "Cyborg Radio"
 	var/mob/living/silicon/robot/myborg = null // Cyborg which owns this radio. Used for power checks
 	var/obj/item/encryptionkey/keyslot = null//Borg radios can handle a single encryption key
-	var/shut_up = 1
 	icon = 'icons/obj/robot_component.dmi' // Cyborgs radio icons should look like the component.
 	icon_state = "radio"
+	has_loudspeaker = TRUE
+	loudspeaker = FALSE
 	canhear_range = 0
-	subspace_transmission = 1
 	dog_fashion = null
 
 /obj/item/radio/borg/syndicate
@@ -609,12 +630,14 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 	..()
 	syndiekey = keyslot
 	set_frequency(SYND_FREQ)
+	freqlock = TRUE
 
 /obj/item/radio/borg/deathsquad
 
 /obj/item/radio/borg/deathsquad/New()
 	..()
 	set_frequency(DTH_FREQ)
+	freqlock = TRUE
 
 /obj/item/radio/borg/ert
 	keyslot = new /obj/item/encryptionkey/ert
@@ -622,6 +645,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 /obj/item/radio/borg/ert/New()
 	..()
 	set_frequency(ERT_FREQ)
+	freqlock = TRUE
 
 /obj/item/radio/borg/ert/specops
 	keyslot = new /obj/item/encryptionkey/centcom
@@ -666,7 +690,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 	else
 		to_chat(user, "This radio doesn't have any encryption keys!")
 
-/obj/item/radio/borg/proc/recalculateChannels()
+/obj/item/radio/borg/recalculateChannels()
 	channels = list()
 	syndiekey = null
 
@@ -699,72 +723,12 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 
 	return
 
-/obj/item/radio/borg/Topic(href, href_list)
-	if(..())
-		return 1
-	if(href_list["mode"])
-		var/enable_subspace_transmission = text2num(href_list["mode"])
-		if(enable_subspace_transmission != subspace_transmission)
-			subspace_transmission = !subspace_transmission
-			if(subspace_transmission)
-				to_chat(usr, "<span class='notice'>Subspace Transmission is enabled.</span>")
-			else
-				to_chat(usr, "<span class='notice'>Subspace Transmission is disabled.</span>")
 
-			if(subspace_transmission == 0)//Simple as fuck, clears the channel list to prevent talking/listening over them if subspace transmission is disabled
-				channels = list()
-			else
-				recalculateChannels()
-		. = 1
-	if(href_list["shutup"]) // Toggle loudspeaker mode, AKA everyone around you hearing your radio.
-		var/do_shut_up = text2num(href_list["shutup"])
-		if(do_shut_up != shut_up)
-			shut_up = !shut_up
-			if(shut_up)
-				canhear_range = 0
-				to_chat(usr, "<span class='notice'>Loudspeaker disabled.</span>")
-			else
-				canhear_range = 3
-				to_chat(usr, "<span class='notice'>Loudspeaker enabled.</span>")
-		. = 1
-
-
-/obj/item/radio/borg/interact(mob/user as mob)
+/obj/item/radio/borg/interact(mob/user)
 	if(!on)
 		return
-
 	. = ..()
 
-/obj/item/radio/borg/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
-	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
-	if(!ui)
-		ui = new(user, src, ui_key, "radio_basic.tmpl", "[name]", 430, 500)
-		ui.open()
-		ui.set_auto_update(1)
-
-/obj/item/radio/borg/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
-	var/data[0]
-
-	data["mic_status"] = broadcasting
-	data["speaker"] = listening
-	data["freq"] = format_frequency(frequency)
-	data["rawfreq"] = num2text(frequency)
-
-	var/list/chanlist = list_channels(user)
-	if(islist(chanlist) && chanlist.len)
-		data["chan_list"] = chanlist
-		data["chan_list_len"] = chanlist.len
-
-	if(syndiekey)
-		data["useSyndMode"] = 1
-
-	data["has_loudspeaker"] = 1
-	data["loudspeaker"] = !shut_up
-	data["has_subspace"] = 1
-	data["subspace"] = subspace_transmission
-
-	return data
-
 /obj/item/radio/proc/config(op)
 	if(SSradio)
 		for(var/ch_name in channels)

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

@@ -72,7 +72,7 @@ REAGENT SCANNER
 						var/turf/U = O.loc
 						if(U && U.intact)
 							O.invisibility = 101
-							O.alpha = 255
+						O.alpha = 255
 		for(var/mob/living/M in T.contents)
 			var/oldalpha = M.alpha
 			if(M.alpha < 255 && istype(M))

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

@@ -64,7 +64,7 @@
 		A.toggle_secure()	//this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb).
 
 		investigate_log("[key_name(user)] attached a [A] to a transfer valve.", INVESTIGATE_BOMB)
-		msg_admin_attack("[key_name_admin(user)]attached [A] to a transfer valve.", ATKLOG_FEW)
+		add_attack_logs(user, src, "attached [A] to a transfer valve", ATKLOG_FEW)
 		log_game("[key_name_admin(user)] attached [A] to a transfer valve.")
 		attacher = user
 		SSnanoui.update_uis(src) // update all UIs attached to src
@@ -86,64 +86,64 @@
 		O.hear_message(M, msg)
 
 /obj/item/transfer_valve/attack_self(mob/user)
-	ui_interact(user)
+	tgui_interact(user)
 
-/obj/item/transfer_valve/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1)
-	// update the ui if it exists, returns null if no ui is passed/found
-	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/item/transfer_valve/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_inventory_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		// the ui does not exist, so we'll create a new() one
-        // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
-		ui = new(user, src, ui_key, "transfer_valve.tmpl", "Tank Transfer Valve", 460, 280)
-		// open the new ui window
+		ui = new(user, src, ui_key, "TransferValve",  name, 460, 320, master_ui, state)
 		ui.open()
-		// auto update every Master Controller tick
-		//ui.set_auto_update(1)
-
-/obj/item/transfer_valve/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
-	var/data[0]
-
-	data["attachmentOne"] = tank_one ? tank_one.name : null
-	data["attachmentTwo"] = tank_two ? tank_two.name : null
-	data["valveAttachment"] = attached_device ? attached_device.name : null
-	data["valveOpen"] = valve_open ? 1 : 0
 
+/obj/item/transfer_valve/tgui_data(mob/user)
+	var/list/data = list()
+	data["tank_one"] = tank_one ? tank_one.name : null
+	data["tank_two"] = tank_two ? tank_two.name : null
+	data["attached_device"] = attached_device ? attached_device.name : null
+	data["valve"] = valve_open
 	return data
 
-/obj/item/transfer_valve/Topic(href, href_list)
-	..()
-	if(usr.incapacitated())
-		return 0
-	if(loc != usr)
-		return 0
-	if(tank_one && href_list["tankone"])
-		split_gases()
-		valve_open = 0
-		tank_one.forceMove(get_turf(src))
-		tank_one = null
+
+
+/obj/item/transfer_valve/tgui_act(action, params)
+	if(..())
+		return
+	. = TRUE
+	switch(action)
+		if("tankone")
+			if(tank_one)
+				split_gases()
+				valve_open = FALSE
+				tank_one.forceMove(get_turf(src))
+				tank_one = null
+				update_icon()
+				if((!tank_two || tank_two.w_class < WEIGHT_CLASS_BULKY) && (w_class > WEIGHT_CLASS_NORMAL))
+					w_class = WEIGHT_CLASS_NORMAL
+		if("tanktwo")
+			if(tank_two)
+				split_gases()
+				valve_open = FALSE
+				tank_two.forceMove(get_turf(src))
+				tank_two = null
+				update_icon()
+				if((!tank_one || tank_one.w_class < WEIGHT_CLASS_BULKY) && (w_class > WEIGHT_CLASS_NORMAL))
+					w_class = WEIGHT_CLASS_NORMAL
+		if("toggle")
+			toggle_valve(usr)
+		if("device")
+			if(attached_device)
+				attached_device.attack_self(usr)
+		if("remove_device")
+			if(attached_device)
+				attached_device.forceMove(get_turf(src))
+				attached_device.holder = null
+				attached_device = null
+				update_icon()
+		else
+			. = FALSE
+	if(.)
 		update_icon()
-		if((!tank_two || tank_two.w_class < WEIGHT_CLASS_BULKY) && (w_class > WEIGHT_CLASS_NORMAL))
-			w_class = WEIGHT_CLASS_NORMAL
-	else if(tank_two && href_list["tanktwo"])
-		split_gases()
-		valve_open = 0
-		tank_two.forceMove(get_turf(src))
-		tank_two = null
-		update_icon()
-		if((!tank_one || tank_one.w_class < WEIGHT_CLASS_BULKY) && (w_class > WEIGHT_CLASS_NORMAL))
-			w_class = WEIGHT_CLASS_NORMAL
-	else if(href_list["open"])
-		toggle_valve()
-	else if(attached_device)
-		if(href_list["rem_device"])
-			attached_device.forceMove(get_turf(src))
-			attached_device.holder = null
-			attached_device = null
-			update_icon()
-		if(href_list["device"])
-			attached_device.attack_self(usr)
-	add_fingerprint(usr)
-	return 1 // Returning 1 sends an update to attached UIs
+		add_fingerprint(usr)
+
 
 /obj/item/transfer_valve/proc/process_activation(obj/item/D)
 	if(toggle)
@@ -190,7 +190,7 @@
 	it explodes properly when it gets a signal (and it does).
 	*/
 
-/obj/item/transfer_valve/proc/toggle_valve()
+/obj/item/transfer_valve/proc/toggle_valve(mob/user)
 	if(!valve_open && tank_one && tank_two)
 		valve_open = 1
 		var/turf/bombturf = get_turf(src)
@@ -207,6 +207,8 @@
 		investigate_log("Bomb valve opened at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]) with [attached_device ? attached_device : "no device"], attached by [attacher_name]. Last touched by: [key_name(mob)]", INVESTIGATE_BOMB)
 		message_admins("Bomb valve opened at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[bombturf.x];Y=[bombturf.y];Z=[bombturf.z]'>[A.name] (JMP)</a> with [attached_device ? attached_device : "no device"], attached by [attacher_name]. Last touched by: [key_name_admin(mob)]")
 		log_game("Bomb valve opened at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]) with [attached_device ? attached_device : "no device"], attached by [attacher_name]. Last touched by: [key_name(mob)]")
+		if(user)
+			add_attack_logs(user, src, "Bomb valve opened with [attached_device ? attached_device : "no device"], attached by [attacher_name]. Last touched by: [key_name(mob)]", ATKLOG_FEW)
 		merge_gases()
 		spawn(20) // In case one tank bursts
 			for(var/i in 1 to 5)

code/game/objects/items/flag.dm

@@ -242,15 +242,16 @@
 			to_chat(user, "<span class='notice'>You hide [I] in the [src]. It will detonate some time after the flag is lit on fire.</span>")
 			var/turf/bombturf = get_turf(src)
 			var/area/A = get_area(bombturf)
-			message_admins("[key_name_admin(user)] has hidden [I] in the [src] ready for detonation at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[bombturf.x];Y=[bombturf.y];Z=[bombturf.z]'>[A.name] (JMP)</a>.")
 			log_game("[key_name(user)] has hidden [I] in the [src] ready for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).")
 			investigate_log("[key_name(user)] has hidden [I] in the [src] ready for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).", INVESTIGATE_BOMB)
+			add_attack_logs(user, src, "has hidden [I] ready for detonation in", ATKLOG_MOST)
 	else if(is_hot(I) && !(resistance_flags & ON_FIRE) && boobytrap && trapper)
 		var/turf/bombturf = get_turf(src)
 		var/area/A = get_area(bombturf)
-		message_admins("[key_name_admin(user)] has lit the [src] trapped with [boobytrap] by [key_name_admin(trapper)] at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[bombturf.x];Y=[bombturf.y];Z=[bombturf.z]'>[A.name] (JMP)</a>.")
 		log_game("[key_name_admin(user)] has lit the [src] trapped with [boobytrap] by [key_name_admin(trapper)] at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).")
 		investigate_log("[key_name_admin(user)] has lit the [src] trapped with [boobytrap] by [key_name_admin(trapper)] at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).", INVESTIGATE_BOMB)
+		add_attack_logs(user, src, "has lit (booby trapped with [boobytrap]", ATKLOG_FEW)
+		burn()
 	else
 		return ..()
 
@@ -267,8 +268,16 @@
 
 /obj/item/flag/chameleon/burn()
 	if(boobytrap)
-		boobytrap.prime()
-	..()
+		fire_act()
+		addtimer(CALLBACK(src, .proc/prime_boobytrap), boobytrap.det_time)
+	else
+		..()
+
+/obj/item/flag/chameleon/proc/prime_boobytrap()
+	boobytrap.forceMove(get_turf(loc))
+	boobytrap.prime()
+	boobytrap = null
+	burn()
 
 /obj/item/flag/chameleon/updateFlagIcon()
 	icon_state = updated_icon_state

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

@@ -29,7 +29,7 @@
 					"<span class='userdanger'>[user] has prodded you with [src]!</span>")
 
 	playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1)
-	add_attack_logs(user, M, "Stunned with [src] (INTENT: [uppertext(user.a_intent)])")
+	add_attack_logs(user, M, "Stunned with [src] ([uppertext(user.a_intent)])")
 
 /obj/item/borg/overdrive
 	name = "Overdrive"

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

@@ -185,20 +185,18 @@
 
 /obj/item/borg/upgrade/syndicate
 	name = "safety override module"
-	desc = "Unlocks the hidden, deadlier functions of a cyborg. Also prevents emag subversion."
+	desc = "Unlocks the hidden, deadlier functions of a cyborg."
 	icon_state = "cyborg_upgrade3"
-	origin_tech = "combat=4;syndicate=1"
+	origin_tech = "combat=6;materials=6"
 	require_module = TRUE
 
 /obj/item/borg/upgrade/syndicate/action(mob/living/silicon/robot/R)
 	if(..())
 		return
-	if(R.emagged)
-		return
 	if(R.weapons_unlock)
-		to_chat(R, "<span class='warning'>Internal diagnostic error: incompatible upgrade module detected.</span>")
+		to_chat(R, "<span class='warning'>Warning: Safety Overide Protocols have be disabled.</span>")
 		return
-	R.emagged = 1
+	R.weapons_unlock = 1
 	return TRUE
 
 /obj/item/borg/upgrade/lavaproof

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

@@ -15,6 +15,7 @@
  */
 GLOBAL_LIST_INIT(metal_recipes, list(
 	new /datum/stack_recipe("stool", /obj/structure/chair/stool, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("barstool", /obj/structure/chair/stool/bar, one_per_turf = 1, on_floor = 1),
 	new /datum/stack_recipe("chair", /obj/structure/chair, one_per_turf = 1, on_floor = 1),
 	new /datum/stack_recipe("shuttle seat", /obj/structure/chair/comfy/shuttle, 2, one_per_turf = 1, on_floor = 1),
 	new /datum/stack_recipe("sofa (middle)", /obj/structure/chair/sofa, one_per_turf = 1, on_floor = 1),
@@ -471,7 +472,8 @@ GLOBAL_LIST_INIT(plastic_recipes, list(
 	new /datum/stack_recipe("cane mould", /obj/item/kitchen/mould/cane, 1, on_floor = 1), \
 	new /datum/stack_recipe("cash mould", /obj/item/kitchen/mould/cash, 1, on_floor = 1), \
 	new /datum/stack_recipe("coin mould", /obj/item/kitchen/mould/coin, 1, on_floor = 1), \
-	new /datum/stack_recipe("sucker mould", /obj/item/kitchen/mould/loli, 1, on_floor = 1)))
+	new /datum/stack_recipe("sucker mould", /obj/item/kitchen/mould/loli, 1, on_floor = 1), \
+	new /datum/stack_recipe("warning cone", /obj/item/clothing/head/cone, 5, on_floor = 1)))
 
 /obj/item/stack/sheet/plastic
 	name = "plastic"

code/game/objects/items/toys.dm

@@ -35,7 +35,7 @@
 	desc = "A translucent balloon. There's nothing in it."
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "waterballoon-e"
-	item_state = "balloon-empty"
+	item_state = "waterballoon-e"
 
 /obj/item/toy/balloon/New()
 	..()
@@ -99,10 +99,10 @@
 /obj/item/toy/balloon/update_icon()
 	if(src.reagents.total_volume >= 1)
 		icon_state = "waterballoon"
-		item_state = "balloon"
+		item_state = "waterballoon"
 	else
 		icon_state = "waterballoon-e"
-		item_state = "balloon-empty"
+		item_state = "waterballoon-e"
 
 /obj/item/toy/syndicateballoon
 	name = "syndicate balloon"
@@ -214,8 +214,9 @@
 /obj/item/twohanded/dualsaber/toy/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
 	return 0
 
-/obj/item/twohanded/dualsaber/toy/IsReflect()//Stops Toy Dualsabers from reflecting energy projectiles
-	return 0
+/obj/item/twohanded/dualsaber/toy/IsReflect()
+	if(wielded)
+		return 2
 
 /obj/item/toy/katana
 	name = "replica katana"
@@ -344,56 +345,56 @@
 
 /obj/item/toy/prize/ripley
 	name = "toy ripley"
-	desc = "Mini-Mecha action figure! Collect them all! 1/11."
+	desc = "Mini-Mecha action figure! Collect them all! 1/11. This one is a ripley, a mining and engineering mecha."
 
 /obj/item/toy/prize/fireripley
 	name = "toy firefighting ripley"
-	desc = "Mini-Mecha action figure! Collect them all! 2/11."
+	desc = "Mini-Mecha action figure! Collect them all! 2/11. This one is a firefighter ripley, a fireproof mining and engineering mecha."
 	icon_state = "fireripleytoy"
 
 /obj/item/toy/prize/deathripley
 	name = "toy deathsquad ripley"
-	desc = "Mini-Mecha action figure! Collect them all! 3/11."
+	desc = "Mini-Mecha action figure! Collect them all! 3/11. This one is the black ripley used by the hero of DeathSquad, that TV drama about loose-cannon ERT officers!"
 	icon_state = "deathripleytoy"
 
 /obj/item/toy/prize/gygax
 	name = "toy gygax"
-	desc = "Mini-Mecha action figure! Collect them all! 4/11."
+	desc = "Mini-Mecha action figure! Collect them all! 4/11. This one is the speedy gygax combat mecha. Zoom zoom, pew pew!"
 	icon_state = "gygaxtoy"
 
 /obj/item/toy/prize/durand
 	name = "toy durand"
-	desc = "Mini-Mecha action figure! Collect them all! 5/11."
+	desc = "Mini-Mecha action figure! Collect them all! 5/11. This one is the heavy durand combat mecha. Stomp stomp!"
 	icon_state = "durandprize"
 
 /obj/item/toy/prize/honk
 	name = "toy H.O.N.K."
-	desc = "Mini-Mecha action figure! Collect them all! 6/11."
+	desc = "Mini-Mecha action figure! Collect them all! 6/11. This one is the infamous H.O.N.K mech!"
 	icon_state = "honkprize"
 
 /obj/item/toy/prize/marauder
 	name = "toy marauder"
-	desc = "Mini-Mecha action figure! Collect them all! 7/11."
+	desc = "Mini-Mecha action figure! Collect them all! 7/11. This one is the powerful marauder combat mecha! Run for cover!"
 	icon_state = "marauderprize"
 
 /obj/item/toy/prize/seraph
 	name = "toy seraph"
-	desc = "Mini-Mecha action figure! Collect them all! 8/11."
+	desc = "Mini-Mecha action figure! Collect them all! 8/11. This one is the powerful seraph combat mecha! Someone's in trouble!"
 	icon_state = "seraphprize"
 
 /obj/item/toy/prize/mauler
 	name = "toy mauler"
-	desc = "Mini-Mecha action figure! Collect them all! 9/11."
+	desc = "Mini-Mecha action figure! Collect them all! 9/11. This one is the deadly mauler combat mecha! Look out!"
 	icon_state = "maulerprize"
 
 /obj/item/toy/prize/odysseus
 	name = "toy odysseus"
-	desc = "Mini-Mecha action figure! Collect them all! 10/11."
+	desc = "Mini-Mecha action figure! Collect them all! 10/11. This one is the spindly, syringe-firing odysseus medical mecha."
 	icon_state = "odysseusprize"
 
 /obj/item/toy/prize/phazon
 	name = "toy phazon"
-	desc = "Mini-Mecha action figure! Collect them all! 11/11."
+	desc = "Mini-Mecha action figure! Collect them all! 11/11. This one is the mysterious Phazon combat mecha! Nobody's safe!"
 	icon_state = "phazonprize"
 
 
@@ -404,7 +405,7 @@
 
 
 
-obj/item/toy/cards
+/obj/item/toy/cards
 	resistance_flags = FLAMMABLE
 	max_integrity = 50
 	var/parentdeck = null
@@ -416,14 +417,14 @@ obj/item/toy/cards
 	var/card_throw_range = 20
 	var/list/card_attack_verb = list("attacked")
 
-obj/item/toy/cards/New()
+/obj/item/toy/cards/New()
 	..()
 
-obj/item/toy/cards/proc/apply_card_vars(obj/item/toy/cards/newobj, obj/item/toy/cards/sourceobj) // Applies variables for supporting multiple types of card deck
+/obj/item/toy/cards/proc/apply_card_vars(obj/item/toy/cards/newobj, obj/item/toy/cards/sourceobj) // Applies variables for supporting multiple types of card deck
 	if(!istype(sourceobj))
 		return
 
-obj/item/toy/cards/deck
+/obj/item/toy/cards/deck
 	name = "deck of cards"
 	desc = "A deck of space-grade playing cards."
 	icon = 'icons/obj/toy.dmi'
@@ -433,7 +434,7 @@ obj/item/toy/cards/deck
 	var/cooldown = 0
 	var/list/cards = list()
 
-obj/item/toy/cards/deck/New()
+/obj/item/toy/cards/deck/New()
 	..()
 	icon_state = "deck_[deckstyle]_full"
 	for(var/i in 2 to 10)
@@ -458,7 +459,7 @@ obj/item/toy/cards/deck/New()
 	cards += "Ace of Clubs"
 	cards += "Ace of Diamonds"
 
-obj/item/toy/cards/deck/attack_hand(mob/user as mob)
+/obj/item/toy/cards/deck/attack_hand(mob/user as mob)
 	var/choice = null
 	if(cards.len == 0)
 		icon_state = "deck_[deckstyle]_empty"
@@ -476,14 +477,14 @@ obj/item/toy/cards/deck/attack_hand(mob/user as mob)
 	visible_message("<span class='notice'>[user] draws a card from the deck.</span>", "<span class='notice'>You draw a card from the deck.</span>")
 	update_icon()
 
-obj/item/toy/cards/deck/attack_self(mob/user as mob)
+/obj/item/toy/cards/deck/attack_self(mob/user as mob)
 	if(cooldown < world.time - 50)
 		cards = shuffle(cards)
 		playsound(user, 'sound/items/cardshuffle.ogg', 50, 1)
 		user.visible_message("<span class='notice'>[user] shuffles the deck.</span>", "<span class='notice'>You shuffle the deck.</span>")
 		cooldown = world.time
 
-obj/item/toy/cards/deck/attackby(obj/item/toy/cards/singlecard/C, mob/living/user, params)
+/obj/item/toy/cards/deck/attackby(obj/item/toy/cards/singlecard/C, mob/living/user, params)
 	..()
 	if(istype(C))
 		if(C.parentdeck == src)
@@ -498,7 +499,7 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/singlecard/C, mob/living/use
 		update_icon()
 
 
-obj/item/toy/cards/deck/attackby(obj/item/toy/cards/cardhand/C, mob/living/user, params)
+/obj/item/toy/cards/deck/attackby(obj/item/toy/cards/cardhand/C, mob/living/user, params)
 	..()
 	if(istype(C))
 		if(C.parentdeck == src)
@@ -512,7 +513,7 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/cardhand/C, mob/living/user,
 			to_chat(user, "<span class='notice'>You can't mix cards from other decks.</span>")
 		update_icon()
 
-obj/item/toy/cards/deck/MouseDrop(atom/over_object)
+/obj/item/toy/cards/deck/MouseDrop(atom/over_object)
 	var/mob/M = usr
 	if(usr.stat || !ishuman(usr) || !usr.canmove || usr.restrained())
 		return
@@ -536,7 +537,7 @@ obj/item/toy/cards/deck/MouseDrop(atom/over_object)
 	else
 		to_chat(usr, "<span class='notice'>You can't reach it from here.</span>")
 
-obj/item/toy/cards/deck/update_icon()
+/obj/item/toy/cards/deck/update_icon()
 	switch(cards.len)
 		if(0)
 			icon_state = "deck_[deckstyle]_empty"
@@ -547,7 +548,7 @@ obj/item/toy/cards/deck/update_icon()
 		else
 			icon_state = "deck_[deckstyle]_full"
 
-obj/item/toy/cards/cardhand
+/obj/item/toy/cards/cardhand
 	name = "hand of cards"
 	desc = "A number of cards not in a deck, customarily held in ones hand."
 	icon = 'icons/obj/toy.dmi'
@@ -557,11 +558,11 @@ obj/item/toy/cards/cardhand
 	var/choice = null
 
 
-obj/item/toy/cards/cardhand/attack_self(mob/user as mob)
+/obj/item/toy/cards/cardhand/attack_self(mob/user as mob)
 	user.set_machine(src)
 	interact(user)
 
-obj/item/toy/cards/cardhand/interact(mob/user)
+/obj/item/toy/cards/cardhand/interact(mob/user)
 	var/dat = "You have:<BR>"
 	for(var/t in currenthand)
 		dat += "<A href='?src=[UID()];pick=[t]'>A [t].</A><BR>"
@@ -572,7 +573,7 @@ obj/item/toy/cards/cardhand/interact(mob/user)
 	popup.open()
 
 
-obj/item/toy/cards/cardhand/Topic(href, href_list)
+/obj/item/toy/cards/cardhand/Topic(href, href_list)
 	if(..())
 		return
 	if(usr.stat || !ishuman(usr) || !usr.canmove)
@@ -606,7 +607,7 @@ obj/item/toy/cards/cardhand/Topic(href, href_list)
 				qdel(src)
 		return
 
-obj/item/toy/cards/cardhand/attackby(obj/item/toy/cards/singlecard/C, mob/living/user, params)
+/obj/item/toy/cards/cardhand/attackby(obj/item/toy/cards/singlecard/C, mob/living/user, params)
 	if(istype(C))
 		if(C.parentdeck == parentdeck)
 			currenthand += C.cardname
@@ -618,7 +619,7 @@ obj/item/toy/cards/cardhand/attackby(obj/item/toy/cards/singlecard/C, mob/living
 		else
 			to_chat(user, "<span class='notice'>You can't mix cards from other decks.</span>")
 
-obj/item/toy/cards/cardhand/apply_card_vars(obj/item/toy/cards/newobj,obj/item/toy/cards/sourceobj)
+/obj/item/toy/cards/cardhand/apply_card_vars(obj/item/toy/cards/newobj,obj/item/toy/cards/sourceobj)
 	..()
 	newobj.deckstyle = sourceobj.deckstyle
 	newobj.icon_state = "[deckstyle]_hand2" // Another dumb hack, without this the hand is invisible (or has the default deckstyle) until another card is added.
@@ -631,7 +632,7 @@ obj/item/toy/cards/cardhand/apply_card_vars(obj/item/toy/cards/newobj,obj/item/t
 	newobj.resistance_flags = sourceobj.resistance_flags
 
 
-obj/item/toy/cards/singlecard
+/obj/item/toy/cards/singlecard
 	name = "card"
 	desc = "a card"
 	icon = 'icons/obj/toy.dmi'
@@ -642,7 +643,7 @@ obj/item/toy/cards/singlecard
 	pixel_x = -5
 
 
-obj/item/toy/cards/singlecard/examine(mob/user)
+/obj/item/toy/cards/singlecard/examine(mob/user)
 	. = ..()
 	if(get_dist(user, src) <= 0)
 		if(ishuman(user))
@@ -653,7 +654,7 @@ obj/item/toy/cards/singlecard/examine(mob/user)
 				. += "<span class='notice'>You need to have the card in your hand to check it.</span>"
 
 
-obj/item/toy/cards/singlecard/verb/Flip()
+/obj/item/toy/cards/singlecard/verb/Flip()
 	set name = "Flip Card"
 	set category = "Object"
 	set src in range(1)
@@ -674,7 +675,7 @@ obj/item/toy/cards/singlecard/verb/Flip()
 		name = "card"
 		pixel_x = -5
 
-obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user, params)
+/obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user, params)
 	if(istype(I, /obj/item/toy/cards/singlecard/))
 		var/obj/item/toy/cards/singlecard/C = I
 		if(C.parentdeck == parentdeck)
@@ -704,7 +705,7 @@ obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user, params)
 		else
 			to_chat(user, "<span class='notice'>You can't mix cards from other decks.</span>")
 
-obj/item/toy/cards/cardhand/update_icon()
+/obj/item/toy/cards/cardhand/update_icon()
 	switch(currenthand.len)
 		if(0 to 1)
 			return
@@ -718,12 +719,12 @@ obj/item/toy/cards/cardhand/update_icon()
 			icon_state = "[deckstyle]_hand5"
 
 
-obj/item/toy/cards/singlecard/attack_self(mob/user)
+/obj/item/toy/cards/singlecard/attack_self(mob/user)
 	if(usr.stat || !ishuman(usr) || !usr.canmove || usr.restrained())
 		return
 	Flip()
 
-obj/item/toy/cards/singlecard/apply_card_vars(obj/item/toy/cards/singlecard/newobj,obj/item/toy/cards/sourceobj)
+/obj/item/toy/cards/singlecard/apply_card_vars(obj/item/toy/cards/singlecard/newobj,obj/item/toy/cards/sourceobj)
 	..()
 	newobj.deckstyle = sourceobj.deckstyle
 	newobj.icon_state = "singlecard_down_[deckstyle]" // Without this the card is invisible until flipped. It's an ugly hack, but it works.
@@ -745,7 +746,7 @@ obj/item/toy/cards/singlecard/apply_card_vars(obj/item/toy/cards/singlecard/newo
 || Syndicate playing cards, for pretending you're Gambit and playing poker for the nuke disk. ||
 */
 
-obj/item/toy/cards/deck/syndicate
+/obj/item/toy/cards/deck/syndicate
 	name = "suspicious looking deck of cards"
 	desc = "A deck of space-grade playing cards. They seem unusually rigid."
 	deckstyle = "syndicate"
@@ -760,10 +761,10 @@ obj/item/toy/cards/deck/syndicate
 /*
 || Custom card decks ||
 */
-obj/item/toy/cards/deck/black
+/obj/item/toy/cards/deck/black
 	deckstyle = "black"
 
-obj/item/toy/cards/deck/syndicate/black
+/obj/item/toy/cards/deck/syndicate/black
 	deckstyle = "black"
 
 /obj/item/toy/nuke
@@ -1591,182 +1592,217 @@ obj/item/toy/cards/deck/syndicate/black
 
 /obj/item/toy/figure/cmo
 	name = "Chief Medical Officer action figure"
+	desc = "The ever-suffering CMO, from Space Life's SS12 figurine collection."
 	icon_state = "cmo"
 	toysay = "Suit sensors!"
 
 /obj/item/toy/figure/assistant
 	name = "Assistant action figure"
+	desc = "The faceless, hairless scourge of the station, from Space Life's SS12 figurine collection."
 	icon_state = "assistant"
 	toysay = "Grey tide station wide!"
 
 /obj/item/toy/figure/atmos
 	name = "Atmospheric Technician action figure"
+	desc = "The faithful atmospheric technician, from Space Life's SS12 figurine collection."
 	icon_state = "atmos"
 	toysay = "Glory to Atmosia!"
 
 /obj/item/toy/figure/bartender
 	name = "Bartender action figure"
+	desc = "The suave bartender, from Space Life's SS12 figurine collection."
 	icon_state = "bartender"
 	toysay = "Wheres my monkey?"
 
 /obj/item/toy/figure/borg
 	name = "Cyborg action figure"
+	desc = "The iron-willed cyborg, from Space Life's SS12 figurine collection."
 	icon_state = "borg"
 	toysay = "I. LIVE. AGAIN."
 
 /obj/item/toy/figure/botanist
 	name = "Botanist action figure"
+	desc = "The drug-addicted botanist, from Space Life's SS12 figurine collection."
 	icon_state = "botanist"
 	toysay = "Dude, I see colors..."
 
 /obj/item/toy/figure/captain
 	name = "Captain action figure"
+	desc = "The inept captain, from Space Life's SS12 figurine collection."
 	icon_state = "captain"
 	toysay = "Crew, the Nuke Disk is safely up my ass."
 
 /obj/item/toy/figure/cargotech
 	name = "Cargo Technician action figure"
+	desc = "The hard-working cargo tech, from Space Life's SS12 figurine collection."
 	icon_state = "cargotech"
 	toysay = "For Cargonia!"
 
 /obj/item/toy/figure/ce
 	name = "Chief Engineer action figure"
+	desc = "The expert Chief Engineer, from Space Life's SS12 figurine collection."
 	icon_state = "ce"
 	toysay = "Wire the solars!"
 
 /obj/item/toy/figure/chaplain
 	name = "Chaplain action figure"
+	desc = "The obsessed Chaplain, from Space Life's SS12 figurine collection."
 	icon_state = "chaplain"
 	toysay = "Gods make me a killing machine please!"
 
 /obj/item/toy/figure/chef
 	name = "Chef action figure"
+	desc = "The cannibalistic chef, from Space Life's SS12 figurine collection."
 	icon_state = "chef"
 	toysay = "I swear it's not human meat."
 
 /obj/item/toy/figure/chemist
 	name = "Chemist action figure"
+	desc = "The legally dubious Chemist, from Space Life's SS12 figurine collection."
 	icon_state = "chemist"
 	toysay = "Get your pills!"
 
 /obj/item/toy/figure/clown
 	name = "Clown action figure"
+	desc = "The mischevious Clown, from Space Life's SS12 figurine collection."
 	icon_state = "clown"
 	toysay = "Honk!"
 
 /obj/item/toy/figure/ian
 	name = "Ian action figure"
+	desc = "The adorable corgi, from Space Life's SS12 figurine collection."
 	icon_state = "ian"
 	toysay = "Arf!"
 
 /obj/item/toy/figure/detective
 	name = "Detective action figure"
+	desc = "The clever detective, from Space Life's SS12 figurine collection."
 	icon_state = "detective"
 	toysay = "This airlock has grey jumpsuit and insulated glove fibers on it."
 
 /obj/item/toy/figure/dsquad
 	name = "Death Squad Officer action figure"
+	desc = "It's a member of the DeathSquad, a TV drama where loose-cannon ERT officers face up against the threats of the galaxy! It's from Space Life's special edition SS12 figurine collection."
 	icon_state = "dsquad"
 	toysay = "Eliminate all threats!"
 
 /obj/item/toy/figure/engineer
 	name = "Engineer action figure"
+	desc = "The frantic engineer, from Space Life's SS12 figurine collection."
 	icon_state = "engineer"
 	toysay = "Oh god, the singularity is loose!"
 
 /obj/item/toy/figure/geneticist
 	name = "Geneticist action figure"
+	desc = "The balding geneticist, from Space Life's SS12 figurine collection."
 	icon_state = "geneticist"
 	toysay = "I'm not qualified for this job."
 
 /obj/item/toy/figure/hop
 	name = "Head of Personnel action figure"
+	desc = "The officious Head of Personnel, from Space Life's SS12 figurine collection."
 	icon_state = "hop"
-	toysay = "Giving out all access!"
+	toysay = "Papers, please!"
 
 /obj/item/toy/figure/hos
 	name = "Head of Security action figure"
+	desc = "The bloodlust-filled Head of Security, from Space Life's SS12 figurine collection."
 	icon_state = "hos"
-	toysay = "I'm here to win, anything else is secondary."
+	toysay = "Space law? What?"
 
 /obj/item/toy/figure/qm
 	name = "Quartermaster action figure"
+	desc = "The nationalistic Quartermaster, from Space Life's SS12 figurine collection."
 	icon_state = "qm"
 	toysay = "Hail Cargonia!"
 
 /obj/item/toy/figure/janitor
 	name = "Janitor action figure"
+	desc = "The water-using Janitor, from Space Life's SS12 figurine collection."
 	icon_state = "janitor"
 	toysay = "Look at the signs, you idiot."
 
 /obj/item/toy/figure/lawyer
 	name = "Internal Affairs Agent action figure"
+	desc = "The unappreciated Internal Affairs Agent, from Space Life's SS12 figurine collection."
 	icon_state = "lawyer"
 	toysay = "Standard Operating Procedure says they're guilty! Hacking is proof they're an Enemy of the Corporation!"
 
 /obj/item/toy/figure/librarian
 	name = "Librarian action figure"
+	desc = "The quiet Librarian, from Space Life's SS12 figurine collection."
 	icon_state = "librarian"
 	toysay = "One day while..."
 
 /obj/item/toy/figure/md
 	name = "Medical Doctor action figure"
+	desc = "The stressed-out doctor, from Space Life's SS12 figurine collection."
 	icon_state = "md"
 	toysay = "The patient is already dead!"
 
 /obj/item/toy/figure/mime
 	name = "Mime action figure"
-	desc = "A \"Space Life\" brand Mime action figure."
+	desc = "... from Space Life's SS12 figurine collection."
 	icon_state = "mime"
 	toysay = "..."
 
 /obj/item/toy/figure/miner
 	name = "Shaft Miner action figure"
+	desc = "The gun-toting Shaft Miner, from Space Life's SS12 figurine collection."
 	icon_state = "miner"
 	toysay = "Oh god it's eating my intestines!"
 
 /obj/item/toy/figure/ninja
 	name = "Ninja action figure"
+	desc = "It's the mysterious ninja! It's from Space Life's special edition SS12 figurine collection."
 	icon_state = "ninja"
 	toysay = "Oh god! Stop shooting, I'm friendly!"
 
 /obj/item/toy/figure/wizard
 	name = "Wizard action figure"
+	desc = "It's the deadly, spell-slinging wizard! It's from Space Life's special edition SS12 figurine collection."
 	icon_state = "wizard"
 	toysay = "Ei Nath!"
 
 /obj/item/toy/figure/rd
 	name = "Research Director action figure"
+	desc = "The ambitious RD, from Space Life's SS12 figurine collection."
 	icon_state = "rd"
 	toysay = "Blowing all of the borgs!"
 
 /obj/item/toy/figure/roboticist
 	name = "Roboticist action figure"
+	desc = "The skillful Roboticist, from Space Life's SS12 figurine collection."
 	icon_state = "roboticist"
 	toysay = "He asked to be borged!"
 
 /obj/item/toy/figure/scientist
 	name = "Scientist action figure"
+	desc = "The mad Scientist, from Space Life's SS12 figurine collection."
 	icon_state = "scientist"
 	toysay = "Someone else must have made those bombs!"
 
 /obj/item/toy/figure/syndie
 	name = "Nuclear Operative action figure"
+	desc = "It's the red-suited Nuclear Operative! It's from Space Life's special edition SS12 figurine collection."
 	icon_state = "syndie"
 	toysay = "Get that fucking disk!"
 
 /obj/item/toy/figure/secofficer
 	name = "Security Officer action figure"
+	desc = "The power-tripping Security Officer, from Space Life's SS12 figurine collection."
 	icon_state = "secofficer"
 	toysay = "I am the law!"
 
 /obj/item/toy/figure/virologist
 	name = "Virologist action figure"
+	desc = "The pandemic-starting Virologist, from Space Life's SS12 figurine collection."
 	icon_state = "virologist"
-	toysay = "The cure is potassium!"
+	toysay = "It's not my virus!"
 
 /obj/item/toy/figure/warden
 	name = "Warden action figure"
+	desc = "The amnesiac Warden, from Space Life's SS12 figurine collection."
 	icon_state = "warden"
 	toysay = "Execute him for breaking in!"
 

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

@@ -0,0 +1,133 @@
+/// Delay in deci-seconds between two non-lethal attacks
+#define BATON_STUN_COOLDOWN 4 SECONDS
+/// Force of the telescopic baton when deployed
+#define BATON_TELESCOPIC_FORCE_DEPLOYED 10
+
+/**
+  * # Police Baton
+  *
+  * Knocks down the hit mob when not on harm intent and when [/obj/item/melee/classic_baton/on] is TRUE
+  *
+  * A non-lethal attack has a cooldown to avoid spamming
+  */
+/obj/item/melee/classic_baton
+	name = "police baton"
+	desc = "A wooden truncheon for beating criminal scum."
+	icon_state = "baton"
+	item_state = "classic_baton"
+	slot_flags = SLOT_BELT
+	force = 12 //9 hit crit
+	w_class = WEIGHT_CLASS_NORMAL
+	/// Whether the baton is on cooldown
+	var/on_cooldown = FALSE
+	/// Whether the baton is toggled on (to allow attacking)
+	var/on = TRUE
+
+/obj/item/melee/classic_baton/attack(mob/living/target, mob/living/user)
+	if(!on)
+		return ..()
+
+	add_fingerprint(user)
+	if((CLUMSY in user.mutations) && prob(50))
+		user.visible_message("<span class='danger'>[user] accidentally clubs [user.p_them()]self with [src]!</span>", \
+							 "<span class='userdanger'>You accidentally club yourself with [src]!</span>")
+		user.Weaken(force * 3)
+		if(ishuman(user))
+			var/mob/living/carbon/human/H = user
+			H.apply_damage(force * 2, BRUTE, "head")
+		else
+			user.take_organ_damage(force * 2)
+		return
+
+	if(user.a_intent == INTENT_HARM || isrobot(target)) // Lethal attack or it's a borg (can't knock them down!)
+		return ..()
+	else if(!on_cooldown) // Non-lethal attack - knock them down
+		// Check for shield/countering
+		if(ishuman(target))
+			var/mob/living/carbon/human/H = target
+			if(H.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK))
+				return
+			if(check_martial_counter(H, user))
+				return
+		// Visuals and sound
+		user.do_attack_animation(target)
+		playsound(target, 'sound/effects/woodhit.ogg', 75, TRUE, -1)
+		add_attack_logs(user, target, "Stunned with [src]")
+		target.visible_message("<span class='danger'>[user] has knocked down [target] with \the [src]!</span>", \
+							   "<span class='userdanger'>[user] has knocked down [target] with \the [src]!</span>")
+		// Hit 'em
+		target.LAssailant = iscarbon(user) ? user : null
+		target.Weaken(3)
+		on_cooldown = TRUE
+		addtimer(CALLBACK(src, .proc/cooldown_finished), BATON_STUN_COOLDOWN)
+
+/**
+  * Called some time after a non-lethal attack
+  */
+/obj/item/melee/classic_baton/proc/cooldown_finished()
+	on_cooldown = FALSE
+
+/**
+  * # Fancy Cane
+  */
+/obj/item/melee/classic_baton/ntcane
+	name = "fancy cane"
+	desc = "A cane with special engraving on it. It seems well suited for fending off assailants..."
+	icon_state = "cane_nt"
+	item_state = "cane_nt"
+	needs_permit = FALSE
+
+/obj/item/melee/classic_baton/ntcane/is_crutch()
+	return TRUE
+
+/**
+  * # Telescopic Baton
+  */
+/obj/item/melee/classic_baton/telescopic
+	name = "telescopic baton"
+	desc = "A compact yet robust personal defense weapon. Can be concealed when folded."
+	icon_state = "telebaton_0"
+	item_state = null
+	slot_flags = SLOT_BELT
+	w_class = WEIGHT_CLASS_SMALL
+	needs_permit = FALSE
+	force = 0
+	on = FALSE
+	/// Attack verbs when concealed (created on Initialize)
+	var/static/list/attack_verb_off
+	/// Attack verbs when extended (created on Initialize)
+	var/static/list/attack_verb_on
+
+/obj/item/melee/classic_baton/telescopic/Initialize(mapload)
+	. = ..()
+	if(!attack_verb_off)
+		attack_verb_off = list("hit", "poked")
+		attack_verb_on = list("smacked", "struck", "cracked", "beaten")
+	attack_verb = on ? attack_verb_on : attack_verb_off
+
+/obj/item/melee/classic_baton/telescopic/attack_self(mob/user)
+	on = !on
+	icon_state = "telebaton_[on]"
+	if(on)
+		to_chat(user, "<span class='warning'>You extend the baton.</span>")
+		item_state = "nullrod"
+		w_class = WEIGHT_CLASS_BULKY //doesnt fit in backpack when its on for balance
+		force = BATON_TELESCOPIC_FORCE_DEPLOYED //stunbaton damage
+		attack_verb = attack_verb_on
+	else
+		to_chat(user, "<span class='notice'>You collapse the baton.</span>")
+		item_state = null //no sprite for concealment even when in hand
+		slot_flags = SLOT_BELT
+		w_class = WEIGHT_CLASS_SMALL
+		force = 0 //not so robust now
+		attack_verb = attack_verb_off
+	// Update mob hand visuals
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
+		H.update_inv_l_hand()
+		H.update_inv_r_hand()
+	playsound(loc, 'sound/weapons/batonextend.ogg', 50, TRUE)
+	add_fingerprint(user)
+
+#undef BATON_STUN_COOLDOWN
+#undef BATON_TELESCOPIC_FORCE_DEPLOYED

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

@@ -102,6 +102,7 @@
 	var/rank = null			//actual job
 	var/owner_uid
 	var/owner_ckey
+	var/lastlog
 	var/dorm = 0			// determines if this ID has claimed a dorm already
 
 	var/sex
@@ -212,6 +213,11 @@
 				return M
 		owner_ckey = null
 
+/obj/item/card/id/proc/getPlayerCkey()
+	var/mob/living/carbon/human/H = getPlayer()
+	if(istype(H))
+		return H.ckey
+
 /obj/item/card/id/proc/is_untrackable()
 	return untrackable
 

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

@@ -66,6 +66,10 @@ LIGHTERS ARE IN LIGHTERS.DM
 	..()
 	light()
 
+/obj/item/clothing/mask/cigarette/catch_fire()
+	if(!lit)
+		light("<span class='warning'>The [name] is lit by the flames!</span>")
+
 /obj/item/clothing/mask/cigarette/welder_act(mob/user, obj/item/I)
 	. = TRUE
 	if(I.tool_use_check(user, 0)) //Don't need to flash eyes because you are a badass

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

@@ -55,16 +55,15 @@
 
 /obj/item/lipstick/random/Initialize(mapload)
 	. = ..()
-	var/lscolor = pick(lipstick_colors) // A random color is picked from the var defined initially in a new var.
-	colour = lipstick_colors[lscolor] // The color of the lipstick is pulled from the new variable (right hand side, HTML & Hex RGB)
-	name = "[lscolor] lipstick" // The new variable is also used to match the name to the color of the lipstick. Kudos to Desolate & Lemon
+	colour = pick(lipstick_colors)
+	name = "[colour] lipstick"
 
 /obj/item/lipstick/attack_self(mob/user)
 	cut_overlays()
 	to_chat(user, "<span class='notice'>You twist \the [src] [open ? "closed" : "open"].</span>")
 	open = !open
 	if(open)
-		var/image/colored = mutable_appearance('icons/obj/items.dmi', "lipstick_uncap_color")
+		var/mutable_appearance/colored = mutable_appearance('icons/obj/items.dmi', "lipstick_uncap_color")
 		colored.color = lipstick_colors[colour]
 		icon_state = "lipstick_uncap"
 		add_overlay(colored)

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

@@ -189,8 +189,8 @@
 			var/turf/bombturf = get_turf(src)
 			var/area/A = get_area(bombturf)
 			investigate_log("E20 detonated at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]) with a roll of [result]. Triggered by: [key_name(user)]", INVESTIGATE_BOMB)
-			message_admins("E20 detonated at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[bombturf.x];Y=[bombturf.y];Z=[bombturf.z]'>[A.name] (JMP)</a> with a roll of [result]. Triggered by: [key_name_admin(user)]")
 			log_game("E20 detonated at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]) with a roll of [result]. Triggered by: [key_name(user)]")
+			add_attack_logs(user, src, "detonated with a roll of [result]", ATKLOG_FEW)
 
 
 /obj/item/dice/update_icon()

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

@@ -1,10 +1,11 @@
-obj/item/firework
+/obj/item/firework
 	name = "fireworks"
 	icon = 'icons/obj/fireworks.dmi'
 	icon_state = "rocket_0"
 	var/litzor = 0
 	var/datum/effect_system/sparkle_spread/S
-obj/item/firework/attackby(obj/item/W,mob/user, params)
+
+/obj/item/firework/attackby(obj/item/W,mob/user, params)
 	if(litzor)
 		return
 	if(is_hot(W))
@@ -20,13 +21,13 @@ obj/item/firework/attackby(obj/item/W,mob/user, params)
 		S.start()
 		qdel(src)
 
-obj/item/sparkler
+/obj/item/sparkler
 	name = "sparkler"
 	icon = 'icons/obj/fireworks.dmi'
 	icon_state = "sparkler_0"
 	var/litzor = 0
 
-obj/item/sparkler/attackby(obj/item/W,mob/user, params)
+/obj/item/sparkler/attackby(obj/item/W,mob/user, params)
 	if(litzor)
 		return
 	if(is_hot(W))
@@ -39,8 +40,12 @@ obj/item/sparkler/attackby(obj/item/W,mob/user, params)
 			do_sparks(1, 0, loc)
 			sleep(10)
 		qdel(src)
+
+// TODO: Refactor this into a proper locker or something
+// Or just axe the system. This code is 7 years old
 /obj/crate/fireworks
 	name = "Fireworks!"
+
 /obj/crate/fireworks/New()
 	new /obj/item/sparkler(src)
 	new /obj/item/sparkler(src)

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

@@ -104,7 +104,7 @@
 	playsound(src.loc, 'sound/weapons/cablecuff.ogg', 15, 1, -1)
 
 	M.visible_message("<span class='danger'>[U] comes from behind and begins garroting [M] with the [src]!</span>", \
-				  "<span class='userdanger'>[U]\ begins garroting you with the [src]![improvised ? "" : " You are unable to speak!"]</span>", \
+				  "<span class='userdanger'>[U] begins garroting you with the [src]![improvised ? "" : " You are unable to speak!"]</span>", \
 				  "You hear struggling and wire strain against flesh!")
 
 	return

code/game/objects/items/weapons/grenades/chem_grenade.dm

@@ -101,9 +101,9 @@
 			update_icon()
 		else if(clown_check(user))
 			// This used to go before the assembly check, but that has absolutely zero to do with priming the damn thing.  You could spam the admins with it.
-			message_admins("[key_name_admin(usr)] has primed a [name] for detonation at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[bombturf.x];Y=[bombturf.y];Z=[bombturf.z]'>[A.name] (JMP)</a> [contained].")
 			log_game("[key_name(usr)] has primed a [name] for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]) [contained].")
 			investigate_log("[key_name(usr)] has primed a [name] for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z])[contained].", INVESTIGATE_BOMB)
+			add_attack_logs(user, src, "has primed (contained [contained])", ATKLOG_FEW)
 			to_chat(user, "<span class='warning'>You prime the [name]! [det_time / 10] second\s!</span>")
 			playsound(user.loc, 'sound/weapons/armbomb.ogg', 60, 1)
 			active = 1
@@ -120,7 +120,7 @@
 		owner.visible_message("<span class='danger'>[attack_text] hits [owner]'s [src], setting it off! What a shot!</span>")
 		var/turf/T = get_turf(src)
 		log_game("A projectile ([hitby]) detonated a grenade held by [key_name(owner)] at [COORD(T)]")
-		message_admins("A projectile ([hitby]) detonated a grenade held by [key_name_admin(owner)] at [ADMIN_COORDJMP(T)]")
+		add_attack_logs(P.firer, owner, "A projectile ([hitby]) detonated a grenade held", ATKLOG_FEW)
 		prime()
 		return 1 //It hit the grenade, not them
 
@@ -149,16 +149,16 @@
 					if(!O.reagents) continue
 					if(istype(O,/obj/item/slime_extract))
 						cores += " [O]"
-					for(var/reagent in O.reagents.reagent_list)
-						contained += " [reagent] "
+					for(var/R in O.reagents.reagent_list)
+						var/datum/reagent/reagent = R
+						contained += "[reagent.volume] [reagent], "
 				if(contained)
 					if(cores)
-						contained = "\[[cores];[contained]\]"
+						contained = "\[[cores]; [contained]\]"
 					else
-						contained = "\[[contained]\]"
+						contained = "\[ [contained]\]"
 				var/turf/bombturf = get_turf(loc)
-				var/area/A = bombturf.loc
-				message_admins("[key_name_admin(usr)] has completed [name] at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[bombturf.x];Y=[bombturf.y];Z=[bombturf.z]'>[A.name] (JMP)</a> [contained].")
+				add_attack_logs(user, src, "has completed with [contained]", ATKLOG_MOST)
 				log_game("[key_name(usr)] has completed [name] at [bombturf.x], [bombturf.y], [bombturf.z]. [contained]")
 			else
 				to_chat(user, "<span class='notice'>You need to add at least one beaker before locking the assembly.</span>")

code/game/objects/items/weapons/grenades/flashbang.dm

@@ -5,39 +5,51 @@
 	origin_tech = "materials=2;combat=3"
 	light_power = 10
 	light_color = LIGHT_COLOR_WHITE
-	var/light_time = 2
-	var/range = 7
+
+	var/light_time = 0.2 SECONDS // The duration the area is illuminated
+	var/range = 7 // The range in tiles of the flashbang
 
 /obj/item/grenade/flashbang/prime()
 	update_mob()
-	var/flashbang_turf = get_turf(src)
-	if(!flashbang_turf)
-		return
+	var/turf/T = get_turf(src)
+	if(T)
+		// VFX and SFX
+		do_sparks(rand(5, 9), FALSE, src)
+		playsound(T, 'sound/effects/bang.ogg', 100, TRUE)
+		new /obj/effect/dummy/lighting_obj(T, light_color, range + 2, light_power, light_time)
 
-	set_light(7)
-
-	do_sparks(rand(5, 9), FALSE, src)
-	playsound(flashbang_turf, 'sound/effects/bang.ogg', 25, 1)
-	bang(flashbang_turf, src, range)
-
-	for(var/obj/structure/blob/B in hear(8, flashbang_turf))     		//Blob damage here
-		var/damage = round(30 / (get_dist(B, get_turf(src)) + 1))
-		B.take_damage(damage, BURN, "melee", 0)
-
-	spawn(light_time)
-		qdel(src)
+		// Stunning & damaging mechanic
+		bang(T, src, range)
+	qdel(src)
 
+/**
+  * Creates a flashing effect that blinds and deafens mobs within range
+  *
+  * Also damages blobs
+  * Arguments:
+  * * T - The turf to flash
+  * * A - The flashing atom
+  * * range - The range in tiles of the flash
+  * * flash - Whether to flash (blind)
+  * * bang - Whether to bang (deafen)
+  */
 /proc/bang(turf/T, atom/A, range = 7, flash = TRUE, bang = TRUE)
+	// Blob damage
+	for(var/obj/structure/blob/B in hear(range + 1, T))
+		var/damage = round(30 / (get_dist(B, T) + 1))
+		B.take_damage(damage, BURN, "melee", FALSE)
+
+	// Flashing mechanic
+	var/source_turf = get_turf(A)
 	for(var/mob/living/M in hearers(range, T))
 		if(M.stat == DEAD)
 			continue
 		M.show_message("<span class='warning'>BANG</span>", 2)
 
-		//Checking for protections
-		var/ear_safety = M.check_ear_prot()
-		var/distance = max(1, get_dist(get_turf(A), get_turf(M)))
+		var/distance = max(1, get_dist(source_turf, get_turf(M)))
+		var/stun_amount = max(10 / distance, 3)
 
-		//Flash
+		// Flash
 		if(flash)
 			if(M.weakeyes)
 				M.visible_message("<span class='disarm'><b>[M]</b> screams and collapses!</span>")
@@ -49,21 +61,20 @@
 					var/mob/living/carbon/human/H = M
 					var/obj/item/organ/internal/eyes/E = H.get_int_organ(/obj/item/organ/internal/eyes)
 					if(E)
-						E.receive_damage(8, 1)
-
+						E.receive_damage(8, TRUE)
 			if(M.flash_eyes(affect_silicon = TRUE))
-				M.Stun(max(10 / distance, 3))
-				M.Weaken(max(10 / distance, 3))
+				M.Stun(stun_amount)
+				M.Weaken(stun_amount)
 
-
-		//Bang
+		// Bang
+		var/ear_safety = M.check_ear_prot()
 		if(bang)
-			if(!distance || A.loc == M || A.loc == M.loc) //Holding on person or being exactly where lies is significantly more dangerous and voids protection
+			if(!distance || A.loc == M || A.loc == M.loc) // Holding on person or being exactly where lies is significantly more dangerous and voids protection
 				M.Stun(10)
 				M.Weaken(10)
 			if(!ear_safety)
-				M.Stun(max(10 / distance, 3))
-				M.Weaken(max(10 / distance, 3))
+				M.Stun(stun_amount)
+				M.Weaken(stun_amount)
 				M.AdjustEarDamage(rand(0, 5), 15)
 				if(iscarbon(M))
 					var/mob/living/carbon/C = M
@@ -74,6 +85,5 @@
 							if(prob(ears.ear_damage - 5))
 								to_chat(M, "<span class='warning'>You can't hear anything!</span>")
 								M.BecomeDeaf()
-						else
-							if(ears.ear_damage >= 5)
-								to_chat(M, "<span class='warning'>Your ears start to ring!</span>")
+						else if(ears.ear_damage >= 5)
+							to_chat(M, "<span class='warning'>Your ears start to ring!</span>")

code/game/objects/items/weapons/grenades/ghettobomb.dm

@@ -48,9 +48,9 @@
 			var/turf/bombturf = get_turf(src)
 			var/area/A = get_area(bombturf)
 
-			message_admins("[ADMIN_LOOKUPFLW(user)] has primed a [name] for detonation at [ADMIN_COORDJMP(bombturf)].")
 			log_game("[key_name(user)] has primed a [name] for detonation at [A.name] [COORD(bombturf)].")
 			investigate_log("[key_name(user)] has primed a [name] for detonation at [A.name] [COORD(bombturf)])", INVESTIGATE_BOMB)
+			add_attack_logs(user, src, "has primed for detonation", ATKLOG_FEW)
 			if(iscarbon(user))
 				var/mob/living/carbon/C = user
 				C.throw_mode_on()

code/game/objects/items/weapons/grenades/grenade.dm

@@ -73,6 +73,7 @@
 			message_admins("[key_name_admin(usr)] has primed a [name] for detonation at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[bombturf.x];Y=[bombturf.y];Z=[bombturf.z]'>[A.name] (JMP)</a>")
 			log_game("[key_name(usr)] has primed a [name] for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z])")
 			investigate_log("[key_name(usr)] has primed a [name] for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z])", INVESTIGATE_BOMB)
+			add_attack_logs(user, src, "has primed for detonation", ATKLOG_FEW)
 			if(iscarbon(user))
 				var/mob/living/carbon/C = user
 				C.throw_mode_on()

code/game/objects/items/weapons/grenades/smokebomb.dm

@@ -19,7 +19,7 @@
 
 /obj/item/grenade/smokebomb/prime()
 	playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
-	src.smoke.set_up(10, 0, usr.loc)
+	smoke.set_up(10, 0)
 	spawn(0)
 		src.smoke.start()
 		sleep(10)

code/game/objects/items/weapons/grenades/spawnergrenade.dm

@@ -9,27 +9,27 @@
 	var/deliveryamt = 1 // amount of type to deliver
 	spawner_type = /mob/living/simple_animal/hostile/viscerator
 
-	prime()													// Prime now just handles the two loops that query for people in lockers and people who can see it.
+/obj/item/grenade/spawnergrenade/prime() // Prime now just handles the two loops that query for people in lockers and people who can see it.
 
-		if(spawner_type && deliveryamt)
-			// Make a quick flash
-			var/turf/T = get_turf(src)
-			playsound(T, 'sound/effects/phasein.ogg', 100, 1)
-			for(var/mob/living/carbon/C in viewers(T, null))
-				C.flash_eyes()
+	if(spawner_type && deliveryamt)
+		// Make a quick flash
+		var/turf/T = get_turf(src)
+		playsound(T, 'sound/effects/phasein.ogg', 100, 1)
+		for(var/mob/living/carbon/C in viewers(T, null))
+			C.flash_eyes()
 
-			for(var/i=1, i<=deliveryamt, i++)
-				var/atom/movable/x = new spawner_type
-				x.admin_spawned = admin_spawned
-				x.loc = T
-				if(prob(50))
-					for(var/j = 1, j <= rand(1, 3), j++)
-						step(x, pick(NORTH,SOUTH,EAST,WEST))
+		for(var/i=1, i<=deliveryamt, i++)
+			var/atom/movable/x = new spawner_type
+			x.admin_spawned = admin_spawned
+			x.loc = T
+			if(prob(50))
+				for(var/j = 1, j <= rand(1, 3), j++)
+					step(x, pick(NORTH,SOUTH,EAST,WEST))
 
-				// Spawn some hostile syndicate critters
+			// Spawn some hostile syndicate critters
 
-		qdel(src)
-		return
+	qdel(src)
+	return
 
 /obj/item/grenade/spawnergrenade/manhacks
 	name = "manhack delivery grenade"

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

@@ -126,13 +126,15 @@
 	color = pick(COLOR_RED, COLOR_BLUE, COLOR_GREEN, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN)
 	..()
 
-/obj/item/restraints/handcuffs/cable/proc/cable_color(var/colorC)
-	if(colorC)
-		if(colorC == "rainbow")
-			colorC = color_rainbow()
-		color = colorC
-	else
+/obj/item/restraints/handcuffs/cable/proc/cable_color(colorC)
+	if(!colorC)
 		color = COLOR_RED
+	else if(colorC == "rainbow")
+		color = color_rainbow()
+	else if(colorC == "orange") //byond only knows 16 colors by name, and orange isn't one of them
+		color = COLOR_ORANGE
+	else
+		color = colorC
 
 /obj/item/restraints/handcuffs/cable/proc/color_rainbow()
 	color = pick(COLOR_RED, COLOR_BLUE, COLOR_GREEN, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN)

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

@@ -255,7 +255,7 @@
 
 	possessed = TRUE
 
-	var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as the spirit of [user.real_name]'s blade?", ROLE_PAI, 0, 100)
+	var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Do you want to play as the spirit of [user.real_name]'s blade?", ROLE_PAI, FALSE, 10 SECONDS, source = src)
 	var/mob/dead/observer/theghost = null
 
 	if(candidates.len)

code/game/objects/items/weapons/implants/implantchair.dm

@@ -17,13 +17,6 @@
 	var/mob/living/carbon/occupant = null
 	var/injecting = 0
 
-/obj/machinery/implantchair/proc
-	go_out()
-	put_mob(mob/living/carbon/M)
-	implant(var/mob/M)
-	add_implants()
-
-
 /obj/machinery/implantchair/New()
 	..()
 	add_implants()
@@ -87,7 +80,7 @@
 	return
 
 
-/obj/machinery/implantchair/go_out(mob/M)
+/obj/machinery/implantchair/proc/go_out(mob/M)
 	if(!( src.occupant ))
 		return
 	if(M == occupant) // so that the guy inside can't eject himself -Agouri
@@ -101,7 +94,7 @@
 	return
 
 
-/obj/machinery/implantchair/put_mob(mob/living/carbon/M)
+/obj/machinery/implantchair/proc/put_mob(mob/living/carbon/M)
 	if(!iscarbon(M))
 		to_chat(usr, "<span class='warning'>The [src.name] cannot hold this!</span>")
 		return
@@ -116,7 +109,7 @@
 	return 1
 
 
-/obj/machinery/implantchair/implant(mob/M)
+/obj/machinery/implantchair/proc/implant(mob/M)
 	if(!istype(M, /mob/living/carbon))
 		return
 	if(!implant_list.len)	return
@@ -131,7 +124,7 @@
 	return
 
 
-/obj/machinery/implantchair/add_implants()
+/obj/machinery/implantchair/proc/add_implants()
 	for(var/i=0, i<src.max_implants, i++)
 		var/obj/item/implant/mindshield/I = new /obj/item/implant/mindshield(src)
 		implant_list += I

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

@@ -42,26 +42,23 @@
 
 	create_reagents(5)
 
-/obj/item/kitchen/utensil/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
-	if(!istype(M))
+/obj/item/kitchen/utensil/attack(mob/living/carbon/C, mob/living/carbon/user)
+	if(!istype(C))
 		return ..()
 
 	if(user.a_intent != INTENT_HELP)
 		if(user.zone_selected == "head" || user.zone_selected == "eyes")
 			if((CLUMSY in user.mutations) && prob(50))
-				M = user
-			return eyestab(M,user)
+				C = user
+			return eyestab(C, user)
 		else
 			return ..()
 
-	if(contents.len)
+	if(length(contents))
 		var/obj/item/reagent_containers/food/snacks/toEat = contents[1]
 		if(istype(toEat))
-			if(M.eat(toEat, user))
-				toEat.On_Consume(M, user)
-				spawn(0)
-					if(toEat)
-						qdel(toEat)
+			if(C.eat(toEat, user))
+				toEat.On_Consume(C, user)
 				overlays.Cut()
 				return
 

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

@@ -83,7 +83,7 @@
 
 /obj/item/shard/Crossed(mob/living/L, oldloc)
 	if(istype(L) && has_gravity(loc))
-		if(L.incorporeal_move || L.flying)
+		if(L.incorporeal_move || L.flying || L.floating)
 			return
 		playsound(loc, 'sound/effects/glass_step.ogg', 50, TRUE)
 	return ..()

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

@@ -372,6 +372,15 @@
 	new /obj/item/ammo_box/magazine/m12g/buckshot(src)
 	new /obj/item/ammo_box/magazine/m12g/dragon(src)
 
+/obj/item/storage/backpack/duffel/syndie/ammo/shotgunXLmags
+	desc = "A large duffelbag, containing three types of extended drum magazines."
+
+/obj/item/storage/backpack/duffel/syndie/ammo/shotgunXLmags/New()
+	..()
+	new /obj/item/ammo_box/magazine/m12g/XtrLrg(src)
+	new /obj/item/ammo_box/magazine/m12g/XtrLrg/buckshot(src)
+	new /obj/item/ammo_box/magazine/m12g/XtrLrg/dragon(src)
+
 /obj/item/storage/backpack/duffel/mining_conscript/
 	name = "mining conscription kit"
 	desc = "A kit containing everything a crewmember needs to support a shaft miner in the field."
@@ -547,7 +556,7 @@
 	icon_state = "duffel-clown"
 	item_state = "duffel-clown"
 
-obj/item/storage/backpack/duffel/blueshield
+/obj/item/storage/backpack/duffel/blueshield
 	name = "blueshield duffelbag"
 	desc = "A robust duffelbag issued to Nanotrasen's finest."
 	icon_state = "duffel-blueshield"

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

@@ -380,12 +380,13 @@
 	w_class = WEIGHT_CLASS_BULKY
 	flags = CONDUCT
 	materials = list(MAT_METAL=3000)
+	cant_hold = list(/obj/item/disk/nuclear) // Prevents some cheesing
 
-/obj/item/storage/bag/tray/attack(mob/living/M as mob, mob/living/user as mob)
+/obj/item/storage/bag/tray/attack(mob/living/M, mob/living/user)
 	..()
 	// Drop all the things. All of them.
 	var/list/obj/item/oldContents = contents.Copy()
-	quick_empty()
+	drop_inventory(user)
 
 	// Make each item scatter a bit
 	for(var/obj/item/I in oldContents)

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

@@ -204,8 +204,10 @@
 		/obj/item/flashlight/pen,
 		/obj/item/seeds,
 		/obj/item/wirecutters,
-        /obj/item/wrench,
-	)
+		/obj/item/wrench,
+		/obj/item/reagent_containers/spray/weedspray,
+		/obj/item/reagent_containers/spray/pestspray
+		)
 
 /obj/item/storage/belt/security
 	name = "security belt"
@@ -308,6 +310,18 @@
 	item_state = "utility"
 	use_item_overlays = 1 // So it will still show tools in it in case sec get lazy and just glance at it.
 
+/obj/item/storage/belt/military/traitor/hacker
+
+/obj/item/storage/belt/military/traitor/hacker/New()
+	..()
+	new /obj/item/screwdriver(src, "red")
+	new /obj/item/wrench(src)
+	new /obj/item/weldingtool/largetank(src)
+	new /obj/item/crowbar/red(src)
+	new /obj/item/wirecutters(src, "red")
+	new /obj/item/stack/cable_coil(src, 30, COLOR_RED)
+	update_icon()
+
 /obj/item/storage/belt/grenade
 	name = "grenadier belt"
 	desc = "A belt for holding grenades."

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

@@ -66,14 +66,15 @@
 
 /obj/item/storage/box/survival
 	icon_state = "box_civ"
-	New()
-		..()
-		contents = list()
-		new /obj/item/clothing/mask/breath( src )
-		new /obj/item/tank/emergency_oxygen( src )
-		new /obj/item/reagent_containers/hypospray/autoinjector( src )
-		new /obj/item/flashlight/flare/glowstick/emergency( src )
-		return
+
+/obj/item/storage/box/survival/New()
+	..()
+	contents = list()
+	new /obj/item/clothing/mask/breath( src )
+	new /obj/item/tank/emergency_oxygen( src )
+	new /obj/item/reagent_containers/hypospray/autoinjector( src )
+	new /obj/item/flashlight/flare/glowstick/emergency( src )
+	return
 
 /obj/item/storage/box/survival_vox
 	icon_state = "box_vox"
@@ -99,66 +100,69 @@
 
 /obj/item/storage/box/engineer
 	icon_state = "box_eng"
-	New()
-		..()
-		contents = list()
-		new /obj/item/clothing/mask/breath( src )
-		new /obj/item/tank/emergency_oxygen/engi( src )
-		new /obj/item/reagent_containers/hypospray/autoinjector( src )
-		new /obj/item/flashlight/flare/glowstick/emergency( src )
-		return
+
+/obj/item/storage/box/engineer/New()
+	..()
+	contents = list()
+	new /obj/item/clothing/mask/breath( src )
+	new /obj/item/tank/emergency_oxygen/engi( src )
+	new /obj/item/reagent_containers/hypospray/autoinjector( src )
+	new /obj/item/flashlight/flare/glowstick/emergency( src )
+	return
 
 /obj/item/storage/box/survival_mining
 	icon_state = "box_min"
-	New()
-		..()
-		contents = list()
-		new /obj/item/clothing/mask/gas/explorer(src)
-		new /obj/item/tank/emergency_oxygen/engi(src)
-		new /obj/item/crowbar/red(src)
-		new /obj/item/reagent_containers/hypospray/autoinjector(src)
-		new /obj/item/flashlight/flare/glowstick/emergency(src)
+
+/obj/item/storage/box/survival_mining/New()
+	..()
+	contents = list()
+	new /obj/item/clothing/mask/gas/explorer(src)
+	new /obj/item/tank/emergency_oxygen/engi(src)
+	new /obj/item/crowbar/red(src)
+	new /obj/item/reagent_containers/hypospray/autoinjector(src)
+	new /obj/item/flashlight/flare/glowstick/emergency(src)
 
 /obj/item/storage/box/survival_syndi
 	icon_state = "box_syndi"
-	New()
-		..()
-		contents = list()
-		new /obj/item/clothing/mask/gas/syndicate(src)
-		new /obj/item/tank/emergency_oxygen/syndi(src)
-		new /obj/item/reagent_containers/hypospray/autoinjector(src)
-		new /obj/item/reagent_containers/food/pill/initropidril(src)
-		new /obj/item/flashlight/flare/glowstick/red(src)
+
+/obj/item/storage/box/survival_syndi/New()
+	..()
+	contents = list()
+	new /obj/item/clothing/mask/gas/syndicate(src)
+	new /obj/item/tank/emergency_oxygen/syndi(src)
+	new /obj/item/reagent_containers/hypospray/autoinjector(src)
+	new /obj/item/reagent_containers/food/pill/initropidril(src)
+	new /obj/item/flashlight/flare/glowstick/red(src)
 
 /obj/item/storage/box/gloves
 	name = "box of latex gloves"
 	desc = "Contains white gloves."
 	icon_state = "latex"
 
-	New()
-		..()
-		new /obj/item/clothing/gloves/color/latex(src)
-		new /obj/item/clothing/gloves/color/latex(src)
-		new /obj/item/clothing/gloves/color/latex(src)
-		new /obj/item/clothing/gloves/color/latex(src)
-		new /obj/item/clothing/gloves/color/latex(src)
-		new /obj/item/clothing/gloves/color/latex(src)
-		new /obj/item/clothing/gloves/color/latex(src)
+/obj/item/storage/box/gloves/New()
+	..()
+	new /obj/item/clothing/gloves/color/latex(src)
+	new /obj/item/clothing/gloves/color/latex(src)
+	new /obj/item/clothing/gloves/color/latex(src)
+	new /obj/item/clothing/gloves/color/latex(src)
+	new /obj/item/clothing/gloves/color/latex(src)
+	new /obj/item/clothing/gloves/color/latex(src)
+	new /obj/item/clothing/gloves/color/latex(src)
 
 /obj/item/storage/box/masks
 	name = "sterile masks"
 	desc = "This box contains masks of sterility."
 	icon_state = "sterile"
 
-	New()
-		..()
-		new /obj/item/clothing/mask/surgical(src)
-		new /obj/item/clothing/mask/surgical(src)
-		new /obj/item/clothing/mask/surgical(src)
-		new /obj/item/clothing/mask/surgical(src)
-		new /obj/item/clothing/mask/surgical(src)
-		new /obj/item/clothing/mask/surgical(src)
-		new /obj/item/clothing/mask/surgical(src)
+/obj/item/storage/box/masks/New()
+	..()
+	new /obj/item/clothing/mask/surgical(src)
+	new /obj/item/clothing/mask/surgical(src)
+	new /obj/item/clothing/mask/surgical(src)
+	new /obj/item/clothing/mask/surgical(src)
+	new /obj/item/clothing/mask/surgical(src)
+	new /obj/item/clothing/mask/surgical(src)
+	new /obj/item/clothing/mask/surgical(src)
 
 
 /obj/item/storage/box/syringes
@@ -167,29 +171,29 @@
 	desc = "A biohazard alert warning is printed on the box"
 	icon_state = "syringe"
 
-	New()
-		..()
-		new /obj/item/reagent_containers/syringe( src )
-		new /obj/item/reagent_containers/syringe( src )
-		new /obj/item/reagent_containers/syringe( src )
-		new /obj/item/reagent_containers/syringe( src )
-		new /obj/item/reagent_containers/syringe( src )
-		new /obj/item/reagent_containers/syringe( src )
-		new /obj/item/reagent_containers/syringe( src )
+/obj/item/storage/box/syringes/New()
+	..()
+	new /obj/item/reagent_containers/syringe( src )
+	new /obj/item/reagent_containers/syringe( src )
+	new /obj/item/reagent_containers/syringe( src )
+	new /obj/item/reagent_containers/syringe( src )
+	new /obj/item/reagent_containers/syringe( src )
+	new /obj/item/reagent_containers/syringe( src )
+	new /obj/item/reagent_containers/syringe( src )
 
 /obj/item/storage/box/beakers
 	name = "beaker box"
 	icon_state = "beaker"
 
-	New()
-		..()
-		new /obj/item/reagent_containers/glass/beaker( src )
-		new /obj/item/reagent_containers/glass/beaker( src )
-		new /obj/item/reagent_containers/glass/beaker( src )
-		new /obj/item/reagent_containers/glass/beaker( src )
-		new /obj/item/reagent_containers/glass/beaker( src )
-		new /obj/item/reagent_containers/glass/beaker( src )
-		new /obj/item/reagent_containers/glass/beaker( src )
+/obj/item/storage/box/beakers/New()
+	..()
+	new /obj/item/reagent_containers/glass/beaker( src )
+	new /obj/item/reagent_containers/glass/beaker( src )
+	new /obj/item/reagent_containers/glass/beaker( src )
+	new /obj/item/reagent_containers/glass/beaker( src )
+	new /obj/item/reagent_containers/glass/beaker( src )
+	new /obj/item/reagent_containers/glass/beaker( src )
+	new /obj/item/reagent_containers/glass/beaker( src )
 
 /obj/item/storage/box/beakers/bluespace
 	name = "box of bluespace beakers"
@@ -219,14 +223,14 @@
 	name = "\improper DNA injectors"
 	desc = "This box contains injectors it seems."
 
-	New()
-		..()
-		new /obj/item/dnainjector/h2m(src)
-		new /obj/item/dnainjector/h2m(src)
-		new /obj/item/dnainjector/h2m(src)
-		new /obj/item/dnainjector/m2h(src)
-		new /obj/item/dnainjector/m2h(src)
-		new /obj/item/dnainjector/m2h(src)
+/obj/item/storage/box/injectors/New()
+	..()
+	new /obj/item/dnainjector/h2m(src)
+	new /obj/item/dnainjector/h2m(src)
+	new /obj/item/dnainjector/h2m(src)
+	new /obj/item/dnainjector/m2h(src)
+	new /obj/item/dnainjector/m2h(src)
+	new /obj/item/dnainjector/m2h(src)
 
 /obj/item/storage/box/slug
 	name = "Ammunition Box (Slug)"
@@ -304,29 +308,29 @@
 	desc = "<B>WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use.</B>"
 	icon_state = "flashbang"
 
-	New()
-		..()
-		new /obj/item/grenade/flashbang(src)
-		new /obj/item/grenade/flashbang(src)
-		new /obj/item/grenade/flashbang(src)
-		new /obj/item/grenade/flashbang(src)
-		new /obj/item/grenade/flashbang(src)
-		new /obj/item/grenade/flashbang(src)
-		new /obj/item/grenade/flashbang(src)
+/obj/item/storage/box/flashbangs/New()
+	..()
+	new /obj/item/grenade/flashbang(src)
+	new /obj/item/grenade/flashbang(src)
+	new /obj/item/grenade/flashbang(src)
+	new /obj/item/grenade/flashbang(src)
+	new /obj/item/grenade/flashbang(src)
+	new /obj/item/grenade/flashbang(src)
+	new /obj/item/grenade/flashbang(src)
 
 /obj/item/storage/box/flashes
 	name = "box of flashbulbs"
 	desc = "<B>WARNING: Flashes can cause serious eye damage, protective eyewear is required.</B>"
 	icon_state = "flashbang"
 
-	New()
-		..()
-		new /obj/item/flash(src)
-		new /obj/item/flash(src)
-		new /obj/item/flash(src)
-		new /obj/item/flash(src)
-		new /obj/item/flash(src)
-		new /obj/item/flash(src)
+/obj/item/storage/box/flashes/New()
+	..()
+	new /obj/item/flash(src)
+	new /obj/item/flash(src)
+	new /obj/item/flash(src)
+	new /obj/item/flash(src)
+	new /obj/item/flash(src)
+	new /obj/item/flash(src)
 
 /obj/item/storage/box/teargas
 	name = "box of tear gas grenades (WARNING)"
@@ -348,13 +352,13 @@
 	desc = "A box with 5 emp grenades."
 	icon_state = "flashbang"
 
-	New()
-		..()
-		new /obj/item/grenade/empgrenade(src)
-		new /obj/item/grenade/empgrenade(src)
-		new /obj/item/grenade/empgrenade(src)
-		new /obj/item/grenade/empgrenade(src)
-		new /obj/item/grenade/empgrenade(src)
+/obj/item/storage/box/emps/New()
+	..()
+	new /obj/item/grenade/empgrenade(src)
+	new /obj/item/grenade/empgrenade(src)
+	new /obj/item/grenade/empgrenade(src)
+	new /obj/item/grenade/empgrenade(src)
+	new /obj/item/grenade/empgrenade(src)
 
 
 /obj/item/storage/box/trackimp
@@ -362,15 +366,15 @@
 	desc = "Box full of scum-bag tracking utensils."
 	icon_state = "implant"
 
-	New()
-		..()
-		new /obj/item/implantcase/tracking(src)
-		new /obj/item/implantcase/tracking(src)
-		new /obj/item/implantcase/tracking(src)
-		new /obj/item/implantcase/tracking(src)
-		new /obj/item/implanter(src)
-		new /obj/item/implantpad(src)
-		new /obj/item/locator(src)
+/obj/item/storage/box/trackimp/New()
+	..()
+	new /obj/item/implantcase/tracking(src)
+	new /obj/item/implantcase/tracking(src)
+	new /obj/item/implantcase/tracking(src)
+	new /obj/item/implantcase/tracking(src)
+	new /obj/item/implanter(src)
+	new /obj/item/implantpad(src)
+	new /obj/item/locator(src)
 
 /obj/item/storage/box/minertracker
 	name = "boxed tracking implant kit"
@@ -391,86 +395,86 @@
 	desc = "Box of stuff used to implant chemicals."
 	icon_state = "implant"
 
-	New()
-		..()
-		new /obj/item/implantcase/chem(src)
-		new /obj/item/implantcase/chem(src)
-		new /obj/item/implantcase/chem(src)
-		new /obj/item/implantcase/chem(src)
-		new /obj/item/implantcase/chem(src)
-		new /obj/item/implanter(src)
-		new /obj/item/implantpad(src)
+/obj/item/storage/box/chemimp/New()
+	..()
+	new /obj/item/implantcase/chem(src)
+	new /obj/item/implantcase/chem(src)
+	new /obj/item/implantcase/chem(src)
+	new /obj/item/implantcase/chem(src)
+	new /obj/item/implantcase/chem(src)
+	new /obj/item/implanter(src)
+	new /obj/item/implantpad(src)
 
 /obj/item/storage/box/exileimp
 	name = "boxed exile implant kit"
 	desc = "Box of exile implants. It has a picture of a clown being booted through the Gateway."
 	icon_state = "implant"
 
-	New()
-		..()
-		new /obj/item/implantcase/exile(src)
-		new /obj/item/implantcase/exile(src)
-		new /obj/item/implantcase/exile(src)
-		new /obj/item/implantcase/exile(src)
-		new /obj/item/implantcase/exile(src)
-		new /obj/item/implanter(src)
+/obj/item/storage/box/exileimp/New()
+	..()
+	new /obj/item/implantcase/exile(src)
+	new /obj/item/implantcase/exile(src)
+	new /obj/item/implantcase/exile(src)
+	new /obj/item/implantcase/exile(src)
+	new /obj/item/implantcase/exile(src)
+	new /obj/item/implanter(src)
 
 /obj/item/storage/box/deathimp
 	name = "death alarm implant kit"
 	desc = "Box of life sign monitoring implants."
 	icon_state = "implant"
 
-	New()
-		..()
-		new /obj/item/implantcase/death_alarm(src)
-		new /obj/item/implantcase/death_alarm(src)
-		new /obj/item/implantcase/death_alarm(src)
-		new /obj/item/implantcase/death_alarm(src)
-		new /obj/item/implantcase/death_alarm(src)
-		new /obj/item/implantcase/death_alarm(src)
-		new /obj/item/implanter(src)
+/obj/item/storage/box/deathimp/New()
+	..()
+	new /obj/item/implantcase/death_alarm(src)
+	new /obj/item/implantcase/death_alarm(src)
+	new /obj/item/implantcase/death_alarm(src)
+	new /obj/item/implantcase/death_alarm(src)
+	new /obj/item/implantcase/death_alarm(src)
+	new /obj/item/implantcase/death_alarm(src)
+	new /obj/item/implanter(src)
 
 /obj/item/storage/box/tapes
 	name = "Tape Box"
 	desc = "A box of spare recording tapes"
 	icon_state = "box"
 
-	New()
-		..()
-		new /obj/item/tape(src)
-		new /obj/item/tape(src)
-		new /obj/item/tape(src)
-		new /obj/item/tape(src)
-		new /obj/item/tape(src)
-		new /obj/item/tape(src)
+/obj/item/storage/box/tapes/New()
+	..()
+	new /obj/item/tape(src)
+	new /obj/item/tape(src)
+	new /obj/item/tape(src)
+	new /obj/item/tape(src)
+	new /obj/item/tape(src)
+	new /obj/item/tape(src)
 
 /obj/item/storage/box/rxglasses
 	name = "prescription glasses"
 	desc = "This box contains nerd glasses."
 	icon_state = "glasses"
 
-	New()
-		..()
-		new /obj/item/clothing/glasses/regular(src)
-		new /obj/item/clothing/glasses/regular(src)
-		new /obj/item/clothing/glasses/regular(src)
-		new /obj/item/clothing/glasses/regular(src)
-		new /obj/item/clothing/glasses/regular(src)
-		new /obj/item/clothing/glasses/regular(src)
-		new /obj/item/clothing/glasses/regular(src)
+/obj/item/storage/box/rxglasses/New()
+	..()
+	new /obj/item/clothing/glasses/regular(src)
+	new /obj/item/clothing/glasses/regular(src)
+	new /obj/item/clothing/glasses/regular(src)
+	new /obj/item/clothing/glasses/regular(src)
+	new /obj/item/clothing/glasses/regular(src)
+	new /obj/item/clothing/glasses/regular(src)
+	new /obj/item/clothing/glasses/regular(src)
 
 /obj/item/storage/box/drinkingglasses
 	name = "box of drinking glasses"
 	desc = "It has a picture of drinking glasses on it."
 
-	New()
-		..()
-		new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
-		new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
-		new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
-		new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
-		new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
-		new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
+/obj/item/storage/box/drinkingglasses/New()
+	..()
+	new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
+	new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
+	new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
+	new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
+	new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
+	new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
 
 /obj/item/storage/box/cdeathalarm_kit
 	name = "Death Alarm Kit"
@@ -478,43 +482,42 @@
 	icon_state = "implant"
 	item_state = "syringe_kit"
 
-	New()
-		..()
-		new /obj/item/implanter(src)
-		new /obj/item/implantcase/death_alarm(src)
-		new /obj/item/implantcase/death_alarm(src)
-		new /obj/item/implantcase/death_alarm(src)
-		new /obj/item/implantcase/death_alarm(src)
-		new /obj/item/implantcase/death_alarm(src)
-		new /obj/item/implantcase/death_alarm(src)
+/obj/item/storage/box/cdeathalarm_kit/New()
+	..()
+	new /obj/item/implanter(src)
+	new /obj/item/implantcase/death_alarm(src)
+	new /obj/item/implantcase/death_alarm(src)
+	new /obj/item/implantcase/death_alarm(src)
+	new /obj/item/implantcase/death_alarm(src)
+	new /obj/item/implantcase/death_alarm(src)
+	new /obj/item/implantcase/death_alarm(src)
 
 /obj/item/storage/box/condimentbottles
 	name = "box of condiment bottles"
 	desc = "It has a large ketchup smear on it."
 
-	New()
-		..()
-		new /obj/item/reagent_containers/food/condiment(src)
-		new /obj/item/reagent_containers/food/condiment(src)
-		new /obj/item/reagent_containers/food/condiment(src)
-		new /obj/item/reagent_containers/food/condiment(src)
-		new /obj/item/reagent_containers/food/condiment(src)
-		new /obj/item/reagent_containers/food/condiment(src)
-
-
+/obj/item/storage/box/condimentbottles/New()
+	..()
+	new /obj/item/reagent_containers/food/condiment(src)
+	new /obj/item/reagent_containers/food/condiment(src)
+	new /obj/item/reagent_containers/food/condiment(src)
+	new /obj/item/reagent_containers/food/condiment(src)
+	new /obj/item/reagent_containers/food/condiment(src)
+	new /obj/item/reagent_containers/food/condiment(src)
 
 /obj/item/storage/box/cups
 	name = "box of paper cups"
 	desc = "It has pictures of paper cups on the front."
-	New()
-		..()
-		new /obj/item/reagent_containers/food/drinks/sillycup( src )
-		new /obj/item/reagent_containers/food/drinks/sillycup( src )
-		new /obj/item/reagent_containers/food/drinks/sillycup( src )
-		new /obj/item/reagent_containers/food/drinks/sillycup( src )
-		new /obj/item/reagent_containers/food/drinks/sillycup( src )
-		new /obj/item/reagent_containers/food/drinks/sillycup( src )
-		new /obj/item/reagent_containers/food/drinks/sillycup( src )
+
+/obj/item/storage/box/cups/New()
+	..()
+	new /obj/item/reagent_containers/food/drinks/sillycup( src )
+	new /obj/item/reagent_containers/food/drinks/sillycup( src )
+	new /obj/item/reagent_containers/food/drinks/sillycup( src )
+	new /obj/item/reagent_containers/food/drinks/sillycup( src )
+	new /obj/item/reagent_containers/food/drinks/sillycup( src )
+	new /obj/item/reagent_containers/food/drinks/sillycup( src )
+	new /obj/item/reagent_containers/food/drinks/sillycup( src )
 
 
 /obj/item/storage/box/donkpockets
@@ -522,28 +525,28 @@
 	desc = "<B>Instructions:</B> <I>Heat in microwave. Product will cool if not eaten within seven minutes.</I>"
 	icon_state = "donk_kit"
 
-	New()
-		..()
-		new /obj/item/reagent_containers/food/snacks/donkpocket(src)
-		new /obj/item/reagent_containers/food/snacks/donkpocket(src)
-		new /obj/item/reagent_containers/food/snacks/donkpocket(src)
-		new /obj/item/reagent_containers/food/snacks/donkpocket(src)
-		new /obj/item/reagent_containers/food/snacks/donkpocket(src)
-		new /obj/item/reagent_containers/food/snacks/donkpocket(src)
+/obj/item/storage/box/dockpockets/New()
+	..()
+	new /obj/item/reagent_containers/food/snacks/donkpocket(src)
+	new /obj/item/reagent_containers/food/snacks/donkpocket(src)
+	new /obj/item/reagent_containers/food/snacks/donkpocket(src)
+	new /obj/item/reagent_containers/food/snacks/donkpocket(src)
+	new /obj/item/reagent_containers/food/snacks/donkpocket(src)
+	new /obj/item/reagent_containers/food/snacks/donkpocket(src)
 
 /obj/item/storage/box/syndidonkpockets
 	name = "box of donk-pockets"
 	desc = "This box feels slightly warm"
 	icon_state = "donk_kit"
 
-	New()
-		..()
-		new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src)
-		new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src)
-		new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src)
-		new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src)
-		new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src)
-		new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src)
+/obj/item/storage/box/syndidonkpockets/New()
+	..()
+	new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src)
+	new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src)
+	new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src)
+	new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src)
+	new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src)
+	new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src)
 
 /obj/item/storage/box/monkeycubes
 	name = "monkey cube box"
@@ -604,59 +607,59 @@
 	desc = "Has so many empty IDs."
 	icon_state = "id"
 
-	New()
-		..()
-		new /obj/item/card/id(src)
-		new /obj/item/card/id(src)
-		new /obj/item/card/id(src)
-		new /obj/item/card/id(src)
-		new /obj/item/card/id(src)
-		new /obj/item/card/id(src)
-		new /obj/item/card/id(src)
+/obj/item/storage/box/ids/New()
+	..()
+	new /obj/item/card/id(src)
+	new /obj/item/card/id(src)
+	new /obj/item/card/id(src)
+	new /obj/item/card/id(src)
+	new /obj/item/card/id(src)
+	new /obj/item/card/id(src)
+	new /obj/item/card/id(src)
 
 /obj/item/storage/box/prisoner
 	name = "prisoner IDs"
 	desc = "Take away their last shred of dignity, their name."
 	icon_state = "id"
 
-	New()
-		..()
-		new /obj/item/card/id/prisoner/one(src)
-		new /obj/item/card/id/prisoner/two(src)
-		new /obj/item/card/id/prisoner/three(src)
-		new /obj/item/card/id/prisoner/four(src)
-		new /obj/item/card/id/prisoner/five(src)
-		new /obj/item/card/id/prisoner/six(src)
-		new /obj/item/card/id/prisoner/seven(src)
+/obj/item/storage/box/prisoner/New()
+	..()
+	new /obj/item/card/id/prisoner/one(src)
+	new /obj/item/card/id/prisoner/two(src)
+	new /obj/item/card/id/prisoner/three(src)
+	new /obj/item/card/id/prisoner/four(src)
+	new /obj/item/card/id/prisoner/five(src)
+	new /obj/item/card/id/prisoner/six(src)
+	new /obj/item/card/id/prisoner/seven(src)
 
 /obj/item/storage/box/seccarts
 	name = "spare R.O.B.U.S.T. Cartridges"
 	desc = "A box full of R.O.B.U.S.T. Cartridges, used by Security."
 	icon_state = "pda"
 
-	New()
-		..()
-		new /obj/item/cartridge/security(src)
-		new /obj/item/cartridge/security(src)
-		new /obj/item/cartridge/security(src)
-		new /obj/item/cartridge/security(src)
-		new /obj/item/cartridge/security(src)
-		new /obj/item/cartridge/security(src)
-		new /obj/item/cartridge/security(src)
+/obj/item/storage/box/seccarts/New()
+	..()
+	new /obj/item/cartridge/security(src)
+	new /obj/item/cartridge/security(src)
+	new /obj/item/cartridge/security(src)
+	new /obj/item/cartridge/security(src)
+	new /obj/item/cartridge/security(src)
+	new /obj/item/cartridge/security(src)
+	new /obj/item/cartridge/security(src)
 
 /obj/item/storage/box/holobadge
 	name = "holobadge box"
 	icon_state = "box_badge"
 	desc = "A box claiming to contain holobadges."
-	New()
-		new /obj/item/clothing/accessory/holobadge(src)
-		new /obj/item/clothing/accessory/holobadge(src)
-		new /obj/item/clothing/accessory/holobadge(src)
-		new /obj/item/clothing/accessory/holobadge(src)
-		new /obj/item/clothing/accessory/holobadge/cord(src)
-		new /obj/item/clothing/accessory/holobadge/cord(src)
-		..()
-		return
+
+/obj/item/storage/box/holobadge/New()
+	..()
+	new /obj/item/clothing/accessory/holobadge(src)
+	new /obj/item/clothing/accessory/holobadge(src)
+	new /obj/item/clothing/accessory/holobadge(src)
+	new /obj/item/clothing/accessory/holobadge(src)
+	new /obj/item/clothing/accessory/holobadge/cord(src)
+	new /obj/item/clothing/accessory/holobadge/cord(src)
 
 /obj/item/storage/box/evidence
 	name = "evidence bag box"
@@ -677,50 +680,50 @@
 	desc = "A box full of handcuffs."
 	icon_state = "handcuff"
 
-	New()
-		..()
-		new /obj/item/restraints/handcuffs(src)
-		new /obj/item/restraints/handcuffs(src)
-		new /obj/item/restraints/handcuffs(src)
-		new /obj/item/restraints/handcuffs(src)
-		new /obj/item/restraints/handcuffs(src)
-		new /obj/item/restraints/handcuffs(src)
-		new /obj/item/restraints/handcuffs(src)
+/obj/item/storage/box/handcuffs/New()
+	..()
+	new /obj/item/restraints/handcuffs(src)
+	new /obj/item/restraints/handcuffs(src)
+	new /obj/item/restraints/handcuffs(src)
+	new /obj/item/restraints/handcuffs(src)
+	new /obj/item/restraints/handcuffs(src)
+	new /obj/item/restraints/handcuffs(src)
+	new /obj/item/restraints/handcuffs(src)
 
 /obj/item/storage/box/zipties
 	name = "box of spare zipties"
 	desc = "A box full of zipties."
 	icon_state = "handcuff"
 
-	New()
-		..()
-		new /obj/item/restraints/handcuffs/cable/zipties(src)
-		new /obj/item/restraints/handcuffs/cable/zipties(src)
-		new /obj/item/restraints/handcuffs/cable/zipties(src)
-		new /obj/item/restraints/handcuffs/cable/zipties(src)
-		new /obj/item/restraints/handcuffs/cable/zipties(src)
-		new /obj/item/restraints/handcuffs/cable/zipties(src)
-		new /obj/item/restraints/handcuffs/cable/zipties(src)
+/obj/item/storage/box/zipties/New()
+	..()
+	new /obj/item/restraints/handcuffs/cable/zipties(src)
+	new /obj/item/restraints/handcuffs/cable/zipties(src)
+	new /obj/item/restraints/handcuffs/cable/zipties(src)
+	new /obj/item/restraints/handcuffs/cable/zipties(src)
+	new /obj/item/restraints/handcuffs/cable/zipties(src)
+	new /obj/item/restraints/handcuffs/cable/zipties(src)
+	new /obj/item/restraints/handcuffs/cable/zipties(src)
 
 /obj/item/storage/box/alienhandcuffs
 	name = "box of spare handcuffs"
 	desc = "A box full of handcuffs."
 	icon_state = "alienboxCuffs"
 
-	New()
-		..()
-		for(var/i in 1 to 7)
-			new	/obj/item/restraints/handcuffs/alien(src)
+/obj/item/storage/box/alienhandcuffs/New()
+	..()
+	for(var/i in 1 to 7)
+		new	/obj/item/restraints/handcuffs/alien(src)
 
 /obj/item/storage/box/fakesyndiesuit
 	name = "boxed space suit and helmet"
 	desc = "A sleek, sturdy box used to hold replica spacesuits."
 	icon_state = "box_of_doom"
 
-	New()
-		..()
-		new /obj/item/clothing/head/syndicatefake(src)
-		new /obj/item/clothing/suit/syndicatefake(src)
+/obj/item/storage/box/fakesyndiesuit/New()
+	..()
+	new /obj/item/clothing/head/syndicatefake(src)
+	new /obj/item/clothing/suit/syndicatefake(src)
 
 /obj/item/storage/box/enforcer_rubber
 	name = "enforcer pistol kit (rubber)"
@@ -777,28 +780,28 @@
 	desc = "<B><FONT color='red'>WARNING:</FONT></B> <I>Keep out of reach of children</I>."
 	icon_state = "mousetraps"
 
-	New()
-		..()
-		new /obj/item/assembly/mousetrap( src )
-		new /obj/item/assembly/mousetrap( src )
-		new /obj/item/assembly/mousetrap( src )
-		new /obj/item/assembly/mousetrap( src )
-		new /obj/item/assembly/mousetrap( src )
-		new /obj/item/assembly/mousetrap( src )
+/obj/item/storage/box/mousetraps/New()
+	..()
+	new /obj/item/assembly/mousetrap( src )
+	new /obj/item/assembly/mousetrap( src )
+	new /obj/item/assembly/mousetrap( src )
+	new /obj/item/assembly/mousetrap( src )
+	new /obj/item/assembly/mousetrap( src )
+	new /obj/item/assembly/mousetrap( src )
 
 /obj/item/storage/box/pillbottles
 	name = "box of pill bottles"
 	desc = "It has pictures of pill bottles on its front."
 
-	New()
-		..()
-		new /obj/item/storage/pill_bottle( src )
-		new /obj/item/storage/pill_bottle( src )
-		new /obj/item/storage/pill_bottle( src )
-		new /obj/item/storage/pill_bottle( src )
-		new /obj/item/storage/pill_bottle( src )
-		new /obj/item/storage/pill_bottle( src )
-		new /obj/item/storage/pill_bottle( src )
+/obj/item/storage/box/pillbottles/New()
+	..()
+	new /obj/item/storage/pill_bottle( src )
+	new /obj/item/storage/pill_bottle( src )
+	new /obj/item/storage/pill_bottle( src )
+	new /obj/item/storage/pill_bottle( src )
+	new /obj/item/storage/pill_bottle( src )
+	new /obj/item/storage/pill_bottle( src )
+	new /obj/item/storage/pill_bottle( src )
 
 /obj/item/storage/box/patch_packs
 	name = "box of patch packs"
@@ -836,17 +839,18 @@
 	icon_state = "spbox"
 	storage_slots = 8
 	can_hold = list(/obj/item/toy/snappop)
-	New()
-		..()
-		for(var/i=1; i <= storage_slots; i++)
-			new /obj/item/toy/snappop(src)
+
+/obj/item/storage/box/snappops/New()
+	..()
+	for(var/i=1; i <= storage_slots; i++)
+		new /obj/item/toy/snappop(src)
 
 /obj/item/storage/box/matches
 	name = "matchbox"
 	desc = "A small box of Almost But Not Quite Plasma Premium Matches."
 	icon = 'icons/obj/cigarettes.dmi'
 	icon_state = "matchbox"
-	item_state = "zippo"
+	item_state = "matchbox"
 	storage_slots = 10
 	w_class = WEIGHT_CLASS_TINY
 	max_w_class = WEIGHT_CLASS_TINY
@@ -868,23 +872,24 @@
 	name = "box of injectors"
 	desc = "Contains autoinjectors."
 	icon_state = "syringe"
-	New()
-		..()
-		for(var/i; i < storage_slots; i++)
-			new /obj/item/reagent_containers/hypospray/autoinjector(src)
+
+/obj/item/storage/box/autoinjectors/New()
+	..()
+	for(var/i; i < storage_slots; i++)
+		new /obj/item/reagent_containers/hypospray/autoinjector(src)
 
 /obj/item/storage/box/autoinjector/utility
 	name = "autoinjector kit"
 	desc = "A box with several utility autoinjectors for the economical miner."
 	icon_state = "syringe"
 
-	New()
-		..()
-		new /obj/item/reagent_containers/hypospray/autoinjector/teporone(src)
-		new /obj/item/reagent_containers/hypospray/autoinjector/teporone(src)
-		new /obj/item/reagent_containers/hypospray/autoinjector/stimpack(src)
-		new /obj/item/reagent_containers/hypospray/autoinjector/stimpack(src)
-		new /obj/item/reagent_containers/hypospray/autoinjector/stimpack(src)
+/obj/item/storage/box/autoinjector/utility/New()
+	..()
+	new /obj/item/reagent_containers/hypospray/autoinjector/teporone(src)
+	new /obj/item/reagent_containers/hypospray/autoinjector/teporone(src)
+	new /obj/item/reagent_containers/hypospray/autoinjector/stimpack(src)
+	new /obj/item/reagent_containers/hypospray/autoinjector/stimpack(src)
+	new /obj/item/reagent_containers/hypospray/autoinjector/stimpack(src)
 
 /obj/item/storage/box/lights
 	name = "replacement bulbs"

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

@@ -226,14 +226,14 @@
 	name = "\improper DromedaryCo packet"
 	desc = "A packet of six imported DromedaryCo cancer sticks. A label on the packaging reads, \"Wouldn't a slow death make a change?\""
 	icon_state = "Dpacket"
-	item_state = "cigpacket"
+	item_state = "Dpacket"
 
 
 /obj/item/storage/fancy/cigarettes/syndicate
 	name = "\improper Syndicate Cigarettes"
 	desc = "A packet of six evil-looking cigarettes, A label on the packaging reads, \"Donk Co\""
 	icon_state = "robustpacket"
-	item_state = "cigpacket"
+	item_state = "robustpacket"
 
 /obj/item/storage/fancy/cigarettes/syndicate/New()
 	..()
@@ -244,14 +244,14 @@
 	name = "cigarette packet"
 	desc = "An obscure brand of cigarettes."
 	icon_state = "syndiepacket"
-	item_state = "cigpacket"
+	item_state = "syndiepacket"
 	cigarette_type = /obj/item/clothing/mask/cigarette/syndicate
 
 /obj/item/storage/fancy/cigarettes/cigpack_med
 	name = "Medical Marijuana Packet"
 	desc = "A prescription packet containing six marijuana cigarettes."
 	icon_state = "medpacket"
-	item_state = "cigpacket"
+	item_state = "medpacket"
 	cigarette_type = /obj/item/clothing/mask/cigarette/medical_marijuana
 
 
@@ -259,46 +259,46 @@
 	name = "\improper Uplift Smooth packet"
 	desc = "Your favorite brand, now menthol flavored."
 	icon_state = "upliftpacket"
-	item_state = "cigpacket"
+	item_state = "upliftpacket"
 	cigarette_type = /obj/item/clothing/mask/cigarette/menthol
 
 /obj/item/storage/fancy/cigarettes/cigpack_robust
 	name = "\improper Robust packet"
 	desc = "Smoked by the robust."
 	icon_state = "robustpacket"
-	item_state = "cigpacket"
+	item_state = "robustpacket"
 
 /obj/item/storage/fancy/cigarettes/cigpack_robustgold
 	name = "\improper Robust Gold packet"
 	desc = "Smoked by the truly robust."
 	icon_state = "robustgpacket"
-	item_state = "cigpacket"
+	item_state = "robustgpacket"
 	cigarette_type = /obj/item/clothing/mask/cigarette/robustgold
 
 /obj/item/storage/fancy/cigarettes/cigpack_carp
 	name = "\improper Carp Classic packet"
 	desc = "Since 2313."
 	icon_state = "carppacket"
-	item_state = "cigpacket"
+	item_state = "carppacket"
 
 /obj/item/storage/fancy/cigarettes/cigpack_midori
 	name = "\improper Midori Tabako packet"
 	desc = "You can't understand the runes, but the packet smells funny."
 	icon_state = "midoripacket"
-	item_state = "cigpacket"
+	item_state = "midoripacket"
 
 /obj/item/storage/fancy/cigarettes/cigpack_shadyjims
 	name ="\improper Shady Jim's Super Slims"
 	desc = "Is your weight slowing you down? Having trouble running away from gravitational singularities? Can't stop stuffing your mouth? Smoke Shady Jim's Super Slims and watch all that fat burn away. Guaranteed results!"
 	icon_state = "shadyjimpacket"
-	item_state = "cigpacket"
+	item_state = "shadyjimpacket"
 	cigarette_type = /obj/item/clothing/mask/cigarette/shadyjims
 
 /obj/item/storage/fancy/cigarettes/cigpack_random
 	name ="\improper Embellished Enigma packet"
 	desc = "For the true connoisseur of exotic flavors."
 	icon_state = "shadyjimpacket"
-	item_state = "cigpacket"
+	item_state = "shadyjimpacket"
 	cigarette_type = /obj/item/clothing/mask/cigarette/random
 
 /obj/item/storage/fancy/rollingpapers
@@ -307,6 +307,7 @@
 	w_class = WEIGHT_CLASS_TINY
 	icon = 'icons/obj/cigarettes.dmi'
 	icon_state = "cig_paper_pack"
+	item_state = "cig_paper_pack"
 	storage_slots = 10
 	icon_type = "rolling paper"
 	can_hold = list(/obj/item/rollingpaper)

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

@@ -205,7 +205,7 @@
 	if(empty)
 		return
 	new /obj/item/reagent_containers/hypospray/combat(src)
-	new /obj/item/reagent_containers/applicator/dual(src) // Because you ain't got no time to look at what damage dey taking yo
+	new /obj/item/reagent_containers/applicator/dual/syndi(src) // Because you ain't got no time to look at what damage dey taking yo
 	new /obj/item/defibrillator/compact/combat/loaded(src)
 	new /obj/item/clothing/glasses/hud/health/night(src)
 

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

@@ -204,11 +204,11 @@
 	var/obj/item/sample_object
 	var/number
 
-	New(obj/item/sample as obj)
-		if(!istype(sample))
-			qdel(src)
-		sample_object = sample
-		number = 1
+/datum/numbered_display/New(obj/item/sample as obj)
+	if(!istype(sample))
+		qdel(src)
+	sample_object = sample
+	number = 1
 
 //This proc determins the size of the inventory to be displayed. Please touch it only if you know what you're doing.
 /obj/item/storage/proc/orient2hud(mob/user as mob)
@@ -438,8 +438,11 @@
 	if((!ishuman(usr) && (src.loc != usr)) || usr.stat || usr.restrained())
 		return
 
+	drop_inventory(usr)
+
+/obj/item/storage/proc/drop_inventory(user)
 	var/turf/T = get_turf(src)
-	hide_from(usr)
+	hide_from(user)
 	for(var/obj/item/I in contents)
 		remove_from_storage(I, T)
 		CHECK_TICK
@@ -499,10 +502,9 @@
 
 /obj/item/storage/attack_self(mob/user)
 
-	//Clicking on itself will empty it, if it has the verb to do that.
-	if(user.is_in_active_hand(src))
-		if(verbs.Find(/obj/item/storage/verb/quick_empty))
-			quick_empty()
+	//Clicking on itself will empty it, if allow_quick_empty is TRUE
+	if(allow_quick_empty && user.is_in_active_hand(src))
+		drop_inventory(user)
 
 //Returns the storage depth of an atom. This is the number of storage items the atom is contained in before reaching toplevel (the area).
 //Returns -1 if the atom was not found on container.

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

@@ -1,7 +1,7 @@
 /obj/item/storage/box/syndicate/New()
 	..()
 	switch(pickweight(list("bloodyspai" = 1, "thief" = 1, "bond" = 1, "sabotage" = 1, "payday" = 1, "implant" = 1, "hacker" = 1, "darklord" = 1, "professional" = 1)))
-		if("bloodyspai") // 35TC + one 0TC
+		if("bloodyspai") // 37TC + one 0TC
 			new /obj/item/clothing/under/chameleon(src) // 2TC
 			new /obj/item/clothing/mask/chameleon(src) // 0TC
 			new /obj/item/card/id/syndicate(src) // 2TC
@@ -14,12 +14,12 @@
 			new /obj/item/storage/fancy/cigarettes/cigpack_syndicate(src) // 2TC
 			new /obj/item/flashlight/emp(src) // 2TC
 			new /obj/item/clothing/glasses/hud/security/chameleon(src) // 2TC
-			new /obj/item/chameleon(src) // 8TC
+			new /obj/item/chameleon(src) // 7TC
 			return
 
-		if("thief")	// 40TC
+		if("thief")	// 39TC
 			new /obj/item/gun/energy/kinetic_accelerator/crossbow(src) // 12TC
-			new /obj/item/chameleon(src) // 8TC
+			new /obj/item/chameleon(src) // 7TC
 			new /obj/item/clothing/glasses/chameleon/thermal(src) // 6TC
 			new /obj/item/clothing/gloves/color/black/thief(src) // 6TC
 			new /obj/item/card/id/syndicate(src) // 2TC
@@ -43,7 +43,7 @@
 			new /obj/item/CQC_manual(src) // 13TC
 			return
 
-		if("sabotage") // 47TC + three 0TC
+		if("sabotage") // 41TC + two 0TC
 			new /obj/item/grenade/plastic/c4(src) // 1TC
 			new /obj/item/grenade/plastic/c4(src) // 1TC
 			new /obj/item/camera_bug(src) // 1TC
@@ -53,23 +53,23 @@
 			new /obj/item/card/emag(src) // 6TC
 			new /obj/item/clothing/gloves/color/yellow(src) // 0TC
 			new /obj/item/grenade/syndieminibomb(src) // 6TC
-			new /obj/item/grenade/clusterbuster/n2o(src) // 0TC
+			new /obj/item/grenade/clusterbuster/n2o(src) // 4TC
 			new /obj/item/storage/box/syndie_kit/space(src) // 4TC
 			new /obj/item/encryptionkey/syndicate(src) // 2TC
 			return
 
-		if("payday") // 33TC + four 0TC
+		if("payday") // 35TC + four 0TC
 			new /obj/item/gun/projectile/revolver(src) // 13TC
 			new /obj/item/ammo_box/a357(src) // 3TC
 			new /obj/item/ammo_box/a357(src) // 3TC
 			new /obj/item/card/emag(src) // 6TC
-			new /obj/item/grenade/plastic/c4(src) // 1TC
+			new /obj/item/jammer(src) // 5TC
 			new /obj/item/card/id/syndicate(src) // 2TC
 			new /obj/item/clothing/under/suit_jacket/really_black(src) //0TC
 			new /obj/item/clothing/suit/storage/lawyer/blackjacket/armored(src) //0TC
 			new /obj/item/clothing/gloves/color/latex/nitrile(src) //0 TC
 			new /obj/item/clothing/mask/gas/clown_hat(src) // 0TC
-			new /obj/item/thermal_drill(src) // 3TC
+			new /obj/item/thermal_drill/diamond_drill(src) // 1TC
 			new /obj/item/encryptionkey/syndicate(src) // 2TC
 			return
 
@@ -83,17 +83,20 @@
 			new /obj/item/encryptionkey/syndicate(src) // 2TC
 			return
 
-		if("hacker") // 30TC + one 0TC
+		if("hacker") // 37TC + two 0TC
 			new /obj/item/aiModule/syndicate(src) // 12TC
 			new /obj/item/card/emag(src) // 6TC
 			new /obj/item/encryptionkey/syndicate(src) // 2TC
 			new /obj/item/encryptionkey/binary(src) // 5TC
 			new /obj/item/aiModule/toyAI(src) // 0TC
+			new /obj/item/clothing/glasses/chameleon/thermal(src) // 6TC
+			new /obj/item/storage/belt/military/traitor/hacker(src) // 3TC
+			new /obj/item/clothing/gloves/combat(src) // 0TC
 			new /obj/item/multitool/ai_detect(src) // 1TC
-			new /obj/item/storage/box/syndie_kit/c4 // 4TC
+			new /obj/item/flashlight/emp(src) // 2TC
 			return
 
-		if("darklord") // 22TC + two 0TC
+		if("darklord") // 24TC + two 0TC
 			new /obj/item/melee/energy/sword/saber/red(src) // 8TC
 			new /obj/item/melee/energy/sword/saber/red(src) // 8TC
 			new /obj/item/dnainjector/telemut/darkbundle(src) // 0TC
@@ -104,7 +107,7 @@
 			new /obj/item/encryptionkey/syndicate(src) // 2TC
 			return
 
-		if("professional") // 32 TC + two 0TC
+		if("professional") // 34TC + two 0TC
 			new /obj/item/gun/projectile/automatic/sniper_rifle/syndicate/penetrator(src) // 16TC
 			new /obj/item/ammo_box/magazine/sniper_rounds/penetrator(src) // 5TC
 			new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src) // 3TC
@@ -157,14 +160,14 @@
 /obj/item/storage/box/syndie_kit/boolets
 	name = "Shotgun shells"
 
-	New()
-		..()
-		new /obj/item/ammo_casing/shotgun/fakebeanbag(src)
-		new /obj/item/ammo_casing/shotgun/fakebeanbag(src)
-		new /obj/item/ammo_casing/shotgun/fakebeanbag(src)
-		new /obj/item/ammo_casing/shotgun/fakebeanbag(src)
-		new /obj/item/ammo_casing/shotgun/fakebeanbag(src)
-		new /obj/item/ammo_casing/shotgun/fakebeanbag(src)
+/obj/item/storage/box/syndie_kit/boolets/New()
+	..()
+	new /obj/item/ammo_casing/shotgun/fakebeanbag(src)
+	new /obj/item/ammo_casing/shotgun/fakebeanbag(src)
+	new /obj/item/ammo_casing/shotgun/fakebeanbag(src)
+	new /obj/item/ammo_casing/shotgun/fakebeanbag(src)
+	new /obj/item/ammo_casing/shotgun/fakebeanbag(src)
+	new /obj/item/ammo_casing/shotgun/fakebeanbag(src)
 
 /obj/item/storage/box/syndie_kit/emp
 	name = "boxed EMP kit"
@@ -205,26 +208,26 @@
 /obj/item/storage/box/syndie_kit/sarin
 	name = "Sarin Gas Grenades"
 
-	New()
-		..()
-		new /obj/item/grenade/chem_grenade/saringas(src)
-		new /obj/item/grenade/chem_grenade/saringas(src)
-		new /obj/item/grenade/chem_grenade/saringas(src)
-		new /obj/item/grenade/chem_grenade/saringas(src)
+/obj/item/storage/box/syndie_kit/sarin/New()
+	..()
+	new /obj/item/grenade/chem_grenade/saringas(src)
+	new /obj/item/grenade/chem_grenade/saringas(src)
+	new /obj/item/grenade/chem_grenade/saringas(src)
+	new /obj/item/grenade/chem_grenade/saringas(src)
 
 /obj/item/storage/box/syndie_kit/bioterror
 	name = "bioterror syringe box"
 
-	New()
-		..()
-		new /obj/item/reagent_containers/syringe/bioterror(src)
-		new /obj/item/reagent_containers/syringe/bioterror(src)
-		new /obj/item/reagent_containers/syringe/bioterror(src)
-		new /obj/item/reagent_containers/syringe/bioterror(src)
-		new /obj/item/reagent_containers/syringe/bioterror(src)
-		new /obj/item/reagent_containers/syringe/bioterror(src)
-		new /obj/item/reagent_containers/syringe/bioterror(src)
-		return
+/obj/item/storage/box/syndie_kit/bioterror/New()
+	..()
+	new /obj/item/reagent_containers/syringe/bioterror(src)
+	new /obj/item/reagent_containers/syringe/bioterror(src)
+	new /obj/item/reagent_containers/syringe/bioterror(src)
+	new /obj/item/reagent_containers/syringe/bioterror(src)
+	new /obj/item/reagent_containers/syringe/bioterror(src)
+	new /obj/item/reagent_containers/syringe/bioterror(src)
+	new /obj/item/reagent_containers/syringe/bioterror(src)
+	return
 
 /obj/item/storage/box/syndie_kit/caneshotgun
 	name = "cane gun kit"

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

@@ -1,119 +0,0 @@
-/* Weapons
- * Contains:
- *		Banhammer
- *		Classic Baton
- */
-
-/*
- * Banhammer
- */
-/obj/item/banhammer/attack(mob/M, mob/user)
-	to_chat(M, "<font color='red'><b> You have been banned FOR NO REISIN by [user]<b></font>")
-	to_chat(user, "<font color='red'> You have <b>BANNED</b> [M]</font>")
-	playsound(loc, 'sound/effects/adminhelp.ogg', 15) //keep it at 15% volume so people don't jump out of their skin too much
-
-/*
- * Classic Baton
- */
-
-/obj/item/melee/classic_baton
-	name = "police baton"
-	desc = "A wooden truncheon for beating criminal scum."
-	icon_state = "baton"
-	item_state = "classic_baton"
-	slot_flags = SLOT_BELT
-	force = 12 //9 hit crit
-	w_class = WEIGHT_CLASS_NORMAL
-	var/cooldown = 0
-	var/on = 1
-
-/obj/item/melee/classic_baton/attack(mob/target as mob, mob/living/user as mob)
-	if(on)
-		add_fingerprint(user)
-		if((CLUMSY in user.mutations) && prob(50))
-			to_chat(user, "<span class ='danger'>You club yourself over the head.</span>")
-			user.Weaken(3 * force)
-			if(ishuman(user))
-				var/mob/living/carbon/human/H = user
-				H.apply_damage(2*force, BRUTE, "head")
-			else
-				user.take_organ_damage(2*force)
-			return
-		if(isrobot(target))
-			..()
-			return
-		if(!isliving(target))
-			return
-		if(user.a_intent == INTENT_HARM)
-			if(!..()) return
-			if(!isrobot(target)) return
-		else
-			if(cooldown <= 0)
-				if(ishuman(target))
-					var/mob/living/carbon/human/H = target
-					if(H.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK))
-						return
-					if(check_martial_counter(H, user))
-						return
-				playsound(get_turf(src), 'sound/effects/woodhit.ogg', 75, 1, -1)
-				target.Weaken(3)
-				add_attack_logs(user, target, "Stunned with [src]")
-				add_fingerprint(user)
-				target.visible_message("<span class ='danger'>[user] has knocked down [target] with \the [src]!</span>", \
-					"<span class ='userdanger'>[user] has knocked down [target] with \the [src]!</span>")
-				if(!iscarbon(user))
-					target.LAssailant = null
-				else
-					target.LAssailant = user
-				cooldown = 1
-				spawn(40)
-					cooldown = 0
-		return
-	else
-		return ..()
-
-/obj/item/melee/classic_baton/ntcane
-	name = "fancy cane"
-	desc = "A cane with special engraving on it. It seems well suited for fending off assailants..."
-	icon_state = "cane_nt"
-	item_state = "cane_nt"
-	needs_permit = 0
-
-/obj/item/melee/classic_baton/ntcane/is_crutch()
-	return 1
-
-//Telescopic baton
-/obj/item/melee/classic_baton/telescopic
-	name = "telescopic baton"
-	desc = "A compact yet robust personal defense weapon. Can be concealed when folded."
-	icon_state = "telebaton_0"
-	item_state = null
-	slot_flags = SLOT_BELT
-	w_class = WEIGHT_CLASS_SMALL
-	needs_permit = 0
-	force = 0
-	on = 0
-
-/obj/item/melee/classic_baton/telescopic/attack_self(mob/user as mob)
-	on = !on
-	if(on)
-		to_chat(user, "<span class ='warning'>You extend the baton.</span>")
-		icon_state = "telebaton_1"
-		item_state = "nullrod"
-		w_class = WEIGHT_CLASS_BULKY //doesnt fit in backpack when its on for balance
-		force = 10 //stunbaton damage
-		attack_verb = list("smacked", "struck", "cracked", "beaten")
-	else
-		to_chat(user, "<span class ='notice'>You collapse the baton.</span>")
-		icon_state = "telebaton_0"
-		item_state = null //no sprite for concealment even when in hand
-		slot_flags = SLOT_BELT
-		w_class = WEIGHT_CLASS_SMALL
-		force = 0 //not so robust now
-		attack_verb = list("hit", "poked")
-	if(istype(user,/mob/living/carbon/human))
-		var/mob/living/carbon/human/H = user
-		H.update_inv_l_hand()
-		H.update_inv_r_hand()
-	playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, 1)
-	add_fingerprint(user)

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

@@ -219,28 +219,3 @@
 		turn_off(cur_user)
 		return
 	..()
-
-/obj/item/tank/jetpack/rig
-	name = "jetpack"
-	var/obj/item/rig/holder
-	actions_types = list(/datum/action/item_action/toggle_jetpack, /datum/action/item_action/jetpack_stabilization)
-
-/obj/item/tank/jetpack/rig/examine()
-	. = list("It's a jetpack. If you can see this, report it on the bug tracker.")
-
-/obj/item/tank/jetpack/rig/allow_thrust(num, mob/living/user)
-	if(!on)
-		return 0
-
-	if(!istype(holder) || !holder.air_supply)
-		return 0
-
-	var/datum/gas_mixture/removed = holder.air_supply.air_contents.remove(num)
-	if(removed.total_moles() < 0.005)
-		turn_off(user)
-		return 0
-
-	var/turf/T = get_turf(user)
-	T.assume_air(removed)
-
-	return 1

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

@@ -27,7 +27,7 @@
 	if(get_dist(user, src) <= 0 && air_contents.oxygen < 10)
 		. += "<span class='danger'>The meter on [src] indicates you are almost out of air!</span>"
 
-obj/item/tank/oxygen/empty/New()
+/obj/item/tank/oxygen/empty/New()
 	..()
 	air_contents.oxygen = null
 
@@ -158,7 +158,7 @@ obj/item/tank/oxygen/empty/New()
 		. += "<span class='danger'>The meter on [src] indicates you are almost out of air!</span>"
 		playsound(user, 'sound/effects/alert.ogg', 50, 1)
 
-obj/item/tank/emergency_oxygen/empty/New()
+/obj/item/tank/emergency_oxygen/empty/New()
 	..()
 	air_contents.oxygen = null
 
@@ -167,7 +167,7 @@ obj/item/tank/emergency_oxygen/empty/New()
 	icon_state = "emergency_engi"
 	volume = 6
 
-obj/item/tank/emergency_oxygen/engi/empty/New()
+/obj/item/tank/emergency_oxygen/engi/empty/New()
 	..()
 	air_contents.oxygen = null
 
@@ -182,7 +182,7 @@ obj/item/tank/emergency_oxygen/engi/empty/New()
 	icon_state = "emergency_double"
 	volume = 10
 
-obj/item/tank/emergency_oxygen/double/empty/New()
+/obj/item/tank/emergency_oxygen/double/empty/New()
 	..()
 	air_contents.oxygen = null
 

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

@@ -43,35 +43,31 @@
 /obj/item/tank/proc/toggle_internals(mob/user, silent = FALSE)
 	var/mob/living/carbon/C = user
 	if(!istype(C))
-		return 0
+		return FALSE
 
 	if(C.internal == src)
 		to_chat(C, "<span class='notice'>You close \the [src] valve.</span>")
 		C.internal = null
 	else
-		var/can_open_valve = 0
-		if(C.get_organ_slot("breathing_tube"))
-			can_open_valve = 1
-		else if(C.wear_mask && C.wear_mask.flags & AIRTIGHT)
-			can_open_valve = 1
-		else if(ishuman(C))
-			var/mob/living/carbon/human/H = C
-			if(H.head && H.head.flags & AIRTIGHT)
-				can_open_valve = 1
+		if(!C.get_organ_slot("breathing_tube")) // Breathing tubes can always use internals, if they have one, skip ahead and turn internals on/off
+			if(!C.wear_mask) // Do we have a mask equipped?
+				return FALSE
 
-		if(can_open_valve)
+			var/obj/item/clothing/mask/M = C.wear_mask
+			// If the "mask" isn't actually a mask OR That mask isn't internals compatible AND Their headgear isn't internals compatible
+			if(!istype(M) || (!(initial(M.flags) & AIRTIGHT) && !(C.head.flags & AIRTIGHT)))
+				if(!silent)
+					to_chat(C, "<span class='warning'>You are not wearing a suitable mask or helmet.</span>")
+				return FALSE
+			if(M.mask_adjusted) // If the mask is equipped but pushed down
+				M.adjustmask(C) // Adjust it back
+
+		if(!silent)
 			if(C.internal)
-				if(!silent)
-					to_chat(C, "<span class='notice'>You switch your internals to [src].</span>")
+				to_chat(C, "<span class='notice'>You switch your internals to [src].</span>")
 			else
-				if(!silent)
-					to_chat(C, "<span class='notice'>You open \the [src] valve.</span>")
-			C.internal = src
-		else
-			if(!silent)
-				to_chat(C, "<span class='notice'>You are not wearing a suitable mask or helmet.</span>")
-			return 0
-
+				to_chat(C, "<span class='notice'>You open \the [src] valve.</span>")
+		C.internal = src
 	C.update_action_buttons_icon()
 
 
@@ -142,70 +138,55 @@
 	if(!(air_contents))
 		return
 
-	ui_interact(user)
+	tgui_interact(user)
 
-/obj/item/tank/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
-	// update the ui if it exists, returns null if no ui is passed/found
-	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/item/tank/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_inventory_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		// the ui does not exist, so we'll create a new() one
-        // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
-		ui = new(user, src, ui_key, "tanks.tmpl", "Tank", 500, 300)
-		// open the new ui window
+		ui = new(user, src, ui_key, "Tank",  name, 300, 150, master_ui, state)
 		ui.open()
-		// auto update every Master Controller tick
-		ui.set_auto_update(1)
 
-/obj/item/tank/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
-	var/using_internal
-	if(iscarbon(loc))
-		var/mob/living/carbon/C = loc
-		if(C.internal == src)
-			using_internal = 1
-
-	var/data[0]
+/obj/item/tank/tgui_data(mob/user)
+	var/list/data = list()
 	data["tankPressure"] = round(air_contents.return_pressure() ? air_contents.return_pressure() : 0)
 	data["releasePressure"] = round(distribute_pressure ? distribute_pressure : 0)
 	data["defaultReleasePressure"] = round(TANK_DEFAULT_RELEASE_PRESSURE)
+	data["minReleasePressure"] = round(TANK_DEFAULT_RELEASE_PRESSURE)
 	data["maxReleasePressure"] = round(TANK_MAX_RELEASE_PRESSURE)
-	data["valveOpen"] = using_internal ? 1 : 0
-
-	data["maskConnected"] = 0
-
-	if(iscarbon(loc))
-		var/mob/living/carbon/C = loc
-		if(C.internal == src)
-			data["maskConnected"] = 1
-		else
-			if(C.wear_mask && (C.wear_mask.flags & AIRTIGHT))
-				data["maskConnected"] = 1
-			else if(ishuman(C))
-				var/mob/living/carbon/human/H = C
-				if(H.head && (H.head.flags & AIRTIGHT))
-					data["maskConnected"] = 1
-
+	var/mob/living/carbon/C = user
+	if(!istype(C))
+		C = loc.loc
+	if(!istype(C))
+		return data
+	data["has_mask"] = C.wear_mask ? TRUE : FALSE
+	data["connected"] = (C.internal && C.internal == src) ? TRUE : FALSE
 	return data
 
-/obj/item/tank/Topic(href, href_list)
+/obj/item/tank/tgui_act(action, params)
 	if(..())
-		return 1
-
-	if(href_list["dist_p"])
-		if(href_list["dist_p"] == "reset")
-			distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
-		else if(href_list["dist_p"] == "max")
-			distribute_pressure = TANK_MAX_RELEASE_PRESSURE
+		return
+	. = TRUE
+	switch(action)
+		if("pressure")
+			var/pressure = params["pressure"]
+			if(pressure == "reset")
+				pressure = initial(distribute_pressure)
+			else if(pressure == "min")
+				pressure = TANK_DEFAULT_RELEASE_PRESSURE
+			else if(pressure == "max")
+				pressure = TANK_MAX_RELEASE_PRESSURE
+			else if(text2num(pressure) != null)
+				pressure = text2num(pressure)
+			else
+				. = FALSE
+			if(.)
+				distribute_pressure = clamp(round(pressure), TANK_DEFAULT_RELEASE_PRESSURE, TANK_MAX_RELEASE_PRESSURE)
+		if("internals")
+			toggle_internals(usr)
 		else
-			var/cp = text2num(href_list["dist_p"])
-			distribute_pressure += cp
-		distribute_pressure = min(max(round(distribute_pressure), 0), TANK_MAX_RELEASE_PRESSURE)
-
-	if(href_list["stat"])
-		toggle_internals(usr)
-
-	add_fingerprint(usr)
-	return 1
-
+			. = FALSE
+	if(.)
+		add_fingerprint(usr)
 
 /obj/item/tank/remove_air(amount)
 	return air_contents.remove(amount)

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

@@ -1,3 +1,6 @@
+/**
+  * # Banhammer
+  */
 /obj/item/banhammer
 	desc = "A banhammer"
 	name = "banhammer"
@@ -13,11 +16,15 @@
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
 	resistance_flags = FIRE_PROOF
 
-
 /obj/item/banhammer/suicide_act(mob/user)
 	to_chat(viewers(user), "<span class='suicide'>[user] is hitting [user.p_them()]self with the [src.name]! It looks like [user.p_theyre()] trying to ban [user.p_them()]self from life.</span>")
 	return BRUTELOSS|FIRELOSS|TOXLOSS|OXYLOSS
 
+/obj/item/banhammer/attack(mob/M, mob/user)
+	to_chat(M, "<font color='red'><b> You have been banned FOR NO REISIN by [user]<b></font>")
+	to_chat(user, "<font color='red'> You have <b>BANNED</b> [M]</font>")
+	playsound(loc, 'sound/effects/adminhelp.ogg', 15) //keep it at 15% volume so people don't jump out of their skin too much
+
 /obj/item/sord
 	name = "\improper SORD"
 	desc = "This thing is so unspeakably shitty you are having a hard time even holding it."
@@ -178,6 +185,7 @@
 	throwforce = 12
 	attack_verb = list("beat", "smacked")
 	w_class = WEIGHT_CLASS_HUGE
+	var/next_throw_time = 0
 	var/homerun_ready = 0
 	var/homerun_able = 0
 
@@ -246,16 +254,38 @@
 		to_chat(user, "<span class='warning'>You cannot attack in deflect mode!</span>")
 		return
 	. = ..()
-	var/atom/throw_target = get_edge_target_turf(target, user.dir)
 	if(homerun_ready)
+		var/atom/throw_target = get_edge_target_turf(target, user.dir)
 		user.visible_message("<span class='userdanger'>It's a home run!</span>")
 		target.throw_at(throw_target, rand(8,10), 14, user)
 		target.ex_act(2)
 		playsound(get_turf(src), 'sound/weapons/homerun.ogg', 100, 1)
 		homerun_ready = 0
 		return
-	else if(!target.anchored)
-		target.throw_at(throw_target, rand(1,2), 7, user)
+	if(world.time < next_throw_time)
+		// Limit the rate of throwing, so you can't spam it.
+		return
+	if(!istype(target))
+		// Should already be /mob/living, but check anyway.
+		return
+	if(target.anchored)
+		// No throwing mobs that are anchored to the floor.
+		return
+	if(target.mob_size > MOB_SIZE_HUMAN)
+		// No throwing things that are physically bigger than you are.
+		// Covers: blobbernaut, alien empress, ai core, juggernaut, ed209, mulebot, alien/queen/large, carp/megacarp, deathsquid, hostile/tree, megafauna, hostile/asteroid, terror_spider/queen/empress
+		return
+	if(!(target.status_flags & CANPUSH))
+		// No throwing mobs specifically flagged as immune to being pushed.
+		// Covers: revenant, hostile/blob/*, most borgs, juggernauts, hivebot/tele, spaceworms, shades, bots, alien queens, hostile/syndicate/melee, hostile/asteroid
+		return
+	if(target.move_resist > MOVE_RESIST_DEFAULT)
+		// No throwing mobs that have higher than normal move_resist.
+		// Covers: revenant, bot/mulebot, hostile/statue, hostile/megafauna, goliath
+		return
+	var/atom/throw_target = get_edge_target_turf(target, user.dir)
+	target.throw_at(throw_target, rand(1, 2), 7, user)
+	next_throw_time = world.time + 10 SECONDS
 
 /obj/item/melee/baseball_bat/ablative
 	name = "metal baseball bat"

code/game/objects/objs.dm

@@ -351,3 +351,9 @@ a {
 
 /obj/proc/check_uplink_validity()
 	return TRUE
+
+/obj/proc/force_eject_occupant()
+	// This proc handles safely removing occupant mobs from the object if they must be teleported out (due to being SSD/AFK, by admin teleport, etc) or transformed.
+	// In the event that the object doesn't have an overriden version of this proc to do it, log a runtime so one can be added.
+	CRASH("Proc force_eject_occupant() is not overriden on a machine containing a mob.")
+

code/game/objects/random/random.dm

@@ -30,13 +30,14 @@
 	desc = "This is a random tool"
 	icon = 'icons/obj/items.dmi'
 	icon_state = "welder"
-	item_to_spawn()
-		return pick(/obj/item/screwdriver,\
-					/obj/item/wirecutters,\
-					/obj/item/weldingtool,\
-					/obj/item/crowbar,\
-					/obj/item/wrench,\
-					/obj/item/flashlight)
+
+/obj/random/tool/item_to_spawn()
+	return pick(/obj/item/screwdriver,\
+				/obj/item/wirecutters,\
+				/obj/item/weldingtool,\
+				/obj/item/crowbar,\
+				/obj/item/wrench,\
+				/obj/item/flashlight)
 
 
 /obj/random/technology_scanner
@@ -44,10 +45,11 @@
 	desc = "This is a random technology scanner."
 	icon = 'icons/obj/device.dmi'
 	icon_state = "atmos"
-	item_to_spawn()
-		return pick(prob(5);/obj/item/t_scanner,\
-					prob(2);/obj/item/radio/intercom,\
-					prob(5);/obj/item/analyzer)
+
+/obj/random/technology_scanner/item_to_spawn()
+	return pick(prob(5);/obj/item/t_scanner,\
+				prob(2);/obj/item/radio/intercom,\
+				prob(5);/obj/item/analyzer)
 
 
 /obj/random/powercell
@@ -55,23 +57,24 @@
 	desc = "This is a random powercell."
 	icon = 'icons/obj/power.dmi'
 	icon_state = "cell"
-	item_to_spawn()
-		return pick(prob(10);/obj/item/stock_parts/cell/crap,\
-					prob(40);/obj/item/stock_parts/cell,\
-					prob(40);/obj/item/stock_parts/cell/high,\
-					prob(9);/obj/item/stock_parts/cell/super,\
-					prob(1);/obj/item/stock_parts/cell/hyper)
 
+/obj/random/powercell/item_to_spawn()
+	return pick(prob(10);/obj/item/stock_parts/cell/crap,\
+				prob(40);/obj/item/stock_parts/cell,\
+				prob(40);/obj/item/stock_parts/cell/high,\
+				prob(9);/obj/item/stock_parts/cell/super,\
+				prob(1);/obj/item/stock_parts/cell/hyper)
 
 /obj/random/bomb_supply
 	name = "Bomb Supply"
 	desc = "This is a random bomb supply."
 	icon = 'icons/obj/assemblies/new_assemblies.dmi'
 	icon_state = "signaller"
-	item_to_spawn()
-		return pick(/obj/item/assembly/igniter,\
-					/obj/item/assembly/prox_sensor,\
-					/obj/item/assembly/signaler)
+
+/obj/random/bomb_supply/item_to_spawn()
+	return pick(/obj/item/assembly/igniter,\
+				/obj/item/assembly/prox_sensor,\
+				/obj/item/assembly/signaler)
 
 
 /obj/random/toolbox
@@ -79,11 +82,11 @@
 	desc = "This is a random toolbox."
 	icon = 'icons/obj/storage.dmi'
 	icon_state = "red"
-	item_to_spawn()
-		return pick(prob(3);/obj/item/storage/toolbox/mechanical,\
-					prob(2);/obj/item/storage/toolbox/electrical,\
-					prob(1);/obj/item/storage/toolbox/emergency)
 
+/obj/random/toolbox/item_to_spawn()
+	return pick(prob(3);/obj/item/storage/toolbox/mechanical,\
+				prob(2);/obj/item/storage/toolbox/electrical,\
+				prob(1);/obj/item/storage/toolbox/emergency)
 
 /obj/random/tech_supply
 	name = "Random Tech Supply"
@@ -91,15 +94,16 @@
 	icon = 'icons/obj/power.dmi'
 	icon_state = "cell"
 	spawn_nothing_percentage = 50
-	item_to_spawn()
-		return pick(prob(3);/obj/random/powercell,\
-					prob(2);/obj/random/technology_scanner,\
-					prob(1);/obj/item/stack/packageWrap,\
-					prob(2);/obj/random/bomb_supply,\
-					prob(1);/obj/item/extinguisher,\
-					prob(1);/obj/item/clothing/gloves/color/fyellow,\
-					prob(3);/obj/item/stack/cable_coil,\
-					prob(2);/obj/random/toolbox,\
-					prob(2);/obj/item/storage/belt/utility,\
-					prob(5);/obj/random/tool,\
-					prob(3);/obj/item/stack/tape_roll)
+
+/obj/random/tech_supply/item_to_spawn()
+	return pick(prob(3);/obj/random/powercell,\
+				prob(2);/obj/random/technology_scanner,\
+				prob(1);/obj/item/stack/packageWrap,\
+				prob(2);/obj/random/bomb_supply,\
+				prob(1);/obj/item/extinguisher,\
+				prob(1);/obj/item/clothing/gloves/color/fyellow,\
+				prob(3);/obj/item/stack/cable_coil,\
+				prob(2);/obj/random/toolbox,\
+				prob(2);/obj/item/storage/belt/utility,\
+				prob(5);/obj/random/tool,\
+				prob(3);/obj/item/stack/tape_roll)

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

@@ -25,9 +25,13 @@
 	..()
 	spawn(1)
 		if(!opened)		// if closed, any item at the crate's loc is put in the contents
+			var/itemcount = 0
 			for(var/obj/item/I in loc)
 				if(I.density || I.anchored || I == src) continue
 				I.forceMove(src)
+				// Ensure the storage cap is respected
+				if(++itemcount >= storage_capacity)
+					break
 
 // Fix for #383 - C4 deleting fridges with corpses
 /obj/structure/closet/Destroy()
@@ -354,6 +358,11 @@
 /obj/structure/closet/AllowDrop()
 	return TRUE
 
+/obj/structure/closet/force_eject_occupant()
+	// Its okay to silently teleport mobs out of lockers, since the only thing affected is their contents list.
+	return
+
+
 /obj/structure/closet/bluespace
 	name = "bluespace closet"
 	desc = "A storage unit that moves and stores through the fourth dimension."

code/game/objects/structures/crates_lockers/closets/secure/scientist.dm

@@ -45,8 +45,6 @@
 	new /obj/item/clothing/suit/storage/labcoat(src)
 	new /obj/item/radio/headset/headset_sci(src)
 	new /obj/item/radio/headset/headset_sci(src)
-	new /obj/item/reagent_containers/food/drinks/oilcan(src)
-	new /obj/item/reagent_containers/food/drinks/oilcan(src)
 
 /obj/structure/closet/secure_closet/RD
 	name = "research director's locker"

code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm

@@ -69,6 +69,11 @@
 /obj/structure/closet/secure_closet/closed_item_click(mob/user)
 	togglelock(user)
 
+/obj/structure/closet/secure_closet/AltClick(mob/user)
+	..()
+	if(Adjacent(user))
+		togglelock(user)
+
 /obj/structure/closet/secure_closet/emag_act(mob/user)
 	if(!broken)
 		broken = TRUE

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

@@ -61,89 +61,89 @@
 	new /obj/item/clothing/mask/gas/syndicate(src)
 	new /obj/item/clothing/suit/space/hardsuit/syndi/elite/sst(src)
 
-/obj/structure/closet/syndicate/resources/
+/obj/structure/closet/syndicate/resources
 	desc = "An old, dusty locker."
 
-	New()
-		..()
-		var/common_min = 30 //Minimum amount of minerals in the stack for common minerals
-		var/common_max = 50 //Maximum amount of HONK in the stack for HONK common minerals
-		var/rare_min = 5  //Minimum HONK of HONK in the stack HONK HONK rare minerals
-		var/rare_max = 20 //Maximum HONK HONK HONK in the HONK for HONK rare HONK
+/obj/structure/closet/syndicate/resources/New()
+	..()
+	var/common_min = 30 //Minimum amount of minerals in the stack for common minerals
+	var/common_max = 50 //Maximum amount of HONK in the stack for HONK common minerals
+	var/rare_min = 5  //Minimum HONK of HONK in the stack HONK HONK rare minerals
+	var/rare_max = 20 //Maximum HONK HONK HONK in the HONK for HONK rare HONK
 
-		var/pickednum = rand(1, 50)
+	var/pickednum = rand(1, 50)
 
-		//Sad trombone
-		if(pickednum == 1)
-			var/obj/item/paper/P = new /obj/item/paper(src)
-			P.name = "IOU"
-			P.info = "Sorry man, we needed the money so we sold your stash. It's ok, we'll double our money for sure this time!"
+	//Sad trombone
+	if(pickednum == 1)
+		var/obj/item/paper/P = new /obj/item/paper(src)
+		P.name = "IOU"
+		P.info = "Sorry man, we needed the money so we sold your stash. It's ok, we'll double our money for sure this time!"
 
-		//Metal (common ore)
-		if(pickednum >= 2)
-			new /obj/item/stack/sheet/metal(src, rand(common_min, common_max))
+	//Metal (common ore)
+	if(pickednum >= 2)
+		new /obj/item/stack/sheet/metal(src, rand(common_min, common_max))
 
-		//Glass (common ore)
-		if(pickednum >= 5)
-			new /obj/item/stack/sheet/glass(src, rand(common_min, common_max))
+	//Glass (common ore)
+	if(pickednum >= 5)
+		new /obj/item/stack/sheet/glass(src, rand(common_min, common_max))
 
-		//Plasteel (common ore) Because it has a million more uses then plasma
-		if(pickednum >= 10)
-			new /obj/item/stack/sheet/plasteel(src, rand(common_min, common_max))
+	//Plasteel (common ore) Because it has a million more uses then plasma
+	if(pickednum >= 10)
+		new /obj/item/stack/sheet/plasteel(src, rand(common_min, common_max))
 
-		//Plasma (rare ore)
-		if(pickednum >= 15)
-			new /obj/item/stack/sheet/mineral/plasma(src, rand(rare_min, rare_max))
+	//Plasma (rare ore)
+	if(pickednum >= 15)
+		new /obj/item/stack/sheet/mineral/plasma(src, rand(rare_min, rare_max))
 
-		//Silver (rare ore)
-		if(pickednum >= 20)
-			new /obj/item/stack/sheet/mineral/silver(src, rand(rare_min, rare_max))
+	//Silver (rare ore)
+	if(pickednum >= 20)
+		new /obj/item/stack/sheet/mineral/silver(src, rand(rare_min, rare_max))
 
-		//Gold (rare ore)
-		if(pickednum >= 30)
-			new /obj/item/stack/sheet/mineral/gold(src, rand(rare_min, rare_max))
+	//Gold (rare ore)
+	if(pickednum >= 30)
+		new /obj/item/stack/sheet/mineral/gold(src, rand(rare_min, rare_max))
 
-		//Uranium (rare ore)
-		if(pickednum >= 40)
-			new /obj/item/stack/sheet/mineral/uranium(src, rand(rare_min, rare_max))
+	//Uranium (rare ore)
+	if(pickednum >= 40)
+		new /obj/item/stack/sheet/mineral/uranium(src, rand(rare_min, rare_max))
 
-		//Titanium (rare ore)
-		if(pickednum >= 40)
-			new /obj/item/stack/sheet/mineral/titanium(src, rand(rare_min, rare_max))
+	//Titanium (rare ore)
+	if(pickednum >= 40)
+		new /obj/item/stack/sheet/mineral/titanium(src, rand(rare_min, rare_max))
 
-		//Plastitanium (rare ore)
-		if(pickednum >= 40)
-			new /obj/item/stack/sheet/mineral/plastitanium(src, rand(rare_min, rare_max))
+	//Plastitanium (rare ore)
+	if(pickednum >= 40)
+		new /obj/item/stack/sheet/mineral/plastitanium(src, rand(rare_min, rare_max))
 
-		//Diamond (rare HONK)
-		if(pickednum >= 45)
-			new /obj/item/stack/sheet/mineral/diamond(src, rand(rare_min, rare_max))
+	//Diamond (rare HONK)
+	if(pickednum >= 45)
+		new /obj/item/stack/sheet/mineral/diamond(src, rand(rare_min, rare_max))
 
-		//Jetpack (You hit the jackpot!)
-		if(pickednum == 50)
-			new /obj/item/tank/jetpack/carbondioxide(src)
+	//Jetpack (You hit the jackpot!)
+	if(pickednum == 50)
+		new /obj/item/tank/jetpack/carbondioxide(src)
 
 /obj/structure/closet/syndicate/resources/everything
 	desc = "It's an emergency storage closet for repairs."
 
-	New()
-		..()
-		var/list/resources = list(
-		/obj/item/stack/sheet/metal,
-		/obj/item/stack/sheet/glass,
-		/obj/item/stack/sheet/mineral/gold,
-		/obj/item/stack/sheet/mineral/silver,
-		/obj/item/stack/sheet/mineral/plasma,
-		/obj/item/stack/sheet/mineral/uranium,
-		/obj/item/stack/sheet/mineral/diamond,
-		/obj/item/stack/sheet/mineral/bananium,
-		/obj/item/stack/sheet/mineral/titanium,
-		/obj/item/stack/sheet/mineral/plastitanium,
-		/obj/item/stack/sheet/plasteel,
-		/obj/item/stack/rods
-		)
+/obj/structure/closet/syndicate/resources/everything/New()
+	..()
+	var/list/resources = list(
+	/obj/item/stack/sheet/metal,
+	/obj/item/stack/sheet/glass,
+	/obj/item/stack/sheet/mineral/gold,
+	/obj/item/stack/sheet/mineral/silver,
+	/obj/item/stack/sheet/mineral/plasma,
+	/obj/item/stack/sheet/mineral/uranium,
+	/obj/item/stack/sheet/mineral/diamond,
+	/obj/item/stack/sheet/mineral/bananium,
+	/obj/item/stack/sheet/mineral/titanium,
+	/obj/item/stack/sheet/mineral/plastitanium,
+	/obj/item/stack/sheet/plasteel,
+	/obj/item/stack/rods
+	)
 
-		for(var/i in 1 to 2)
-			for(var/res in resources)
-				var/obj/item/stack/R = new res(src)
-				R.amount = R.max_amount
+	for(var/i in 1 to 2)
+		for(var/res in resources)
+			var/obj/item/stack/R = new res(src)
+			R.amount = R.max_amount

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

@@ -187,6 +187,7 @@
 	if(user)
 		to_chat(user, "<span class='danger'>The crate's anti-tamper system activates!</span>")
 		investigate_log("[key_name(user)] has detonated a [src]", INVESTIGATE_BOMB)
+		add_attack_logs(user, src, "has detonated", ATKLOG_MOST)
 	for(var/atom/movable/AM in src)
 		qdel(AM)
 	explosion(get_turf(src), 0, 1, 5, 5)
@@ -338,24 +339,23 @@
 	var/target_temp = T0C - 40
 	var/cooling_power = 40
 
-	return_air()
-		var/datum/gas_mixture/gas = (..())
-		if(!gas)	return null
-		var/datum/gas_mixture/newgas = new/datum/gas_mixture()
-		newgas.oxygen = gas.oxygen
-		newgas.carbon_dioxide = gas.carbon_dioxide
-		newgas.nitrogen = gas.nitrogen
-		newgas.toxins = gas.toxins
-		newgas.volume = gas.volume
-		newgas.temperature = gas.temperature
-		if(newgas.temperature <= target_temp)	return
-
-		if((newgas.temperature - cooling_power) > target_temp)
-			newgas.temperature -= cooling_power
-		else
-			newgas.temperature = target_temp
-		return newgas
+/obj/structure/closet/crate/freezer/return_air()
+	var/datum/gas_mixture/gas = (..())
+	if(!gas)	return null
+	var/datum/gas_mixture/newgas = new/datum/gas_mixture()
+	newgas.oxygen = gas.oxygen
+	newgas.carbon_dioxide = gas.carbon_dioxide
+	newgas.nitrogen = gas.nitrogen
+	newgas.toxins = gas.toxins
+	newgas.volume = gas.volume
+	newgas.temperature = gas.temperature
+	if(newgas.temperature <= target_temp)	return
 
+	if((newgas.temperature - cooling_power) > target_temp)
+		newgas.temperature -= cooling_power
+	else
+		newgas.temperature = target_temp
+	return newgas
 
 /obj/structure/closet/crate/can
 	desc = "A large can, looks like a bin to me."
@@ -496,22 +496,23 @@
 /obj/structure/closet/crate/hydroponics/prespawned
 	//This exists so the prespawned hydro crates spawn with their contents.
 
-	New()
-		..()
-		new /obj/item/reagent_containers/glass/bucket(src)
-		new /obj/item/reagent_containers/glass/bucket(src)
-		new /obj/item/screwdriver(src)
-		new /obj/item/screwdriver(src)
-		new /obj/item/wrench(src)
-		new /obj/item/wrench(src)
-		new /obj/item/wirecutters(src)
-		new /obj/item/wirecutters(src)
-		new /obj/item/shovel/spade(src)
-		new /obj/item/shovel/spade(src)
-		new /obj/item/storage/box/beakers(src)
-		new /obj/item/storage/box/beakers(src)
-		new /obj/item/hand_labeler(src)
-		new /obj/item/hand_labeler(src)
+// Do I need the definition above? Who knows!
+/obj/structure/closet/crate/hydroponics/prespawned/New()
+	..()
+	new /obj/item/reagent_containers/glass/bucket(src)
+	new /obj/item/reagent_containers/glass/bucket(src)
+	new /obj/item/screwdriver(src)
+	new /obj/item/screwdriver(src)
+	new /obj/item/wrench(src)
+	new /obj/item/wrench(src)
+	new /obj/item/wirecutters(src)
+	new /obj/item/wirecutters(src)
+	new /obj/item/shovel/spade(src)
+	new /obj/item/shovel/spade(src)
+	new /obj/item/storage/box/beakers(src)
+	new /obj/item/storage/box/beakers(src)
+	new /obj/item/hand_labeler(src)
+	new /obj/item/hand_labeler(src)
 
 /obj/structure/closet/crate/sci
 	name = "science crate"

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

@@ -82,9 +82,8 @@
 	content_mob = /mob/living/simple_animal/pet/dog/fox
 
 /obj/structure/closet/critter/butterfly
-	name = "butterflies crate"
+	name = "butterfly crate"
 	content_mob = /mob/living/simple_animal/butterfly
-	amount = 50
 
 /obj/structure/closet/critter/deer
 	name = "deer crate"

code/game/objects/structures/displaycase.dm

@@ -144,7 +144,7 @@
 		to_chat(user,  "<span class='notice'>You [open ? "close":"open"] [src].</span>")
 		toggle_lock(user)
 
-obj/structure/displaycase/welder_act(mob/user, obj/item/I)
+/obj/structure/displaycase/welder_act(mob/user, obj/item/I)
 	. = TRUE
 	if(default_welder_repair(user, I))
 		broken = FALSE

code/game/objects/structures/dresser.dm

@@ -56,27 +56,20 @@
 
 /obj/structure/dresser/crowbar_act(mob/user, obj/item/I)
 	. = TRUE
-	if(!I.tool_start_check(src, user, 0))
+	if(!I.use_tool(src, user, 0))
 		return
 	TOOL_ATTEMPT_DISMANTLE_MESSAGE
 	if(I.use_tool(src, user, 50, volume = I.tool_volume))
 		TOOL_DISMANTLE_SUCCESS_MESSAGE
-
+		deconstruct(disassembled = TRUE)
 
 /obj/structure/dresser/wrench_act(mob/user, obj/item/I)
 	. = TRUE
-	if(!I.use_tool(src, user, 0, volume = I.tool_volume))
-		return
-	if(anchored)
-		WRENCH_UNANCHOR_MESSAGE
-		anchored = FALSE
-	else
-		if(!isfloorturf(loc))
-			user.visible_message("<span class='warning'>A floor must be present to secure [src]!</span>")
-			return
-		WRENCH_ANCHOR_MESSAGE
-		anchored = TRUE
+	default_unfasten_wrench(user, I, time = 20)
 
-/obj/structure/dresser/deconstruct(disassembled = TRUE)
-	new /obj/item/stack/sheet/wood(drop_location(), 30)
-	qdel(src)
+/obj/structure/dresser/deconstruct(disassembled = FALSE)
+	var/mat_drop = 15
+	if(disassembled)
+		mat_drop = 30
+	new /obj/item/stack/sheet/wood(drop_location(), mat_drop)
+	..()

code/game/objects/structures/extinguisher.dm

@@ -40,7 +40,7 @@
 		return
 	if(!in_range(src, user))
 		return
-	if(!iscarbon(usr))
+	if(!iscarbon(usr) && !isrobot(usr))
 		return
 	playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3)
 	opened = !opened

code/game/objects/structures/girders.dm

@@ -76,14 +76,14 @@
 		if(istype(W,/obj/item/stack/rods))
 			var/obj/item/stack/rods/S = W
 			if(state == GIRDER_DISPLACED)
-				if(S.get_amount() < 2)
-					to_chat(user, "<span class='warning'>You need at least two rods to create a false wall!</span>")
+				if(S.get_amount() < 5)
+					to_chat(user, "<span class='warning'>You need at least five rods to create a false wall!</span>")
 					return
 				to_chat(user, "<span class='notice'>You start building a reinforced false wall...</span>")
 				if(do_after(user, 20, target = src))
-					if(!loc || !S || S.get_amount() < 2)
+					if(!loc || !S || S.get_amount() < 5)
 						return
-					S.use(2)
+					S.use(5)
 					to_chat(user, "<span class='notice'>You create a false wall. Push on it to open or close the passage.</span>")
 					var/obj/structure/falsewall/iron/FW = new (loc)
 					transfer_fingerprints_to(FW)

code/game/objects/structures/lavaland/necropolis_tendril.dm

@@ -15,7 +15,6 @@
 	anchored = TRUE
 	resistance_flags = FIRE_PROOF | LAVA_PROOF
 
-	var/gps = null
 	var/obj/effect/light_emitter/tendril/emitted_light
 
 /obj/structure/spawner/lavaland/goliath
@@ -29,7 +28,6 @@ GLOBAL_LIST_INIT(tendrils, list())
 /obj/structure/spawner/lavaland/Initialize(mapload)
 	. = ..()
 	emitted_light = new(loc)
-	gps = new /obj/item/gps/internal(src)
 	GLOB.tendrils += src
 	return INITIALIZE_HINT_LATELOAD
 
@@ -59,7 +57,6 @@ GLOBAL_LIST_INIT(tendrils, list())
 				SSmedals.SetScore(TENDRIL_CLEAR_SCORE, L.client, 1)
 	GLOB.tendrils -= src
 	QDEL_NULL(emitted_light)
-	QDEL_NULL(gps)
 	return ..()
 
 /obj/effect/light_emitter/tendril

code/game/objects/structures/loom.dm

@@ -11,12 +11,30 @@
 	anchored = TRUE
 
 /obj/structure/loom/attackby(obj/item/I, mob/user)
-	if(default_unfasten_wrench(user, I, 5))
-		return
 	if(weave(I, user))
 		return
 	return ..()
 
+/obj/structure/loom/crowbar_act(mob/user, obj/item/I)
+	. = TRUE
+	if(!I.use_tool(src, user, 0))
+		return
+	TOOL_ATTEMPT_DISMANTLE_MESSAGE
+	if(I.use_tool(src, user, 50, volume = I.tool_volume))
+		TOOL_DISMANTLE_SUCCESS_MESSAGE
+		deconstruct(disassembled = TRUE)
+
+/obj/structure/loom/wrench_act(mob/user, obj/item/I)
+	. = TRUE
+	default_unfasten_wrench(user, I, time = 20)
+
+/obj/structure/loom/deconstruct(disassembled = FALSE)
+	var/mat_drop = 5
+	if(disassembled)
+		mat_drop = 10
+	new /obj/item/stack/sheet/wood(drop_location(), mat_drop)
+	..()
+
 ///Handles the weaving.
 /obj/structure/loom/proc/weave(obj/item/stack/sheet/cotton/W, mob/user)
 	if(!istype(W))

code/game/objects/structures/misc.dm

@@ -11,8 +11,8 @@
 	anchored = 1
 	density = 1
 
-	attack_hand(mob/user as mob)
-		to_chat(user, "Civilians: NT is recruiting! Please head SOUTH to the NT Recruitment office to join the station's crew!")
+/obj/structure/signpost/attack_hand(mob/user as mob)
+	to_chat(user, "Civilians: NT is recruiting! Please head SOUTH to the NT Recruitment office to join the station's crew!")
 
 /obj/structure/ninjatele
 
@@ -23,31 +23,28 @@
 	anchored = 1
 	density = 0
 
-	attack_hand(mob/user as mob)
-
-
-		if(user.mind.special_role=="Ninja")
-			switch(alert("Phase Jaunt relay primed, target locked as [station_name()], initiate VOID-shift translocation? (Warning! Internals required!)",,"Yes","No"))
-
-				if("Yes")
-					if(user.z != src.z)        return
-
-					user.loc.loc.Exited(user)
-					user.loc = pick(GLOB.carplist) // In the future, possibly make specific NinjaTele landmarks, and give him an option to teleport to North/South/East/West of SS13 instead of just hijacking a carpspawn.
-
-
-					playsound(user.loc, 'sound/effects/phasein.ogg', 25, 1)
-					playsound(user.loc, 'sound/effects/sparks2.ogg', 50, 1)
-					new /obj/effect/temp_visual/dir_setting/ninja/phase(get_turf(user), user.dir)
-					to_chat(user, "<span class='boldnotice'>VOID-Shift</span> translocation successful")
-
-				if("No")
-
-					to_chat(user, "<span class='danger'>Process aborted!</span>")
+/obj/structure/ninjatele/attack_hand(mob/user as mob)
+	if(user.mind.special_role=="Ninja")
+		switch(alert("Phase Jaunt relay primed, target locked as [station_name()], initiate VOID-shift translocation? (Warning! Internals required!)",,"Yes","No"))
 
+			if("Yes")
+				if(user.z != src.z)
 					return
-		else
-			to_chat(user, "<span class='danger'>FĆAL �Rr�R</span>: ŧer nt recgnized, c-cntr-r䣧-ç äcked.")
+
+				user.loc.loc.Exited(user)
+				user.loc = pick(GLOB.carplist) // In the future, possibly make specific NinjaTele landmarks, and give him an option to teleport to North/South/East/West of SS13 instead of just hijacking a carpspawn.
+
+				playsound(user.loc, 'sound/effects/phasein.ogg', 25, 1)
+				playsound(user.loc, 'sound/effects/sparks2.ogg', 50, 1)
+				new /obj/effect/temp_visual/dir_setting/ninja/phase(get_turf(user), user.dir)
+				to_chat(user, "<span class='boldnotice'>VOID-Shift</span> translocation successful")
+
+			if("No")
+				to_chat(user, "<span class='danger'>Process aborted!</span>")
+				return
+
+			else
+				to_chat(user, "<span class='danger'>FĆAL �Rr�R</span>: ŧer nt recgnized, c-cntr-r䣧-ç äcked.")
 
 /obj/structure/respawner
 	name = "\improper Long-Distance Cloning Machine"

code/game/objects/structures/musician.dm

@@ -1,341 +0,0 @@
-
-
-/datum/song
-	var/name = "Untitled"
-	var/list/lines = new()
-	var/tempo = 5			// delay between notes
-
-	var/playing = 0			// if we're playing
-	var/help = 0			// if help is open
-	var/repeat = 0			// number of times remaining to repeat
-	var/max_repeat = 10		// maximum times we can repeat
-
-	var/instrumentDir = "piano"		// the folder with the sounds
-	var/instrumentExt = "ogg"		// the file extension
-	var/obj/instrumentObj = null	// the associated obj playing the sound
-
-/datum/song/New(dir, obj, ext = "ogg")
-	tempo = sanitize_tempo(tempo)
-	instrumentDir = dir
-	instrumentObj = obj
-	instrumentExt = ext
-
-/datum/song/Destroy()
-	instrumentObj = null
-	return ..()
-
-// note is a number from 1-7 for A-G
-// acc is either "b", "n", or "#"
-// oct is 1-8 (or 9 for C)
-/datum/song/proc/playnote(note, acc as text, oct)
-	// handle accidental -> B<>C of E<>F
-	if(acc == "b" && (note == 3 || note == 6)) // C or F
-		if(note == 3)
-			oct--
-		note--
-		acc = "n"
-	else if(acc == "#" && (note == 2 || note == 5)) // B or E
-		if(note == 2)
-			oct++
-		note++
-		acc = "n"
-	else if(acc == "#" && (note == 7)) //G#
-		note = 1
-		acc = "b"
-	else if(acc == "#") // mass convert all sharps to flats, octave jump already handled
-		acc = "b"
-		note++
-
-	// check octave, C is allowed to go to 9
-	if(oct < 1 || (note == 3 ? oct > 9 : oct > 8))
-		return
-
-	// now generate name
-	var/soundfile = "sound/instruments/[instrumentDir]/[ascii2text(note+64)][acc][oct].[instrumentExt]"
-	soundfile = file(soundfile)
-	// make sure the note exists
-	if(!fexists(soundfile))
-		return
-	// and play
-	var/turf/source = get_turf(instrumentObj)
-	var/sound/music_played = sound(soundfile)
-	for(var/A in hearers(15, source))
-		var/mob/M = A
-		if(!M.client || !(M.client.prefs.sound & SOUND_INSTRUMENTS))
-			continue
-		M.playsound_local(source, null, 100, falloff = 5, S = music_played)
-
-/datum/song/proc/shouldStopPlaying(mob/user)
-	if(instrumentObj)
-		//if(!user.canUseTopic(instrumentObj))
-			//return 1
-		return !instrumentObj.anchored		// add special cases to stop in subclasses
-	else
-		return 1
-
-/datum/song/proc/playsong(mob/user)
-	while(repeat >= 0)
-		var/cur_oct[7]
-		var/cur_acc[7]
-		for(var/i = 1 to 7)
-			cur_oct[i] = 3
-			cur_acc[i] = "n"
-
-		for(var/line in lines)
-			for(var/beat in splittext(lowertext(line), ","))
-				var/list/notes = splittext(beat, "/")
-				for(var/note in splittext(notes[1], "-"))
-					if(!playing || shouldStopPlaying(user)) //If the instrument is playing, or special case
-						playing = 0
-						return
-					if(length(note) == 0)
-						continue
-					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)
-						if(!text2num(ni))
-							if(ni == "#" || ni == "b" || ni == "n")
-								cur_acc[cur_note] = ni
-							else if(ni == "s")
-								cur_acc[cur_note] = "#" // so shift is never required
-						else
-							cur_oct[cur_note] = text2num(ni)
-					playnote(cur_note, cur_acc[cur_note], cur_oct[cur_note])
-				if(notes.len >= 2 && text2num(notes[2]))
-					sleep(sanitize_tempo(tempo / text2num(notes[2])))
-				else
-					sleep(tempo)
-		repeat--
-	playing = 0
-	repeat = 0
-
-/datum/song/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
-	if(!instrumentObj)
-		return
-
-	ui = SSnanoui.try_update_ui(user, instrumentObj, ui_key, ui, force_open)
-	if(!ui)
-		ui = new(user, instrumentObj, ui_key, "song.tmpl", instrumentObj.name, 700, 500)
-		ui.open()
-		ui.set_auto_update(1)
-
-/datum/song/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
-	var/data[0]
-
-	data["lines"] = lines
-	data["tempo"] = tempo
-
-	data["playing"] = playing
-	data["help"] = help
-	data["repeat"] = repeat
-	data["maxRepeat"] = max_repeat
-	data["minTempo"] = world.tick_lag
-	data["maxTempo"] = 600
-
-	return data
-
-/datum/song/Topic(href, href_list)
-	if(!in_range(instrumentObj, usr) || (issilicon(usr) && instrumentObj.loc != usr) || !isliving(usr) || usr.incapacitated())
-		usr << browse(null, "window=instrument")
-		usr.unset_machine()
-		return 1
-
-	instrumentObj.add_fingerprint(usr)
-
-	if(href_list["newsong"])
-		playing = 0
-		lines = new()
-		tempo = sanitize_tempo(5) // default 120 BPM
-		name = ""
-		SSnanoui.update_uis(src)
-
-	else if(href_list["import"])
-		playing = 0
-		var/t = ""
-		do
-			t = html_encode(input(usr, "Please paste the entire song, formatted:", text("[]", name), t) as message)
-			if(!in_range(instrumentObj, usr))
-				return
-
-			if(length(t) >= 12000)
-				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) > 12000)
-
-		//split into lines
-		spawn()
-			lines = splittext(t, "\n")
-			if(lines.len == 0)
-				return 1
-			if(copytext(lines[1],1,6) == "BPM: ")
-				tempo = sanitize_tempo(600 / text2num(copytext(lines[1],6)))
-				lines.Cut(1,2)
-			else
-				tempo = sanitize_tempo(5) // default 120 BPM
-			if(lines.len > 200)
-				to_chat(usr, "Too many lines!")
-				lines.Cut(201)
-			var/linenum = 1
-			for(var/l in lines)
-				if(length(l) > 200)
-					to_chat(usr, "Line [linenum] too long!")
-					lines.Remove(l)
-				else
-					linenum++
-		SSnanoui.update_uis(src)
-
-	else if(href_list["help"])
-		help = !help
-		SSnanoui.update_uis(src)
-
-	if(href_list["repeat"]) //Changing this from a toggle to a number of repeats to avoid infinite loops.
-		if(playing)
-			return //So that people cant keep adding to repeat. If the do it intentionally, it could result in the server crashing.
-		repeat += round(text2num(href_list["repeat"]))
-		if(repeat < 0)
-			repeat = 0
-		if(repeat > max_repeat)
-			repeat = max_repeat
-		SSnanoui.update_uis(src)
-
-	else if(href_list["tempo"])
-		tempo = sanitize_tempo(tempo + text2num(href_list["tempo"]) * world.tick_lag)
-		SSnanoui.update_uis(src)
-
-	else if(href_list["play"])
-		if(playing)
-			return
-		playing = 1
-		spawn()
-			playsong(usr)
-		SSnanoui.update_uis(src)
-
-	else if(href_list["insertline"])
-		var/num = round(text2num(href_list["insertline"]))
-		if(num < 1 || num > lines.len + 1)
-			return
-
-		var/newline = html_encode(input("Enter your line: ", instrumentObj.name) as text|null)
-		if(!newline || !in_range(instrumentObj, usr))
-			return
-		if(lines.len > 200)
-			return
-		if(length(newline) > 200)
-			newline = copytext(newline, 1, 200)
-
-		lines.Insert(num, newline)
-		SSnanoui.update_uis(src)
-
-	else if(href_list["deleteline"])
-		var/num = round(text2num(href_list["deleteline"]))
-		if(num > lines.len || num < 1)
-			return
-		lines.Cut(num, num + 1)
-		SSnanoui.update_uis(src)
-
-	else if(href_list["modifyline"])
-		var/num = round(text2num(href_list["modifyline"]))
-		var/content = html_encode(input("Enter your line: ", instrumentObj.name, lines[num]) as text|null)
-		if(!content || !in_range(instrumentObj, usr))
-			return
-		if(length(content) > 200)
-			content = copytext(content, 1, 200)
-		if(num > lines.len || num < 1)
-			return
-		lines[num] = content
-		SSnanoui.update_uis(src)
-
-	else if(href_list["stop"])
-		playing = 0
-		SSnanoui.update_uis(src)
-
-/datum/song/proc/sanitize_tempo(new_tempo)
-	new_tempo = abs(new_tempo)
-	return max(round(new_tempo, world.tick_lag), world.tick_lag)
-
-// subclass for handheld instruments, like violin
-/datum/song/handheld
-
-/datum/song/handheld/shouldStopPlaying()
-	if(instrumentObj)
-		return !isliving(instrumentObj.loc)
-	else
-		return 1
-
-
-//////////////////////////////////////////////////////////////////////////
-
-
-/obj/structure/piano
-	name = "space minimoog"
-	icon = 'icons/obj/musician.dmi'
-	icon_state = "minimoog"
-	anchored = 1
-	density = 1
-	var/datum/song/song
-
-
-/obj/structure/piano/New()
-	..()
-	song = new("piano", src)
-
-	if(prob(50))
-		name = "space minimoog"
-		desc = "This is a minimoog, like a space piano, but more spacey!"
-		icon_state = "minimoog"
-	else
-		name = "space piano"
-		desc = "This is a space piano, like a regular piano, but always in tune! Even if the musician isn't."
-		icon_state = "piano"
-
-/obj/structure/piano/Destroy()
-	QDEL_NULL(song)
-	return ..()
-
-/obj/structure/piano/Initialize()
-	if(song)
-		song.tempo = song.sanitize_tempo(song.tempo) // tick_lag isn't set when the map is loaded
-	..()
-
-/obj/structure/piano/attack_hand(mob/user as mob)
-	ui_interact(user)
-
-/obj/structure/piano/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
-	if(!isliving(user) || user.incapacitated() || !anchored)
-		return
-
-	song.ui_interact(user, ui_key, ui, force_open)
-
-/obj/structure/piano/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
-	return song.ui_data(user, ui_key, state)
-
-/obj/structure/piano/Topic(href, href_list)
-	song.Topic(href, href_list)
-
-/obj/structure/piano/wrench_act(mob/user, obj/item/I)
-	. = TRUE
-	if(!I.tool_use_check(user, 0))
-		return
-	if(!anchored && !isinspace())
-		WRENCH_ANCHOR_MESSAGE
-		if(!I.use_tool(src, user, 20, volume = I.tool_volume))
-			return
-		user.visible_message( \
-			"[user] tightens [src]'s casters.", \
-			"<span class='notice'> You have tightened [src]'s casters. Now it can be played again.</span>", \
-			"You hear ratchet.")
-		anchored = TRUE
-	else if(anchored)
-		to_chat(user, "<span class='notice'> You begin to loosen [src]'s casters...</span>")
-		if(!I.use_tool(src, user, 40, volume = I.tool_volume))
-			return
-		user.visible_message( \
-			"[user] loosens [src]'s casters.", \
-			"<span class='notice'> You have loosened [src]. Now it can be pulled somewhere else.</span>", \
-			"You hear ratchet.")
-		anchored = FALSE
-	else
-		to_chat(user, "<span class='warning'>[src] needs to be bolted to the floor!</span>")

code/game/objects/structures/signs.dm

@@ -292,12 +292,12 @@
 
 /obj/structure/sign/directions/engineering
 	name = "\improper Engineering Department"
-	desc = "A direction sign, pointing out which way the Engineering department is."
+	desc = "A direction sign, pointing out which way the Engineering Department is."
 	icon_state = "direction_eng"
 
 /obj/structure/sign/directions/security
 	name = "\improper Security Department"
-	desc = "A direction sign, pointing out which way the Security department is."
+	desc = "A direction sign, pointing out which way the Security Department is."
 	icon_state = "direction_sec"
 
 /obj/structure/sign/directions/medical
@@ -307,12 +307,12 @@
 
 /obj/structure/sign/directions/evac
 	name = "\improper Escape Arm"
-	desc = "A direction sign, pointing out which way escape shuttle dock is."
+	desc = "A direction sign, pointing out which way Escape Shuttle Dock is."
 	icon_state = "direction_evac"
 
 /obj/structure/sign/directions/cargo
 	name = "\improper Cargo Department"
-	desc = "A direction sign, pointing out which way the Cargo department is."
+	desc = "A direction sign, pointing out which way the Cargo Department is."
 	icon_state = "direction_supply"
 
 /obj/structure/sign/explosives

code/game/objects/structures/transit_tubes/transit_tube.dm

@@ -26,7 +26,7 @@
 	return !density
 
 // When destroyed by explosions, properly handle contents.
-obj/structure/transit_tube/ex_act(severity)
+/obj/structure/transit_tube/ex_act(severity)
 	switch(severity)
 		if(1.0)
 			for(var/atom/movable/AM in contents)

code/game/objects/structures/windoor_assembly.dm

@@ -31,14 +31,14 @@
 	. = ..()
 	. += "<span class='notice'>Alt-click to rotate it clockwise.</span>"
 
-obj/structure/windoor_assembly/New(loc, set_dir)
+/obj/structure/windoor_assembly/New(loc, set_dir)
 	..()
 	if(set_dir)
 		dir = set_dir
 	ini_dir = dir
 	air_update_turf(1)
 
-obj/structure/windoor_assembly/Destroy()
+/obj/structure/windoor_assembly/Destroy()
 	density = FALSE
 	QDEL_NULL(electronics)
 	air_update_turf(1)

code/game/objects/structures/window.dm

@@ -666,7 +666,7 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e",
 	icon_state = "tinted_window"
 	opacity = 1
 
-obj/structure/window/full/reinforced/ice
+/obj/structure/window/full/reinforced/ice
 	icon = 'icons/obj/smooth_structures/rice_window.dmi'
 	icon_state = "ice_window"
 	max_integrity = 150