Merge remote-tracking branch 'upstream/master' into bombing-logging-and-co

code/game/objects/buckling.dm

@@ -11,7 +11,7 @@
 /atom/movable/attack_hand(mob/living/user)
 	. = ..()
 	if(can_buckle && has_buckled_mobs())
-		if(buckled_mobs.len > 1)
+		if(length(buckled_mobs) > 1)
 			var/unbuckled = input(user, "Who do you wish to unbuckle?", "Unbuckle Who?") as null|mob in buckled_mobs
 			if(user_unbuckle_mob(unbuckled,user))
 				return TRUE
@@ -26,15 +26,12 @@
 			return TRUE
 
 /atom/movable/proc/has_buckled_mobs()
-	if(!buckled_mobs)
-		return FALSE
-	if(buckled_mobs.len)
-		return TRUE
+	return length(buckled_mobs)
 
 /atom/movable/attack_robot(mob/living/user)
 	. = ..()
 	if(can_buckle && has_buckled_mobs() && Adjacent(user)) // attack_robot is called on all ranges, so the Adjacent check is needed
-		if(buckled_mobs.len > 1)
+		if(length(buckled_mobs) > 1)
 			var/unbuckled = input(user, "Who do you wish to unbuckle?", "Unbuckle Who?") as null|mob in buckled_mobs
 			if(user_unbuckle_mob(unbuckled,user))
 				return TRUE
@@ -54,7 +51,7 @@
 	if(check_loc && M.loc != loc)
 		return FALSE
 
-	if((!can_buckle && !force) || M.buckled || (buckled_mobs.len >= max_buckled_mobs) || (buckle_requires_restraints && !M.restrained()) || M == src)
+	if((!can_buckle && !force) || M.buckled || (length(buckled_mobs) >= max_buckled_mobs) || (buckle_requires_restraints && !M.restrained()) || M == src)
 		return FALSE
 	M.buckling = src
 	if(!M.can_buckle() && !force)
@@ -69,6 +66,9 @@
 		if(buckle_prevents_pull)
 			M.pulledby.stop_pulling()
 
+	for(var/obj/item/grab/G in M.grabbed_by)
+		qdel(G)
+
 	if(!check_loc && M.loc != loc)
 		M.forceMove(loc)
 

code/game/objects/effects/decals/remains.dm

@@ -28,6 +28,12 @@
 	icon_state = "remainsrobot"
 	anchored = TRUE
 
+/obj/effect/decal/remains/robot/decompile_act(obj/item/matter_decompiler/C, mob/user)
+	C.stored_comms["glass"] += 2
+	C.stored_comms["metal"] += 3
+	qdel(src)
+	return TRUE
+
 /obj/effect/decal/remains/slime
 	name = "You shouldn't see this"
 	desc = "Noooooooooooooooooooooo"

code/game/objects/effects/effect_system.dm

@@ -1134,7 +1134,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
 		qdel(src)
 
 /obj/structure/foamedmetal/attack_alien(mob/living/carbon/alien/humanoid/M)
-	M.visible_message("<span class='danger'>[M] tears apart \the [src]!</span>");
+	M.visible_message("<span class='danger'>[M] tears apart \the [src]!</span>")
 	qdel(src)
 
 /obj/structure/foamedmetal/CanPass(atom/movable/mover, turf/target, height=1.5)

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

@@ -49,6 +49,8 @@ would spawn and follow the beaker, even if it is carried or thrown.
 	holder = atom
 
 /datum/effect_system/proc/start()
+	if(QDELETED(src))
+		return
 	for(var/i in 1 to number)
 		if(total_effects > 20)
 			return
@@ -68,7 +70,8 @@ would spawn and follow the beaker, even if it is carried or thrown.
 	for(var/j in 1 to steps_amt)
 		sleep(5)
 		step(E,direction)
-	addtimer(CALLBACK(src, .proc/decrement_total_effect), 20)
+	if(!QDELETED(src))
+		addtimer(CALLBACK(src, .proc/decrement_total_effect), 20)
 
 /datum/effect_system/proc/decrement_total_effect()
 	total_effects--

code/game/objects/effects/manifest.dm

@@ -10,7 +10,8 @@
 
 /obj/effect/manifest/proc/manifest()
 	var/dat = "<B>Crew Manifest</B>:<BR>"
-	for(var/mob/living/carbon/human/M in GLOB.mob_list)
+	for(var/thing in GLOB.human_list)
+		var/mob/living/carbon/human/M = thing
 		dat += text("    <B>[]</B> -  []<BR>", M.name, M.get_assignment())
 	var/obj/item/paper/P = new /obj/item/paper( src.loc )
 	P.info = dat

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

@@ -7,6 +7,7 @@
 	var/list/loot			//a list of possible items to spawn e.g. list(/obj/item, /obj/structure, /obj/effect)
 
 /obj/effect/spawner/lootdrop/New()
+	..()
 	if(loot && loot.len)
 		for(var/i = lootcount, i > 0, i--)
 			if(!loot.len) break
@@ -15,7 +16,7 @@
 				loot.Remove(lootspawn)
 
 			if(lootspawn)
-				new lootspawn(get_turf(src))
+				new lootspawn(loc)
 	qdel(src)
 
 /obj/effect/spawner/lootdrop/armory_contraband

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

@@ -21,6 +21,7 @@
 			if(i == lowBoundX || i == hiBoundX || j == lowBoundY || j == hiBoundY)
 				new /turf/simulated/wall/vault(locate(i,j,z),type)
 			else
-				new /turf/simulated/floor/vault(locate(i,j,z),type)
+				var/turf/T = new /turf/simulated/floor/vault(locate(i, j, z))
+				T.icon_state = "[type]vault"
 
 	qdel(src)

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()
@@ -98,6 +98,7 @@
 	pixel_x = rand(6,-6)
 	pixel_y = rand(6,-6)
 	START_PROCESSING(SSobj, src)
+	AddComponent(/datum/component/swarming)
 
 /obj/structure/spider/spiderling/Destroy()
 	STOP_PROCESSING(SSobj, src)
@@ -179,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)
@@ -189,6 +190,16 @@
 								to_chat(S, "<span class='biggerdanger'>You are a spider who is loyal to [S.master_commander], obey [S.master_commander]'s every order and assist [S.master_commander.p_them()] in completing [S.master_commander.p_their()] goals at any cost.</span>")
 			qdel(src)
 
+/obj/structure/spider/spiderling/decompile_act(obj/item/matter_decompiler/C, mob/user)
+	if(!istype(user, /mob/living/silicon/robot/drone))
+		user.visible_message("<span class='notice'>[user] sucks [src] into its decompiler. There's a horrible crunching noise.</span>", \
+		"<span class='warning'>It's a bit of a struggle, but you manage to suck [user] into your decompiler. It makes a series of visceral crunching noises.</span>")
+		C.stored_comms["wood"] += 2
+		C.stored_comms["glass"] += 2
+		qdel(src)
+		return TRUE
+	return ..()
+
 /obj/effect/decal/cleanable/spiderling_remains
 	name = "spiderling remains"
 	desc = "Green squishy mess."

code/game/objects/effects/step_triggers.dm

@@ -51,7 +51,7 @@
 	var/list/affecting = list()
 
 /obj/effect/step_trigger/thrower/Trigger(atom/A)
-	if(!A || !ismovableatom(A))
+	if(!A || !ismovable(A))
 		return
 	var/atom/movable/AM = A
 	var/curtiles = 0

code/game/objects/explosion.dm

@@ -88,7 +88,7 @@
 			var/turf/T = A
 			if(!T)
 				continue
-			var/dist = hypotenuse(T.x, T.y, x0, y0)
+			var/dist = HYPOTENUSE(T.x, T.y, x0, y0)
 
 			if(config.reactionary_explosions)
 				var/turf/Trajectory = T
@@ -209,7 +209,7 @@
 	var/list/wipe_colours = list()
 	for(var/turf/T in spiral_range_turfs(max_range, epicenter))
 		wipe_colours += T
-		var/dist = hypotenuse(T.x, T.y, x0, y0)
+		var/dist = HYPOTENUSE(T.x, T.y, x0, y0)
 
 		if(newmode == "Yes")
 			var/turf/TT = T

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
@@ -19,6 +21,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect
 	can_be_hit = FALSE
 	suicidal_hands = TRUE
 
+	var/list/attack_verb //Used in attackby() to say how something was attacked "[x] has been [z.attack_verb] by [y] with [z]"
 	var/hitsound = null
 	var/usesound = null
 	var/throwhitsound
@@ -98,15 +101,6 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect
 	var/icon_override = null  //Used to override hardcoded clothing dmis in human clothing proc.
 	var/sprite_sheets_obj = null //Used to override hardcoded clothing inventory object dmis in human clothing proc.
 
-	var/trip_verb = TV_TRIP
-	var/trip_chance = 0
-
-	var/trip_stun = 0
-	var/trip_weaken = 0
-	var/trip_any = FALSE
-	var/trip_walksafe = TRUE
-	var/trip_tiles = 0
-
 	//Tooltip vars
 	var/in_inventory = FALSE //is this item equipped into an inventory slot or hand of a mob?
 	var/tip_timer = 0
@@ -121,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
@@ -133,10 +144,10 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect
 	return ..()
 
 /obj/item/proc/check_allowed_items(atom/target, not_inside, target_self)
-	if(((src in target) && !target_self) || ((!istype(target.loc, /turf)) && (!istype(target, /turf)) && (not_inside)))
-		return 0
+	if(((src in target) && !target_self) || (!isturf(target.loc) && !isturf(target) && not_inside))
+		return FALSE
 	else
-		return 1
+		return TRUE
 
 /obj/item/blob_act(obj/structure/blob/B)
 	if(B && B.loc == loc)
@@ -514,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)
@@ -606,16 +617,6 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect
 /obj/item/proc/is_equivalent(obj/item/I)
 	return I == src
 
-/obj/item/Crossed(atom/movable/AM, oldloc)
-	. = ..()
-	if(prob(trip_chance) && ishuman(AM))
-		var/mob/living/carbon/human/H = AM
-		on_trip(H)
-
-/obj/item/proc/on_trip(mob/living/carbon/human/H)
-	if(H.slip(src, trip_stun, trip_weaken, trip_tiles, trip_walksafe, trip_any, trip_verb))
-		return TRUE
-
 /obj/item/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum)
 	return
 

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/contraband.dm

@@ -56,7 +56,7 @@
 	desc = "Huh."
 	allow_wrap = FALSE
 
-/obj/item/storage/pill_bottle/random_drug_bottle/New()
-	..()
+/obj/item/storage/pill_bottle/random_drug_bottle/Initialize(mapload)
+	. = ..()
 	for(var/i in 1 to 5)
 		new /obj/item/reagent_containers/food/pill/random_drugs(src)

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/airlock_painter.dm

@@ -0,0 +1,81 @@
+// Airlock painter
+
+/obj/item/airlock_painter
+	name = "airlock painter"
+	desc = "An advanced autopainter preprogrammed with several paintjobs for airlocks. Use it on a completed airlock to change its paintjob."
+	icon = 'icons/obj/device.dmi'
+	icon_state = "airlock_painter"
+	item_state = "airlock_painter"
+	flags = CONDUCT | NOBLUDGEON
+	usesound = 'sound/effects/spray2.ogg'
+	w_class = WEIGHT_CLASS_SMALL
+	slot_flags = SLOT_BELT
+	materials = list(MAT_METAL = 3000, MAT_GLASS = 1000)
+	var/paint_setting
+
+	// All the different paint jobs that an airlock painter can apply.
+	// If the airlock you're using it on is glass, the new paint job will also be glass
+	var/list/available_paint_jobs = list(
+		"Atmospherics" = /obj/machinery/door/airlock/atmos,
+		"Command" = /obj/machinery/door/airlock/command,
+		"Engineering" = /obj/machinery/door/airlock/engineering,
+		"External" = /obj/machinery/door/airlock/external,
+		"External Maintenance"= /obj/machinery/door/airlock/maintenance/external,
+		"Freezer" = /obj/machinery/door/airlock/freezer,
+		"Maintenance" = /obj/machinery/door/airlock/maintenance,
+		"Medical" = /obj/machinery/door/airlock/medical,
+		"Mining" = /obj/machinery/door/airlock/mining,
+		"Public" = /obj/machinery/door/airlock/public,
+		"Research" = /obj/machinery/door/airlock/research,
+		"Science" = /obj/machinery/door/airlock/science,
+		"Security" = /obj/machinery/door/airlock/security,
+		"Standard" = /obj/machinery/door/airlock,
+	)
+
+//Only call this if you are certain that the painter will be used right after this check!
+/obj/item/airlock_painter/proc/paint(mob/user)
+	playsound(loc, usesound, 30, TRUE)
+	return TRUE
+
+/obj/item/airlock_painter/attack_self(mob/user)
+	paint_setting = input(user, "Please select a paintjob for this airlock.") as null|anything in available_paint_jobs
+	if(!paint_setting)
+		return
+	to_chat(user, "<span class='notice'>The [paint_setting] paint setting has been selected.</span>")
+
+/obj/item/airlock_painter/suicide_act(mob/user)
+
+	var/obj/item/organ/internal/lungs/L = user.get_organ_slot("lungs")
+	var/lungs_name = "\improper[L.name]"
+
+	if(L)
+		user.visible_message("<span class='suicide'>[user] is inhaling toner from [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
+		// Once you've inhaled the toner, you throw up your lungs
+		// and then die.
+
+		// they managed to lose their lungs between then and now. Good job.
+		if(!L)
+			return FALSE
+
+		L.remove(user)
+
+		// make some colorful reagent, and apply it to the lungs
+		L.create_reagents(10)
+		L.reagents.add_reagent("colorful_reagent", 10)
+		L.reagents.reaction(L, REAGENT_TOUCH, 1)
+
+		user.emote("scream")
+		user.visible_message("<span class='suicide'>[user] vomits out [user.p_their()] [lungs_name]!</span>")
+		playsound(user.loc, 'sound/effects/splat.ogg', 50, TRUE)
+
+		// make some vomit under the player, and apply colorful reagent
+		var/obj/effect/decal/cleanable/vomit/V = new(get_turf(user))
+		V.create_reagents(10)
+		V.reagents.add_reagent("colorful_reagent", 10)
+		V.reagents.reaction(V, REAGENT_TOUCH, 1)
+
+		L.forceMove(get_turf(user))
+
+		return OXYLOSS
+	else
+		return SHAME

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

@@ -241,6 +241,7 @@
 	user.base_icon = disguise
 	user.icon_state = disguise
 	user.cham_proj = src
+	user.bubble_icon = "robot"
 	active = TRUE
 	user.update_icons()
 
@@ -249,6 +250,7 @@
 	S = user
 	user.base_icon = initial(user.base_icon)
 	user.icon_state = initial(user.icon_state)
+	user.bubble_icon = "syndibot"
 	active = FALSE
 	user.update_icons()
 

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

@@ -113,7 +113,6 @@
 /obj/item/flash/attack(mob/living/M, mob/user)
 	if(!try_use_flash(user))
 		return 0
-
 	if(iscarbon(M))
 		flash_carbon(M, user, 5, 1)
 		if(overcharged)
@@ -121,22 +120,12 @@
 			M.IgniteMob()
 			burn_out()
 		return 1
-
 	else if(issilicon(M))
-		if(isrobot(M))
-			var/mob/living/silicon/robot/R = M
-			if(R.module) // Perhaps they didn't choose a module yet
-				for(var/obj/item/borg/combat/shield/S in R.module.modules)
-					if(R.activated(S))
-						add_attack_logs(user, M, "Flashed with [src]")
-						user.visible_message("<span class='disarm'>[user] tries to overloads [M]'s sensors with the [src.name], but is blocked by [M]'s shield!</span>", "<span class='danger'>You try to overload [M]'s sensors with the [src.name], but are blocked by [M.p_their()] shield!</span>")
-						return 1
 		add_attack_logs(user, M, "Flashed with [src]")
 		if(M.flash_eyes(affect_silicon = 1))
 			M.Weaken(rand(5,10))
 			user.visible_message("<span class='disarm'>[user] overloads [M]'s sensors with the [src.name]!</span>", "<span class='danger'>You overload [M]'s sensors with the [src.name]!</span>")
 		return 1
-
 	user.visible_message("<span class='disarm'>[user] fails to blind [M] with the [src.name]!</span>", "<span class='warning'>You fail to blind [M] with the [src.name]!</span>")
 
 

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

@@ -167,7 +167,7 @@
 
 // Negative numbers will subtract
 /obj/item/lightreplacer/proc/AddUses(amount = 1)
-	uses = Clamp(uses + amount, 0, max_uses)
+	uses = clamp(uses + amount, 0, max_uses)
 
 /obj/item/lightreplacer/proc/AddShards(amount = 1, user)
 	bulb_shards += amount
@@ -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/megaphone.dm

@@ -33,8 +33,6 @@
 		if(H && H.mind && H.mind.miming)
 			to_chat(user, "<span class='warning'>Your vow of silence prevents you from speaking.</span>")
 			return
-		if(H.mind)
-			span = H.mind.speech_span
 		if((COMIC in H.mutations) || H.get_int_organ(/obj/item/organ/internal/cyberimp/brain/clown_voice))
 			span = "sans"
 	if(spamcheck)

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/pizza_bomb.dm

@@ -27,7 +27,7 @@
 			desc = "A box suited for pizzas."
 			icon_state = "pizzabox1"
 			return
-		timer = Clamp(timer, 10, 100)
+		timer = clamp(timer, 10, 100)
 		icon_state = "pizzabox1"
 		to_chat(user, "<span class='notice'>You set the timer to [timer / 10] before activating the payload and closing \the [src].")
 		message_admins("[key_name_admin(usr)] has set a timer on a pizza bomb to [timer/10] seconds at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[loc.x];Y=[loc.y];Z=[loc.z]'>(JMP)</a>.")
@@ -52,7 +52,7 @@
 	if(disarmed)
 		visible_message("<span class='danger'>[bicon(src)] Sparks briefly jump out of the [correct_wire] wire on \the [src], but it's disarmed!")
 		return
-	src.audible_message("[bicon(src)] <b>[src]</b> beeps, \"Enjoy the pizza!\"")
+	atom_say("Enjoy the pizza!")
 	src.visible_message("<span class='userdanger'>\The [src] violently explodes!</span>")
 	explosion(src.loc,1,2,4,flame_range = 2) //Identical to a minibomb
 	qdel(src)

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

@@ -46,16 +46,15 @@
 	name = "station intercom (Security)"
 	frequency = SEC_I_FREQ
 
-/obj/item/radio/intercom/New(turf/loc, ndir, building = 3)
-	..()
+/obj/item/radio/intercom/New(turf/loc, direction, building = 3)
+	. = ..()
 	buildstage = building
 	if(buildstage)
 		START_PROCESSING(SSobj, src)
 	else
-		if(ndir)
-			pixel_x = (ndir & EAST|WEST) ? (ndir == EAST ? 28 : -28) : 0
-			pixel_y = (ndir & NORTH|SOUTH) ? (ndir == NORTH ? 28 : -28) : 0
-			dir=ndir
+		if(direction)
+			setDir(direction)
+			set_pixel_offsets_from_dir(28, -28, 28, -28)
 		b_stat=1
 		on = 0
 	GLOB.global_intercoms.Add(src)
@@ -76,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()
@@ -86,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()
 	..()
@@ -110,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)
@@ -187,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))
@@ -204,7 +201,7 @@
 	STOP_PROCESSING(SSobj, src)
 
 /obj/item/radio/intercom/welder_act(mob/user, obj/item/I)
-	if(!buildstage)
+	if(buildstage != 0)
 		return
 	. = TRUE
 	if(!I.tool_use_check(user, 3))
@@ -271,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
@@ -272,7 +282,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 	tcm.sender_job = "Automated Announcement"
 	tcm.vname = "synthesized voice"
 	tcm.data = SIGNALTYPE_AINOTRACK
-	// Datum radios dont have a location (obviously
+	// Datum radios dont have a location (obviously)
 	if(loc && loc.z)
 		tcm.source_level = loc.z // For anyone that reads this: This used to pull from a LIST from the CONFIG DATUM. WHYYYYYYYYY!!!!!!!! -aa
 	else
@@ -295,7 +305,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 	universal_speak = 1
 
 /mob/living/automatedannouncer/New()
-	lifetime_timer = addtimer(CALLBACK(src, .proc/autocleanup), SecondsToTicks(10), TIMER_STOPPABLE)
+	lifetime_timer = addtimer(CALLBACK(src, .proc/autocleanup), 10 SECONDS, TIMER_STOPPABLE)
 	..()
 
 /mob/living/automatedannouncer/Destroy()
@@ -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,10 @@ 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
 
 /obj/item/radio/borg/attackby(obj/item/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/encryptionkey/))
@@ -663,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
 
@@ -696,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))
@@ -141,7 +141,7 @@ REAGENT SCANNER
 
 // Used by the PDA medical scanner too
 /proc/healthscan(mob/user, mob/living/M, mode = 1, advanced = FALSE)
-	if(!ishuman(M) || M.isSynthetic())
+	if(!ishuman(M) || ismachineperson(M))
 		//these sensors are designed for organic life
 		to_chat(user, "<span class='notice'>Analyzing Results for ERROR:\n\t Overall Status: ERROR</span>")
 		to_chat(user, "\t Key: <font color='blue'>Suffocation</font>/<font color='green'>Toxin</font>/<font color='#FFA500'>Burns</font>/<font color='red'>Brute</font>")

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

@@ -6,7 +6,7 @@
 	w_class = WEIGHT_CLASS_SMALL
 	slot_flags = SLOT_BELT
 	origin_tech = "programming=3;materials=3;magnets=3"
-	var/datum/nano_module/crew_monitor/crew_monitor
+	var/datum/tgui_module/crew_monitor/crew_monitor
 
 /obj/item/sensor_device/New()
 	..()
@@ -17,7 +17,7 @@
 	return ..()
 
 /obj/item/sensor_device/attack_self(mob/user as mob)
-	ui_interact(user)
+	tgui_interact(user)
 
-/obj/item/sensor_device/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
-	crew_monitor.ui_interact(user, ui_key, ui, force_open)
+/obj/item/sensor_device/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+	crew_monitor.tgui_interact(user, ui_key, ui, force_open)

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

@@ -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(usr)
-	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)

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

@@ -131,7 +131,6 @@ GLOBAL_LIST_EMPTY(world_uplinks)
 	else
 		var/datum/uplink_item/UI = ItemsReference[href_list["buy_item"]]
 		return buy(UI, UI ? UI.reference : "")
-	return 0
 
 /obj/item/uplink/proc/buy(var/datum/uplink_item/UI, var/reference)
 	if(!UI)

code/game/objects/items/flag.dm

@@ -251,6 +251,7 @@
 		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/mixing_bowl.dm

@@ -118,7 +118,7 @@
 /obj/item/mixing_bowl/Topic(href, href_list)
 	if(..())
 		return
-	if("dispose")
+	if(href_list["dispose"])
 		dispose()
 	return
 

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

@@ -6,5 +6,5 @@
 	mount_reqs = list("simfloor", "nospace")
 
 /obj/item/mounted/frame/firealarm/do_build(turf/on_wall, mob/user)
-	new /obj/machinery/firealarm(get_turf(src), get_dir(on_wall, user), 1)
+	new /obj/machinery/firealarm(get_turf(src), get_dir(user, on_wall), 1)
 	qdel(src)

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_parts.dm

@@ -253,7 +253,16 @@
 				to_chat(user, "<span class='warning'>This [W] does not seem to fit.</span>")
 				return
 
-			var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(loc), unfinished = 1)
+			var/datum/ai_laws/laws_to_give
+			if(M.syndiemmi)
+				aisync = FALSE
+				lawsync = FALSE
+				laws_to_give = new /datum/ai_laws/syndicate_override
+
+			if(!aisync)
+				lawsync = FALSE
+
+			var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(loc), unfinished = 1, ai_to_sync_to = forced_ai)
 			if(!O)
 				return
 
@@ -263,24 +272,15 @@
 			if(istype(task))
 				task.unit_completed()
 
-			if(M.syndiemmi)
-				aisync = 0
-				lawsync = 0
-				O.laws = new /datum/ai_laws/syndicate_override
-
 			O.invisibility = 0
 			//Transfer debug settings to new mob
 			O.custom_name = created_name
 			O.rename_character(O.real_name, O.get_default_name())
 			O.locked = panel_locked
-			if(!aisync)
-				lawsync = 0
-				O.connected_ai = null
-			else
-				O.notify_ai(1)
-				if(forced_ai)
-					O.connected_ai = forced_ai
-			if(!lawsync && !M.syndiemmi)
+
+			if(laws_to_give)
+				O.laws = laws_to_give
+			else if(!lawsync)
 				O.lawupdate = 0
 				O.make_laws()
 

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

@@ -9,23 +9,23 @@
 	origin_tech = "programming=2"
 	var/locked = 0
 	var/installed = 0
-	var/require_module = 0
+	var/require_module = FALSE
 	var/module_type = null
 
 /obj/item/borg/upgrade/proc/action(mob/living/silicon/robot/R)
 	if(R.stat == DEAD)
 		to_chat(usr, "<span class='notice'>[src] will not function on a deceased cyborg.</span>")
-		return 1
+		return TRUE
 	if(module_type && !istype(R.module, module_type))
 		to_chat(R, "Upgrade mounting error!  No suitable hardpoint detected!")
 		to_chat(usr, "There's no mounting point for the module!")
-		return 1
+		return TRUE
 
 /obj/item/borg/upgrade/reset
 	name = "cyborg module reset board"
 	desc = "Used to reset a cyborg's module. Destroys any other upgrades applied to the cyborg."
 	icon_state = "cyborg_upgrade1"
-	require_module = 1
+	require_module = TRUE
 
 /obj/item/borg/upgrade/reset/action(mob/living/silicon/robot/R)
 	if(..())
@@ -48,14 +48,14 @@
 	if(..())
 		return
 	if(!R.allow_rename)
-		to_chat(R, "<span class='warning'>Internal diagnostic error: incompatible upgrade module detected.</span>");
+		to_chat(R, "<span class='warning'>Internal diagnostic error: incompatible upgrade module detected.</span>")
 		return 0
 	R.notify_ai(3, R.name, heldname)
 	R.name = heldname
 	R.custom_name = heldname
 	R.real_name = heldname
 
-	return 1
+	return TRUE
 
 /obj/item/borg/upgrade/restart
 	name = "cyborg emergency reboot module"
@@ -77,14 +77,14 @@
 	GLOB.alive_mob_list += R
 	R.notify_ai(1)
 
-	return 1
+	return TRUE
 
 
 /obj/item/borg/upgrade/vtec
 	name = "robotic VTEC Module"
 	desc = "Used to kick in a robot's VTEC systems, increasing their speed."
 	icon_state = "cyborg_upgrade2"
-	require_module = 1
+	require_module = TRUE
 	origin_tech = "engineering=4;materials=5;programming=4"
 
 /obj/item/borg/upgrade/vtec/action(var/mob/living/silicon/robot/R)
@@ -97,14 +97,14 @@
 
 	R.speed = -1 // Gotta go fast.
 
-	return 1
+	return TRUE
 
 /obj/item/borg/upgrade/disablercooler
 	name = "cyborg rapid disabler cooling module"
 	desc = "Used to cool a mounted disabler, increasing the potential current in it and thus its recharge rate."
 	icon_state = "cyborg_upgrade3"
 	origin_tech = "engineering=4;powerstorage=4;combat=4"
-	require_module = 1
+	require_module = TRUE
 	module_type = /obj/item/robot_module/security
 
 /obj/item/borg/upgrade/disablercooler/action(mob/living/silicon/robot/R)
@@ -122,7 +122,7 @@
 
 	T.charge_delay = max(2 , T.charge_delay - 4)
 
-	return 1
+	return TRUE
 
 /obj/item/borg/upgrade/thrusters
 	name = "ion thruster upgrade"
@@ -139,14 +139,14 @@
 		return
 
 	R.ionpulse = 1
-	return 1
+	return TRUE
 
 /obj/item/borg/upgrade/ddrill
 	name = "mining cyborg diamond drill"
 	desc = "A diamond drill replacement for the mining module's standard drill."
 	icon_state = "cyborg_upgrade3"
 	origin_tech = "engineering=4;materials=5"
-	require_module = 1
+	require_module = TRUE
 	module_type = /obj/item/robot_module/miner
 
 /obj/item/borg/upgrade/ddrill/action(mob/living/silicon/robot/R)
@@ -161,14 +161,14 @@
 	R.module.modules += new /obj/item/pickaxe/drill/cyborg/diamond(R.module)
 	R.module.rebuild()
 
-	return 1
+	return TRUE
 
 /obj/item/borg/upgrade/soh
 	name = "mining cyborg satchel of holding"
 	desc = "A satchel of holding replacement for mining cyborg's ore satchel module."
 	icon_state = "cyborg_upgrade3"
 	origin_tech = "engineering=4;materials=4;bluespace=4"
-	require_module = 1
+	require_module = TRUE
 	module_type = /obj/item/robot_module/miner
 
 /obj/item/borg/upgrade/soh/action(mob/living/silicon/robot/R)
@@ -181,35 +181,46 @@
 	R.module.modules += new /obj/item/storage/bag/ore/holding(R.module)
 	R.module.rebuild()
 
-	return 1
+	return TRUE
 
 /obj/item/borg/upgrade/syndicate
-	name = "illegal equipment module"
+	name = "safety override module"
 	desc = "Unlocks the hidden, deadlier functions of a cyborg. Also prevents emag subversion."
 	icon_state = "cyborg_upgrade3"
 	origin_tech = "combat=4;syndicate=1"
-	require_module = 1
+	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'>Internal diagnostic error: incompatible upgrade module detected.</span>")
 		return
-
 	R.emagged = 1
+	return TRUE
 
-	return 1
+/obj/item/borg/upgrade/lavaproof
+	name = "mining cyborg lavaproof chassis"
+	desc = "An upgrade kit to apply specialized coolant systems and insulation layers to a mining cyborg's chassis, enabling them to withstand exposure to molten rock."
+	icon_state = "ash_plating"
+	resistance_flags = LAVA_PROOF | FIRE_PROOF
+	require_module = TRUE
+	module_type = /obj/item/robot_module/miner
+
+/obj/item/borg/upgrade/lavaproof/action(mob/living/silicon/robot/R)
+	if(..())
+		return
+	if(istype(R))
+		R.weather_immunities += "lava"
+	return TRUE
 
 /obj/item/borg/upgrade/selfrepair
 	name = "self-repair module"
 	desc = "This module will repair the cyborg over time."
 	icon_state = "cyborg_upgrade5"
-	require_module = 1
+	require_module = TRUE
 	var/repair_amount = -1
 	var/repair_tick = 1
 	var/msg_cooldown = 0
@@ -230,7 +241,7 @@
 	icon_state = "selfrepair_off"
 	var/datum/action/A = new /datum/action/item_action/toggle(src)
 	A.Grant(R)
-	return 1
+	return TRUE
 
 /obj/item/borg/upgrade/selfrepair/Destroy()
 	cyborg = null

code/game/objects/items/shooting_range.dm

@@ -4,24 +4,23 @@
 	desc = "A shooting target."
 	icon = 'icons/obj/objects.dmi'
 	icon_state = "target_h"
-	density = 0
+	density = FALSE
 	var/hp = 1800
-	var/icon/virtualIcon
-	var/list/bulletholes = list()
 
 /obj/item/target/Destroy()
+	cut_overlays()
 	// if a target is deleted and associated with a stake, force stake to forget
-	for(var/obj/structure/target_stake/T in view(3,src))
+	for(var/obj/structure/target_stake/T in view(3, src))
 		if(T.pinned_target == src)
 			T.pinned_target = null
-			T.density = 1
+			T.density = TRUE
 			break
 	return ..() // delete target
 
 /obj/item/target/Move()
 	..()
 	// After target moves, check for nearby stakes. If associated, move to target
-	for(var/obj/structure/target_stake/M in view(3,src))
+	for(var/obj/structure/target_stake/M in view(3, src))
 		if(M.density == 0 && M.pinned_target == src)
 			M.loc = loc
 
@@ -33,12 +32,12 @@
 
 /obj/item/target/welder_act(mob/user, obj/item/I)
 	. = TRUE
-	if(!use_tool(src, user, 0,, volume = I.tool_volume))
+	if(!use_tool(src, user, 0, volume = I.tool_volume))
 		return
 	overlays.Cut()
-	to_chat(usr, "You slice off [src]'s uneven chunks of aluminum and scorch marks.")
+	to_chat(user, "<span class='notice'>You slice off [src]'s uneven chunks of aluminium and scorch marks.</span>")
 
-/obj/item/target/attack_hand(mob/user as mob)
+/obj/item/target/attack_hand(mob/user)
 	// taking pinned targets off!
 	var/obj/structure/target_stake/stake
 	for(var/obj/structure/target_stake/T in view(3,src))
@@ -48,8 +47,8 @@
 
 	if(stake)
 		if(stake.pinned_target)
-			stake.density = 1
-			density = 0
+			stake.density = TRUE
+			density = FALSE
 			layer = OBJ_LAYER
 
 			loc = user.loc
@@ -77,101 +76,37 @@
 	desc = "A shooting target that looks like a xenomorphic alien."
 	hp = 2350 // alium onest too kinda
 
-/obj/item/target/bullet_act(var/obj/item/projectile/Proj)
-	var/p_x = Proj.p_x + pick(0,0,0,0,0,-1,1) // really ugly way of coding "sometimes offset Proj.p_x!"
-	var/p_y = Proj.p_y + pick(0,0,0,0,0,-1,1)
-	var/decaltype = 1 // 1 - scorch, 2 - bullet
+#define DECALTYPE_SCORCH 1
+#define DECALTYPE_BULLET 2
 
-	if(istype(/obj/item/projectile/bullet, Proj))
-		decaltype = 2
+/obj/item/target/bullet_act(obj/item/projectile/P)
+	var/p_x = P.p_x + pick(0,0,0,0,0,-1,1) // really ugly way of coding "sometimes offset P.p_x!"
+	var/p_y = P.p_y + pick(0,0,0,0,0,-1,1)
+	var/decaltype = DECALTYPE_SCORCH
+	if(istype(P, /obj/item/projectile/bullet))
+		decaltype = DECALTYPE_BULLET
 
-
-	virtualIcon = new(icon, icon_state)
-
-	if( virtualIcon.GetPixel(p_x, p_y) ) // if the located pixel isn't blank (null)
-
-		hp -= Proj.damage
+	var/icon/C = icon(icon, icon_state)
+	if(LAZYLEN(overlays) <= 35 && C.GetPixel(p_x, p_y)) // if the located pixel isn't blank (null)
+		hp -= P.damage
 		if(hp <= 0)
-			visible_message("<span class='warning'>[src] breaks into tiny pieces and collapses!</span>")
+			visible_message("<span class='danger'>[src] breaks into tiny pieces and collapses!</span>")
 			qdel(src)
-
-		// Create a temporary object to represent the damage
-		var/obj/bmark = new
-		bmark.pixel_x = p_x
-		bmark.pixel_y = p_y
-		bmark.icon = 'icons/effects/effects.dmi'
-		bmark.layer = 3.5
-		bmark.icon_state = "scorch"
-
-		if(decaltype == 1)
-			// Energy weapons are hot. they scorch!
-
-			// offset correction
-			bmark.pixel_x--
-			bmark.pixel_y--
-
-			if(Proj.damage >= 20 || istype(Proj, /obj/item/projectile/beam/practice))
-				bmark.icon_state = "scorch"
-				bmark.dir = pick(NORTH,SOUTH,EAST,WEST) // random scorch design
-
-
+			return
+		var/image/bullet_hole = image('icons/effects/effects.dmi', "scorch", OBJ_LAYER + 0.5)
+		bullet_hole.pixel_x = p_x - 1 //offset correction
+		bullet_hole.pixel_y = p_y - 1
+		if(decaltype == DECALTYPE_SCORCH)
+			if(P.damage >= 20 || istype(P, /obj/item/projectile/beam/practice))
+				bullet_hole.setDir(pick(NORTH,SOUTH,EAST,WEST))// random scorch design. light_scorch does not have different directions
 			else
-				bmark.icon_state = "light_scorch"
+				bullet_hole.icon_state = "light_scorch"
 		else
-
-			// Bullets are hard. They make dents!
-			bmark.icon_state = "dent"
-
-		if(Proj.damage >= 10 && bulletholes.len <= 35) // maximum of 35 bullet holes
-			if(decaltype == 2) // bullet
-				if(prob(Proj.damage+30)) // bullets make holes more commonly!
-					new/datum/bullethole(src, bmark.pixel_x, bmark.pixel_y) // create new bullet hole
-			else // Lasers!
-				if(prob(Proj.damage-10)) // lasers make holes less commonly
-					new/datum/bullethole(src, bmark.pixel_x, bmark.pixel_y) // create new bullet hole
-
-		// draw bullet holes
-		for(var/datum/bullethole/B in bulletholes)
-
-			virtualIcon.DrawBox(null, B.b1x1, B.b1y,  B.b1x2, B.b1y) // horizontal line, left to right
-			virtualIcon.DrawBox(null, B.b2x, B.b2y1,  B.b2x, B.b2y2) // vertical line, top to bottom
-
-		overlays += bmark // add the decal
-
-		icon = virtualIcon // apply bulletholes over decals
-
+			bullet_hole.icon_state = "dent"
+		add_overlay(bullet_hole)
 		return
 
 	return -1 // the bullet/projectile goes through the target! Ie, you missed
 
-
-// Small memory holder entity for transparent bullet holes
-/datum/bullethole
-	// First box
-	var/b1x1 = 0
-	var/b1x2 = 0
-	var/b1y = 0
-
-	// Second box
-	var/b2x = 0
-	var/b2y1 = 0
-	var/b2y2 = 0
-
-/datum/bullethole/New(obj/item/target/Target, pixel_x = 0, pixel_y = 0)
-	if(!Target) return
-
-	// Randomize the first box
-	b1x1 = pixel_x - pick(1,1,1,1,2,2,3,3,4)
-	b1x2 = pixel_x + pick(1,1,1,1,2,2,3,3,4)
-	b1y = pixel_y
-	if(prob(35))
-		b1y += rand(-4,4)
-
-	// Randomize the second box
-	b2x = pixel_x
-	if(prob(35))
-		b2x += rand(-4,4)
-	b2y1 = pixel_y + pick(1,1,1,1,2,2,3,3,4)
-	b2y2 = pixel_y - pick(1,1,1,1,2,2,3,3,4)
-
-	Target.bulletholes.Add(src)
+#undef DECALTYPE_SCORCH
+#undef DECALTYPE_BULLET

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

@@ -57,7 +57,7 @@
 					E.heal_damage(0, remheal, 0, 1) //Healing Burn
 					remheal = nremheal
 					user.visible_message("<span class='notice'>\The [user] applies some nanite paste at \the [M]'s [E.name] with \the [src].</span>")
-				if(H.bleed_rate && H.isSynthetic())
+				if(H.bleed_rate && ismachineperson(H))
 					H.bleed_rate = 0
 			else
 				to_chat(user, "<span class='notice'>Nothing to fix here.</span>")

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

@@ -17,9 +17,9 @@
 GLOBAL_LIST_INIT(glass_recipes, list ( \
 	new/datum/stack_recipe/window("directional window", /obj/structure/window/basic, time = 0, on_floor = TRUE, window_checks = TRUE), \
 	new/datum/stack_recipe/window("fulltile window", /obj/structure/window/full/basic, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \
-	new/datum/stack_recipe("fishbowl", /obj/machinery/fishtank/bowl, 1, time = 0), \
-	new/datum/stack_recipe("fish tank", /obj/machinery/fishtank/tank, 3, time = 0, on_floor = TRUE), \
-	new/datum/stack_recipe("wall aquariam", /obj/machinery/fishtank/wall, 4, time = 0, on_floor = TRUE) \
+	new/datum/stack_recipe("fishbowl", /obj/machinery/fishtank/bowl, 1, time = 10), \
+	new/datum/stack_recipe("fish tank", /obj/machinery/fishtank/tank, 3, time = 20, on_floor = TRUE), \
+	new/datum/stack_recipe("wall aquariam", /obj/machinery/fishtank/wall, 4, time = 40, on_floor = TRUE) \
 ))
 
 /obj/item/stack/sheet/glass

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

@@ -169,9 +169,9 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
 		return
 	if(is_type_in_typecache(target, goliath_platable_armor_typecache))
 		var/obj/item/clothing/C = target
-		var/list/current_armor = C.armor
-		if(current_armor["melee"] < 60)
-			current_armor["melee"] = min(current_armor["melee"] + 10, 60)
+		var/datum/armor/current_armor = C.armor
+		if(current_armor.getRating("melee") < 60)
+			C.armor = current_armor.setRating(melee_value = min(current_armor.getRating("melee") + 10, 60))
 			to_chat(user, "<span class='info'>You strengthen [target], improving its resistance against melee attacks.</span>")
 			use(1)
 		else
@@ -180,9 +180,9 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
 		var/obj/mecha/working/ripley/D = target
 		if(D.hides < 3)
 			D.hides++
-			D.armor["melee"] = min(D.armor["melee"] + 10, 70)
-			D.armor["bullet"] = min(D.armor["bullet"] + 5, 50)
-			D.armor["laser"] = min(D.armor["laser"] + 5, 50)
+			D.armor = D.armor.setRating(melee_value = min(D.armor.getRating("melee") + 10, 70))
+			D.armor = D.armor.setRating(bullet_value = min(D.armor.getRating("bullet") + 5, 50))
+			D.armor = D.armor.setRating(laser_value = min(D.armor.getRating("laser") + 5, 50))
 			to_chat(user, "<span class='info'>You strengthen [target], improving its resistance against melee attacks.</span>")
 			D.update_icon()
 			if(D.hides == 3)
@@ -242,7 +242,7 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
 					HS.amount++
 					src.use(1)
 					wetness = initial(wetness)
-					break
+					return
 			//If it gets to here it means it did not find a suitable stack on the tile.
 			var/obj/item/stack/sheet/leather/HS = new(src.loc)
 			HS.amount = 1

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

@@ -218,10 +218,22 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
 
 /obj/item/stack/sheet/mineral/plasma/welder_act(mob/user, obj/item/I)
 	if(I.use_tool(src, user, volume = I.tool_volume))
-		message_admins("Plasma sheets ignited by [key_name_admin(user)]([ADMIN_QUE(user,"?")]) ([ADMIN_FLW(user,"FLW")]) in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
-		log_game("Plasma sheets ignited by [key_name(user)] in ([x],[y],[z])")
-		investigate_log("was <font color='red'><b>ignited</b></font> by [key_name(user)]","atmos")
-		fire_act()
+		log_and_set_aflame(user, I)
+	return TRUE
+
+/obj/item/stack/sheet/mineral/plasma/attackby(obj/item/I, mob/living/user, params)
+	if(is_hot(I))
+		log_and_set_aflame(user, I)
+	else
+		return ..()
+
+/obj/item/stack/sheet/mineral/plasma/proc/log_and_set_aflame(mob/user, obj/item/I)
+	var/turf/T = get_turf(src)
+	message_admins("Plasma sheets ignited by [key_name_admin(user)]([ADMIN_QUE(user, "?")]) ([ADMIN_FLW(user, "FLW")]) in ([COORD(T)] - [ADMIN_JMP(T)]")
+	log_game("Plasma sheets ignited by [key_name(user)] in [COORD(T)]")
+	investigate_log("was <font color='red'><b>ignited</b></font> by [key_name(user)]", "atmos")
+	user.create_log(MISC_LOG, "Plasma sheets ignited using [I]", src)
+	fire_act()
 
 /obj/item/stack/sheet/mineral/plasma/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE)
 	..()

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/stacks/stack.dm

@@ -204,7 +204,7 @@
 
 		if(amount < 1) // Just in case a stack's amount ends up fractional somehow
 			var/oldsrc = src
-			src = null //dont kill proc after del()
+			src = null //dont kill proc after qdel()
 			usr.unEquip(oldsrc, 1)
 			qdel(oldsrc)
 			if(istype(O, /obj/item))

code/game/objects/items/tools/tool_behaviour.dm

@@ -4,7 +4,7 @@
 	// No delay means there is no start message, and no reason to call tool_start_check before use_tool.
 	// Run the start check here so we wouldn't have to call it manually.
 	target.add_fingerprint(user)
-	if(!tool_start_check(user, amount) && !delay)
+	if(!tool_start_check(target, user, amount) && !delay)
 		return
 	delay *= toolspeed
 
@@ -39,7 +39,7 @@
 
 // Called before use_tool if there is a delay, or by use_tool if there isn't.
 // Only ever used by welding tools and stacks, so it's not added on any other use_tool checks.
-/obj/item/proc/tool_start_check(mob/living/user, amount=0)
+/obj/item/proc/tool_start_check(atom/target, mob/living/user, amount=0)
 	return tool_use_check(user, amount)
 
 // A check called by tool_start_check once, and by use_tool on every tick of delay.

code/game/objects/items/tools/welder.dm

@@ -35,10 +35,12 @@
 	..()
 	create_reagents(maximum_fuel)
 	reagents.add_reagent("fuel", maximum_fuel)
-	if(refills_over_time)
-		reagents.reagents_generated_per_cycle += list("fuel" = 1)
 	update_icon()
 
+/obj/item/weldingtool/Destroy()
+	STOP_PROCESSING(SSobj, src)
+	return ..()
+
 /obj/item/weldingtool/examine(mob/user)
 	. = ..()
 	if(get_dist(user, src) <= 0)
@@ -49,11 +51,15 @@
 	return FIRELOSS
 
 /obj/item/weldingtool/process()
-	var/turf/T = get_turf(src)
-	if(T) // Implants for instance won't find a turf
-		T.hotspot_expose(2500, 5)
-	if(prob(5))
-		remove_fuel(1)
+	if(tool_enabled)
+		var/turf/T = get_turf(src)
+		if(T) // Implants for instance won't find a turf
+			T.hotspot_expose(2500, 5)
+		if(prob(5))
+			remove_fuel(1)
+	if(refills_over_time)
+		if(GET_FUEL < maximum_fuel)
+			reagents.add_reagent("fuel", 1)
 	..()
 
 /obj/item/weldingtool/attack_self(mob/user)
@@ -77,7 +83,8 @@
 		playsound(loc, activation_sound, 50, 1)
 		set_light(light_intensity)
 	else
-		STOP_PROCESSING(SSobj, src)
+		if(!refills_over_time)
+			STOP_PROCESSING(SSobj, src)
 		damtype = BRUTE
 		force = 3
 		hitsound = "swing_hit"
@@ -101,9 +108,9 @@
 		return FALSE
 
 // When welding is about to start, run a normal tool_use_check, then flash a mob if it succeeds.
-/obj/item/weldingtool/tool_start_check(mob/living/user, amount=0)
+/obj/item/weldingtool/tool_start_check(atom/target, mob/living/user, amount=0)
 	. = tool_use_check(user, amount)
-	if(. && user)
+	if(. && user && !ismob(target)) // Don't flash the user if they're repairing robo limbs or repairing a borg etc. Only flash them if the target is an object
 		user.flash_eyes(light_intensity)
 
 /obj/item/weldingtool/use(amount)
@@ -160,7 +167,7 @@
 /obj/item/weldingtool/update_icon()
 	if(low_fuel_changes_icon)
 		var/ratio = GET_FUEL / maximum_fuel
-		ratio = Ceiling(ratio*4) * 25
+		ratio = CEILING(ratio*4, 1) * 25
 		if(ratio == 100)
 			icon_state = initial(icon_state)
 		else

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"
@@ -344,56 +344,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"
 
 
@@ -1023,6 +1023,18 @@ obj/item/toy/cards/deck/syndicate/black
 	name = "orange fox plushie"
 	icon_state = "orangefox"
 
+/obj/item/toy/plushie/orange_fox/grump
+	name = "grumpy fox"
+	desc = "An ancient plushie that seems particularly grumpy."
+
+/obj/item/toy/plushie/orange_fox/grump/ComponentInitialize()
+	. = ..()
+	var/static/list/grumps = list("Ahh, yes, you're so clever, var editing that.", "Really?", "If you make a runtime with var edits, it's your own damn fault.",
+	"Don't you dare post issues on the git when you don't even know how this works.", "Was that necessary?", "Ohhh, setting admin edited var must be your favorite pastime!",
+	"Oh, so you have time to var edit, but you don't have time to ban that greytider?", "Oh boy, is this another one of those 'events'?", "Seriously, just stop.", "You do realize this is incurring proc call overhead.",
+	"Congrats, you just left a reference with your dirty client and now that thing you edited will never garbage collect properly.", "Is it that time of day, again, for unecessary adminbus?")
+	AddComponent(/datum/component/edit_complainer, grumps)
+
 /obj/item/toy/plushie/coffee_fox
 	name = "coffee fox plushie"
 	icon_state = "coffeefox"
@@ -1087,6 +1099,21 @@ obj/item/toy/cards/deck/syndicate/black
 		return
 	..()
 
+/obj/item/toy/plushie/ipcplushie
+	name = "IPC plushie"
+	desc = "An adorable IPC plushie, straight from New Canaan. Arguably more durable than the real deal. Toaster functionality included."
+	icon_state = "plushie_ipc"
+	item_state = "plushie_ipc"
+
+/obj/item/toy/plushie/ipcplushie/attackby(obj/item/B, mob/user, params)
+	if(istype(B, /obj/item/reagent_containers/food/snacks/breadslice))
+		new /obj/item/reagent_containers/food/snacks/toast(get_turf(loc))
+		to_chat(user, "<span class='notice'> You insert bread into the toaster. </span>")
+		playsound(loc, 'sound/machines/ding.ogg', 50, 1)
+		qdel(B)
+	else
+		return ..()
+
 //New generation TG plushies
 
 /obj/item/toy/plushie/lizardplushie
@@ -1117,15 +1144,15 @@ obj/item/toy/cards/deck/syndicate/black
  * Foam Armblade
  */
 
- /obj/item/toy/foamblade
- 	name = "foam armblade"
- 	desc = "it says \"Sternside Changs #1 fan\" on it. "
- 	icon = 'icons/obj/toy.dmi'
- 	icon_state = "foamblade"
- 	item_state = "arm_blade"
- 	attack_verb = list("pricked", "absorbed", "gored")
- 	w_class = WEIGHT_CLASS_SMALL
- 	resistance_flags = FLAMMABLE
+/obj/item/toy/foamblade
+	name = "foam armblade"
+	desc = "it says \"Sternside Changs #1 fan\" on it. "
+	icon = 'icons/obj/toy.dmi'
+	icon_state = "foamblade"
+	item_state = "arm_blade"
+	attack_verb = list("pricked", "absorbed", "gored")
+	w_class = WEIGHT_CLASS_SMALL
+	resistance_flags = FLAMMABLE
 
 /*
  * Toy/fake flash
@@ -1220,7 +1247,6 @@ obj/item/toy/cards/deck/syndicate/black
 		spawn(20)
 			cooldown = FALSE
 		return
-		..()
 
 /obj/item/toy/owl
 	name = "owl action figure"
@@ -1382,6 +1408,7 @@ obj/item/toy/cards/deck/syndicate/black
 	name = "xenomorph action figure"
 	desc = "MEGA presents the new Xenos Isolated action figure! Comes complete with realistic sounds! Pull back string to use."
 	w_class = WEIGHT_CLASS_SMALL
+	bubble_icon = "alien"
 	var/cooldown = 0
 
 /obj/item/toy/toy_xeno/attack_self(mob/user)
@@ -1390,7 +1417,7 @@ obj/item/toy/cards/deck/syndicate/black
 		user.visible_message("<span class='notice'>[user] pulls back the string on [src].</span>")
 		icon_state = "[initial(icon_state)]_used"
 		sleep(5)
-		audible_message("<span class='danger'>[bicon(src)] Hiss!</span>")
+		atom_say("Hiss!")
 		var/list/possible_sounds = list('sound/voice/hiss1.ogg', 'sound/voice/hiss2.ogg', 'sound/voice/hiss3.ogg', 'sound/voice/hiss4.ogg')
 		playsound(get_turf(src), pick(possible_sounds), 50, 1)
 		spawn(45)
@@ -1564,182 +1591,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/trash.dm

@@ -8,6 +8,13 @@
 	desc = "This is rubbish."
 	resistance_flags = FLAMMABLE
 
+/obj/item/trash/decompile_act(obj/item/matter_decompiler/C, mob/user)
+	C.stored_comms["metal"] += 2
+	C.stored_comms["wood"] += 1
+	C.stored_comms["glass"] += 1
+	qdel(src)
+	return TRUE
+
 /obj/item/trash/raisins
 	name = "4no raisins"
 	icon_state= "4no_raisins"

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

@@ -477,9 +477,7 @@ GLOBAL_LIST_INIT(rcd_door_types, list(
 	return R.cell.charge >= (amount * use_multiplier)
 
 /obj/item/rcd/proc/detonate_pulse()
-	audible_message("<span class='danger'><b>[src] begins to vibrate and \
-		buzz loudly!</b></span>","<span class='danger'><b>[src] begins \
-		vibrating violently!</b></span>")
+	audible_message("<span class='danger'><b>[src] begins to vibrate and buzz loudly!</b></span>", "<span class='danger'><b>[src] begins vibrating violently!</b></span>")
 	// 5 seconds to get rid of it
 	addtimer(CALLBACK(src, .proc/detonate_pulse_explode), 50)
 

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

@@ -58,7 +58,7 @@ RSF
 	if(!proximity) return
 	if(!(istype(A, /obj/structure/table) || istype(A, /turf/simulated/floor)))
 		return
-	var spawn_location
+	var/spawn_location
 	var/turf/T = get_turf(A)
 	if(istype(T) && !T.density)
 		spawn_location = T

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

@@ -212,6 +212,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
 
@@ -356,13 +361,13 @@
 
 /obj/item/card/id/syndicate/attack_self(mob/user as mob)
 	if(!src.registered_name)
-		var t = reject_bad_name(input(user, "What name would you like to use on this card?", "Agent Card name", ishuman(user) ? user.real_name : user.name))
+		var/t = reject_bad_name(input(user, "What name would you like to use on this card?", "Agent Card name", ishuman(user) ? user.real_name : user.name))
 		if(!t)
 			to_chat(user, "<span class='warning'>Invalid name.</span>")
 			return
 		src.registered_name = t
 
-		var u = sanitize(stripped_input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than maintenance.", "Agent Card Job Assignment", "Agent", MAX_MESSAGE_LEN))
+		var/u = sanitize(stripped_input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than maintenance.", "Agent Card Job Assignment", "Agent", MAX_MESSAGE_LEN))
 		if(!u)
 			to_chat(user, "<span class='warning'>Invalid assignment.</span>")
 			src.registered_name = ""

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

@@ -188,7 +188,7 @@
 
 /obj/structure/chrono_field/update_icon()
 	var/ttk_frame = 1 - (tickstokill / initial(tickstokill))
-	ttk_frame = Clamp(Ceiling(ttk_frame * CHRONO_FRAME_COUNT), 1, CHRONO_FRAME_COUNT)
+	ttk_frame = clamp(CEILING(ttk_frame * CHRONO_FRAME_COUNT, 1), 1, CHRONO_FRAME_COUNT)
 	if(ttk_frame != RPpos)
 		RPpos = ttk_frame
 		mob_underlay.icon_state = "frame[RPpos]"

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

@@ -31,6 +31,7 @@ LIGHTERS ARE IN LIGHTERS.DM
 	var/smoketime = 150
 	var/chem_volume = 60
 	var/list/list_reagents = list("nicotine" = 40)
+	var/first_puff = TRUE // the first puff is a bit more reagents ingested
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/mask.dmi',
 		"Unathi" = 'icons/mob/species/unathi/mask.dmi',
@@ -65,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
@@ -194,8 +199,9 @@ LIGHTERS ARE IN LIGHTERS.DM
 	if(reagents && reagents.total_volume)	//	check if it has any reagents at all
 		if(is_being_smoked) // if it's being smoked, transfer reagents to the mob
 			var/mob/living/carbon/C = loc
-			for (var/datum/reagent/R in reagents.reagent_list)
-				reagents.trans_id_to(C, R.id, max(REAGENTS_METABOLISM / reagents.reagent_list.len, 0.1)) //transfer at least .1 of each chem
+			for(var/datum/reagent/R in reagents.reagent_list)
+				reagents.trans_id_to(C, R.id, first_puff ? 1 : max(REAGENTS_METABOLISM / reagents.reagent_list.len, 0.1)) //transfer at least .1 of each chem
+			first_puff = FALSE
 			if(!reagents.total_volume) // There were reagents, but now they're gone
 				to_chat(C, "<span class='notice'>Your [name] loses its flavor.</span>")
 		else // else just remove some of the reagents
@@ -309,6 +315,11 @@ LIGHTERS ARE IN LIGHTERS.DM
 	pixel_y = rand(-10,10)
 	transform = turn(transform,rand(0,360))
 
+/obj/item/cigbutt/decompile_act(obj/item/matter_decompiler/C, mob/user)
+	C.stored_comms["wood"] += 1
+	qdel(src)
+	return TRUE
+
 /obj/item/cigbutt/cigarbutt
 	name = "cigar butt"
 	desc = "A manky old cigar butt."
@@ -377,6 +388,7 @@ LIGHTERS ARE IN LIGHTERS.DM
 		to_chat(user, "<span class='notice'>You refill the pipe with tobacco.</span>")
 		reagents.add_reagent("nicotine", chem_volume)
 		smoketime = initial(smoketime)
+		first_puff = TRUE
 
 /obj/item/clothing/mask/cigarette/pipe/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/reagent_containers))

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

@@ -5,16 +5,22 @@
 	icon_state = "lipstick"
 	w_class = WEIGHT_CLASS_TINY
 	var/colour = "red"
-	var/open = 0
-	var/list/lipstick_colors = list(
-		"purple" = "purple",
-		"jade" = "#216F43",
-		"lime" = "lime",
-		"black" = "black",
-		"green" = "green",
-		"blue" = "blue",
-		"white" = "white")
+	var/open = FALSE
+	var/static/list/lipstick_colors
 
+/obj/item/lipstick/Initialize(mapload)
+	. = ..()
+	if(!lipstick_colors)
+		lipstick_colors = list(
+			"black" = "#000000",
+			"white" = "#FFFFFF",
+			"red" = "#FF0000",
+			"green" = "#00C000",
+			"blue" = "#0000FF",
+			"purple" = "#D55CD0",
+			"jade" = "#216F43",
+			"lime" = "#00FF00",
+		)
 
 /obj/item/lipstick/purple
 	name = "purple lipstick"
@@ -22,7 +28,7 @@
 
 /obj/item/lipstick/jade
 	name = "jade lipstick"
-	colour = "#216F43"
+	colour = "jade"
 
 /obj/item/lipstick/lime
 	name = "lime lipstick"
@@ -47,40 +53,37 @@
 /obj/item/lipstick/random
 	name = "lipstick"
 
-/obj/item/lipstick/random/New()
-	..()
-	var/lscolor = pick(lipstick_colors)//A random color is picked from the var defined initially in a new var.
-	colour = lipstick_colors[lscolor]//The color of the lipstick is pulled from the new variable (right hand side, HTML & Hex RGB)
-	name = "[lscolor] lipstick"//The new variable is also used to match the name to the color of the lipstick. Kudos to Desolate & Lemon
+/obj/item/lipstick/random/Initialize(mapload)
+	. = ..()
+	colour = pick(lipstick_colors)
+	name = "[colour] lipstick"
 
-
-/obj/item/lipstick/attack_self(mob/user as mob)
-	overlays.Cut()
+/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 = image("icon"='icons/obj/items.dmi', "icon_state"="lipstick_uncap_color")
-		colored.color = colour
+		var/mutable_appearance/colored = mutable_appearance('icons/obj/items.dmi', "lipstick_uncap_color")
+		colored.color = lipstick_colors[colour]
 		icon_state = "lipstick_uncap"
-		overlays += colored
+		add_overlay(colored)
 	else
 		icon_state = "lipstick"
 
-/obj/item/lipstick/attack(mob/M as mob, mob/user as mob)
-	if(!open)	return
-
-	if(!istype(M, /mob))	return
+/obj/item/lipstick/attack(mob/M, mob/user)
+	if(!open || !istype(M))
+		return
 
 	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
-		if(H.lip_style)	//if they already have lipstick on
+		if(H.lip_style)	// If they already have lipstick on
 			to_chat(user, "<span class='notice'>You need to wipe off the old lipstick first!</span>")
 			return
 		if(H == user)
 			user.visible_message("<span class='notice'>[user] does [user.p_their()] lips with [src].</span>", \
 								 "<span class='notice'>You take a moment to apply [src]. Perfect!</span>")
 			H.lip_style = "lipstick"
-			H.lip_color = colour
+			H.lip_color = lipstick_colors[colour]
 			H.update_body()
 		else
 			user.visible_message("<span class='warning'>[user] begins to do [H]'s lips with \the [src].</span>", \
@@ -89,7 +92,7 @@
 				user.visible_message("<span class='notice'>[user] does [H]'s lips with \the [src].</span>", \
 									 "<span class='notice'>You apply \the [src].</span>")
 				H.lip_style = "lipstick"
-				H.lip_color = colour
+				H.lip_color = lipstick_colors[colour]
 				H.update_body()
 	else
 		to_chat(user, "<span class='notice'>Where are the lips on that?</span>")

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

@@ -72,7 +72,7 @@
 	if(powered) //so it doesn't show charge if it's unpowered
 		if(cell)
 			var/ratio = cell.charge / cell.maxcharge
-			ratio = Ceiling(ratio*4) * 25
+			ratio = CEILING(ratio*4, 1) * 25
 			overlays += "[icon_state]-charge[ratio]"
 
 /obj/item/defibrillator/CheckParts(list/parts_list)

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

@@ -138,7 +138,7 @@
 /obj/item/dice/proc/diceroll(mob/user)
 	result = roll(sides)
 	if(rigged != DICE_NOT_RIGGED && result != rigged_value)
-		if(rigged == DICE_BASICALLY_RIGGED && prob(Clamp(1/(sides - 1) * 100, 25, 80)))
+		if(rigged == DICE_BASICALLY_RIGGED && prob(clamp(1/(sides - 1) * 100, 25, 80)))
 			result = rigged_value
 		else if(rigged == DICE_TOTALLY_RIGGED)
 			result = rigged_value

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

@@ -147,10 +147,6 @@
 		to_chat(user, "<span class='notice'>You inject yourself with [src].</span>")
 
 	add_attack_logs(user, M, attack_log, ATKLOG_ALL)
-	if(!iscarbon(user))
-		M.LAssailant = null
-	else
-		M.LAssailant = user
 
 	inject(M, user)
 	used = TRUE

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

@@ -62,7 +62,7 @@
 		return
 	var/newtime = input(usr, "Please set the timer.", "Timer", det_time) as num
 	if(user.is_in_active_hand(src))
-		newtime = Clamp(newtime, 10, 60000)
+		newtime = clamp(newtime, 10, 60000)
 		det_time = newtime
 		to_chat(user, "Timer set for [det_time] seconds.")
 

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/clowngrenade.dm

@@ -13,22 +13,12 @@
 /obj/item/grenade/clown_grenade/prime()
 	..()
 	playsound(src.loc, 'sound/items/bikehorn.ogg', 25, -3)
-	/*
-	for(var/turf/simulated/floor/T in view(affected_area, src.loc))
-		if(prob(75))
-			banana(T)
-	*/
 	var/i = 0
 	var/number = 0
 	for(var/direction in GLOB.alldirs)
 		for(i = 0; i < 2; i++)
 			number++
 			var/obj/item/grown/bananapeel/traitorpeel/peel = new /obj/item/grown/bananapeel/traitorpeel(get_turf(src.loc))
-		/*	var/direction = pick(alldirs)
-			var/spaces = pick(1;150, 2)
-			var/a = 0
-			for(a = 0; a < spaces; a++)
-				step(peel,direction)*/
 			var/a = 1
 			if(number & 2)
 				for(a = 1; a <= 2; a++)
@@ -39,21 +29,17 @@
 	qdel(src)
 	return
 
-/obj/item/grown/bananapeel/traitorpeel
-	trip_stun = 0
-	trip_weaken = 7
-	trip_tiles = 4
-	trip_walksafe = FALSE
-
-	trip_chance = 100
-
-
-/obj/item/grown/bananapeel/traitorpeel/on_trip(mob/living/carbon/human/H)
+/obj/item/grown/bananapeel/traitorpeel/New(newloc, obj/item/seeds/new_seed)
 	. = ..()
-	if(.)
-		to_chat(H, "<span class='warning'>Your feet feel like they're on fire!</span>")
-		H.take_overall_damage(0, rand(2,8))
-		H.take_organ_damage(2) // Was 5 -- TLE
+	// The reason this AddComponent is here and not in ComponentInitialize() is because if it's put there, it will be ran before the parent New proc for /grown types.
+	// And then be overriden by the generic component placed onto it by the `/datum/plant_gene/trait/slip`.
+	AddComponent(/datum/component/slippery, src, 0, 7, 100, 4, FALSE)
+
+/obj/item/grown/bananapeel/traitorpeel/after_slip(mob/living/carbon/human/H)
+	to_chat(H, "<span class='warning'>Your feet feel like they're on fire!</span>")
+	H.take_overall_damage(0, rand(2,8))
+	H.take_organ_damage(2)
+	return ..()
 
 /obj/item/grown/bananapeel/traitorpeel/throw_impact(atom/hit_atom)
 	var/burned = rand(1,3)

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/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/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)
@@ -488,7 +488,7 @@
 		var/mob/living/carbon/human/holder = loc
 		if(src == holder.l_hand || src == holder.r_hand) // Holding this in your hand will
 			for(var/mob/living/carbon/human/H in range(5, loc))
-				if(H.mind.vampire && !H.mind.vampire.get_ability(/datum/vampire_passive/full))
+				if(H.mind && H.mind.vampire && !H.mind.vampire.get_ability(/datum/vampire_passive/full))
 					H.mind.vampire.nullified = max(5, H.mind.vampire.nullified + 2)
 					if(prob(10))
 						to_chat(H, "<span class='userdanger'>Being in the presence of [holder]'s [src] is interfering with your powers!</span>")

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

@@ -244,12 +244,18 @@
 	else
 		..()
 
+/obj/item/match/decompile_act(obj/item/matter_decompiler/C, mob/user)
+	if(burnt)
+		C.stored_comms["wood"] += 1
+		qdel(src)
+		return TRUE
+	return ..()
+
 /obj/item/proc/help_light_cig(mob/living/M)
 	var/mask_item = M.get_item_by_slot(slot_wear_mask)
 	if(istype(mask_item, /obj/item/clothing/mask/cigarette))
 		return mask_item
 
-
 /obj/item/match/firebrand
 	name = "firebrand"
 	desc = "An unlit firebrand. It makes you wonder why it's not just called a stick."

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

@@ -5,6 +5,7 @@
 	icon = 'icons/obj/library.dmi'
 	due_date = 0 // Game time in 1/10th seconds
 	unique = 1   // 0 - Normal book, 1 - Should not be treated as normal book, unable to be copied, unable to be modified
+	has_drm = TRUE // No reuploading. Piracy is a crime
 
 
 /obj/item/book/manual/engineering_construction

code/game/objects/items/weapons/melee/energy.dm

@@ -6,7 +6,7 @@
 	var/list/nemesis_factions //Any mob with a faction that exists in this list will take bonus damage/effects
 	w_class = WEIGHT_CLASS_SMALL
 	var/w_class_on = WEIGHT_CLASS_BULKY
-	var/icon_state_on = "axe1"
+	var/icon_state_on
 	var/list/attack_verb_on = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	hitsound = 'sound/weapons/blade1.ogg' // Probably more appropriate than the previous hitsound. -- Dave
 	usesound = 'sound/weapons/blade1.ogg'
@@ -48,9 +48,9 @@
 		throw_speed = 4
 		if(attack_verb_on.len)
 			attack_verb = attack_verb_on
-		if(!item_color)
+		if(icon_state_on)
 			icon_state = icon_state_on
-			set_light(brightness_on)
+			set_light(brightness_on, l_color = item_color ? colormap[item_color] : null)
 		else
 			icon_state = "sword[item_color]"
 			set_light(brightness_on, l_color=colormap[item_color])
@@ -80,6 +80,7 @@
 	name = "energy axe"
 	desc = "An energised battle axe."
 	icon_state = "axe0"
+	icon_state_on = "axe1"
 	force = 40
 	force_on = 150
 	throwforce = 25
@@ -301,9 +302,9 @@
 		throw_speed = 4
 		if(attack_verb_on.len)
 			attack_verb = attack_verb_on
-		if(!item_color)
+		if(icon_state_on)
 			icon_state = icon_state_on
-			set_light(brightness_on)
+			set_light(brightness_on, l_color = item_color ? colormap[item_color] : null)
 		else
 			icon_state = "sword[item_color]"
 			set_light(brightness_on, l_color=colormap[item_color])

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

@@ -83,11 +83,16 @@
 
 /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 ..()
 
+/obj/item/shard/decompile_act(obj/item/matter_decompiler/C, mob/user)
+	C.stored_comms["glass"] += 3
+	qdel(src)
+	return TRUE
+
 /obj/item/shard/plasma
 	name = "plasma shard"
 	desc = "A shard of plasma glass. Considerably tougher then normal glass shards. Apparently not tough enough to be a window."

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

@@ -11,15 +11,11 @@
 	throw_speed = 4
 	throw_range = 20
 	discrete = 1
-
-	trip_stun = 4
-	trip_weaken = 2
-	trip_chance = 100
-	trip_walksafe = FALSE
-	trip_verb = TV_SLIP
-
 	var/cleanspeed = 50 //slower than mop
 
+/obj/item/soap/ComponentInitialize()
+	AddComponent(/datum/component/slippery, src, 4, 2, 100, 0, FALSE)
+
 /obj/item/soap/afterattack(atom/target, mob/user, proximity)
 	if(!proximity) return
 	//I couldn't feasibly  fix the overlay bugs caused by cleaning items we are wearing.

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."

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

@@ -33,9 +33,11 @@
 	icon_state = "trashbag"
 	item_state = "trashbag"
 
-	w_class = WEIGHT_CLASS_TINY
+	w_class = WEIGHT_CLASS_BULKY
 	max_w_class = WEIGHT_CLASS_SMALL
+	slot_flags = null
 	storage_slots = 30
+	max_combined_w_class = 30
 	can_hold = list() // any
 	cant_hold = list(/obj/item/disk/nuclear)
 
@@ -45,18 +47,15 @@
 	return TOXLOSS
 
 /obj/item/storage/bag/trash/update_icon()
-	if(contents.len == 0)
-		w_class = WEIGHT_CLASS_TINY
-		icon_state = "[initial(icon_state)]"
-	else if(contents.len < 12)
-		w_class = WEIGHT_CLASS_BULKY
-		icon_state = "[initial(icon_state)]1"
-	else if(contents.len < 21)
-		w_class = WEIGHT_CLASS_BULKY
-		icon_state = "[initial(icon_state)]2"
-	else
-		w_class = WEIGHT_CLASS_BULKY
-		icon_state = "[initial(icon_state)]3"
+	switch(contents.len)
+		if(20 to INFINITY)
+			icon_state = "[initial(icon_state)]3"
+		if(11 to 20)
+			icon_state = "[initial(icon_state)]2"
+		if(1 to 11)
+			icon_state = "[initial(icon_state)]1"
+		else
+			icon_state = "[initial(icon_state)]"
 
 /obj/item/storage/bag/trash/cyborg
 
@@ -381,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)
@@ -422,13 +422,13 @@
 
 /obj/item/storage/bag/tray/cyborg/afterattack(atom/target, mob/user as mob)
 	if( isturf(target) || istype(target,/obj/structure/table) )
-		var foundtable = istype(target,/obj/structure/table/)
+		var/foundtable = istype(target,/obj/structure/table/)
 		if( !foundtable ) //it must be a turf!
 			for(var/obj/structure/table/T in target)
 				foundtable = 1
 				break
 
-		var turf/dropspot
+		var/turf/dropspot
 		if( !foundtable ) // don't unload things onto walls or other silly places.
 			dropspot = user.loc
 		else if( isturf(target) ) // they clicked on a turf with a table in it
@@ -438,7 +438,7 @@
 
 		overlays = null
 
-		var droppedSomething = 0
+		var/droppedSomething = 0
 
 		for(var/obj/item/I in contents)
 			I.loc = dropspot

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

@@ -846,7 +846,7 @@
 	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

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

@@ -215,18 +215,25 @@
 	//if we get this far, handle the insertion checks as normal
 	.=..()
 
+/obj/item/storage/fancy/cigarettes/decompile_act(obj/item/matter_decompiler/C, mob/user)
+	if(!length(contents))
+		C.stored_comms["wood"] += 1
+		qdel(src)
+		return TRUE
+	return ..()
+
 /obj/item/storage/fancy/cigarettes/dromedaryco
 	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()
 	..()
@@ -237,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
 
 
@@ -252,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
@@ -300,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

@@ -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.
@@ -541,7 +543,7 @@
 	return depth
 
 /obj/item/storage/serialize()
-	var data = ..()
+	var/data = ..()
 	var/list/content_list = list()
 	data["content"] = content_list
 	data["slots"] = storage_slots

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
@@ -121,19 +124,6 @@
 	desc = "A sleek, sturdy box"
 	icon_state = "box_of_doom"
 
-/obj/item/storage/box/syndie_kit/romerol
-	name = "Romerol Kit"
-	desc = "A box containing a deadly virus capable of reanimating dead as zombies."
-	max_w_class = WEIGHT_CLASS_NORMAL
-	can_hold = list(/obj/item/reagent_containers/glass/bottle/romerol,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/dropper)
-
-/obj/item/storage/box/syndie_kit/romerol/New()
-	..()
-	new /obj/item/reagent_containers/glass/bottle/romerol(src)
-	new /obj/item/reagent_containers/syringe(src)
-	new /obj/item/reagent_containers/dropper(src)
-	return
-
 /obj/item/storage/box/syndie_kit/space
 	name = "Boxed Space Suit and Helmet"
 	can_hold = list(/obj/item/clothing/suit/space/syndicate/black/red, /obj/item/clothing/head/helmet/space/syndicate/black/red, /obj/item/tank/emergency_oxygen/syndi, /obj/item/clothing/mask/gas/syndicate)

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

@@ -189,8 +189,8 @@
 	L.apply_effect(STUTTER, stunforce)
 
 	if(user)
-		user.lastattacked = L
-		L.lastattacker = user
+		L.lastattacker = user.real_name
+		L.lastattackerckey = user.ckey
 		L.visible_message("<span class='danger'>[user] has stunned [L] with [src]!</span>", \
 								"<span class='userdanger'>[user] has stunned you with [src]!</span>")
 		add_attack_logs(user, L, "stunned")

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

@@ -53,13 +53,8 @@ obj/item/tank/oxygen/empty/New()
 
 /obj/item/tank/anesthetic/New()
 	..()
-
-	air_contents.oxygen = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD
-
-	var/datum/gas/sleeping_agent/trace_gas = new()
-	trace_gas.moles = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD
-
-	air_contents.trace_gases += trace_gas
+	air_contents.oxygen = (3 * ONE_ATMOSPHERE) * 70 / (R_IDEAL_GAS_EQUATION * T20C) * O2STANDARD
+	air_contents.sleeping_agent = (3 * ONE_ATMOSPHERE) * 70 / (R_IDEAL_GAS_EQUATION * T20C) * N2STANDARD
 
 /*
  * Air

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/teleportation.dm

@@ -115,7 +115,7 @@ Frequency:
 		to_chat(user, "<span class='notice'>\The [src] is malfunctioning.</span>")
 		return
 	var/list/L = list(  )
-	for(var/obj/machinery/computer/teleporter/com in world)
+	for(var/obj/machinery/computer/teleporter/com in GLOB.machines)
 		if(com.target)
 			if(com.power_station && com.power_station.teleporter_hub && com.power_station.engaged)
 				L["[com.id] (Active)"] = com.target

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

@@ -1,785 +0,0 @@
-#define HEALPERWELD 15
-
-/* Tools!
- * Note: Multitools are in devices
- *
- * Contains:
- * 		Wrench
- * 		Screwdriver
- * 		Wirecutters
- * 		Welding Tool
- * 		Crowbar
- *		Revolver Conversion Kit
- */
-
-//Wrench
-/obj/item/wrench
-	name = "wrench"
-	desc = "A wrench with common uses. Can be found in your hand."
-	icon = 'icons/obj/tools.dmi'
-	icon_state = "wrench"
-	flags = CONDUCT
-	slot_flags = SLOT_BELT
-	force = 5
-	throwforce = 7
-	usesound = 'sound/items/ratchet.ogg'
-	w_class = WEIGHT_CLASS_SMALL
-	materials = list(MAT_METAL=150)
-	origin_tech = "materials=1;engineering=1"
-	attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
-	toolspeed = 1
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
-
-/obj/item/wrench/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
-	playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1)
-	return BRUTELOSS
-
-/obj/item/wrench/cyborg
-	name = "automatic wrench"
-	desc = "An advanced robotic wrench. Can be found in construction cyborgs."
-	toolspeed = 0.5
-
-/obj/item/wrench/brass
-	name = "brass wrench"
-	desc = "A brass wrench. It's faintly warm to the touch."
-	icon_state = "wrench_brass"
-	toolspeed = 0.5
-	resistance_flags = FIRE_PROOF | ACID_PROOF
-
-/obj/item/wrench/abductor
-	name = "alien wrench"
-	desc = "A polarized wrench. It causes anything placed between the jaws to turn."
-	icon = 'icons/obj/abductor.dmi'
-	icon_state = "wrench"
-	usesound = 'sound/effects/empulse.ogg'
-	toolspeed = 0.1
-	origin_tech = "materials=5;engineering=5;abductor=3"
-
-/obj/item/wrench/power
-	name = "hand drill"
-	desc = "A simple powered drill with a bolt bit."
-	icon_state = "drill_bolt"
-	item_state = "drill"
-	usesound = 'sound/items/drill_use.ogg'
-	materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25)
-	origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get
-	force = 8 //might or might not be too high, subject to change
-	throwforce = 8
-	attack_verb = list("drilled", "screwed", "jabbed")
-	toolspeed = 0.25
-
-/obj/item/wrench/power/attack_self(mob/user)
-	playsound(get_turf(user),'sound/items/change_drill.ogg', 50, 1)
-	var/obj/item/wirecutters/power/s_drill = new /obj/item/screwdriver/power
-	to_chat(user, "<span class='notice'>You attach the screwdriver bit to [src].</span>")
-	qdel(src)
-	user.put_in_active_hand(s_drill)
-
-/obj/item/wrench/power/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] is pressing [src] against [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!")
-	return BRUTELOSS
-
-/obj/item/wrench/medical
-	name = "medical wrench"
-	desc = "A medical wrench with common (medical?) uses. Can be found in your hand."
-	icon_state = "wrench_medical"
-	force = 2 //MEDICAL
-	throwforce = 4
-	origin_tech = "materials=1;engineering=1;biotech=3"
-	attack_verb = list("wrenched", "medicaled", "tapped", "jabbed", "whacked")
-
-/obj/item/wrench/medical/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] is praying to the medical wrench to take [user.p_their()] soul. It looks like [user.p_theyre()] trying to commit suicide!</span>")
-	// TODO Make them glow with the power of the M E D I C A L W R E N C H
-	// during their ascension
-
-	// Stun stops them from wandering off
-	user.Stun(5)
-	playsound(loc, 'sound/effects/pray.ogg', 50, 1, -1)
-
-	// Let the sound effect finish playing
-	sleep(20)
-
-	if(!user)
-		return
-
-	for(var/obj/item/W in user)
-		user.unEquip(W)
-
-	var/obj/item/wrench/medical/W = new /obj/item/wrench/medical(loc)
-	W.add_fingerprint(user)
-	W.desc += " For some reason, it reminds you of [user.name]."
-
-	if(!user)
-		return
-
-	user.dust()
-	return OBLITERATION
-
-//Screwdriver
-/obj/item/screwdriver
-	name = "screwdriver"
-	desc = "You can be totally screwy with this."
-	icon = 'icons/obj/tools.dmi'
-	icon_state = "screwdriver_map"
-	flags = CONDUCT
-	slot_flags = SLOT_BELT
-	force = 5
-	w_class = WEIGHT_CLASS_TINY
-	throwforce = 5
-	throw_speed = 3
-	throw_range = 5
-	materials = list(MAT_METAL=75)
-	attack_verb = list("stabbed")
-	hitsound = 'sound/weapons/bladeslice.ogg'
-	usesound = 'sound/items/screwdriver.ogg'
-	toolspeed = 1
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
-	var/random_color = TRUE //if the screwdriver uses random coloring
-
-/obj/item/screwdriver/nuke
-	name = "screwdriver"
-	desc = "A screwdriver with an ultra thin tip."
-	icon_state = "screwdriver_nuke"
-	toolspeed = 0.5
-
-/obj/item/screwdriver/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] is stabbing [src] into [user.p_their()] [pick("temple", "heart")]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
-	return BRUTELOSS
-
-/obj/item/screwdriver/New(loc, var/param_color = null)
-	..()
-	if(random_color)
-		if(!param_color)
-			param_color = pick("red","blue","pink","brown","green","cyan","yellow")
-		icon_state = "screwdriver_[param_color]"
-
-	if (prob(75))
-		src.pixel_y = rand(0, 16)
-
-/obj/item/screwdriver/attack(mob/living/carbon/M, mob/living/carbon/user)
-	if(!istype(M) || user.a_intent == INTENT_HELP)
-		return ..()
-	if(user.zone_selected != "eyes" && user.zone_selected != "head")
-		return ..()
-	if(HAS_TRAIT(user, TRAIT_PACIFISM))
-		to_chat(user, "<span class='warning'>You don't want to harm [M]!</span>")
-		return
-	if((CLUMSY in user.mutations) && prob(50))
-		M = user
-	return eyestab(M,user)
-
-/obj/item/screwdriver/brass
-	name = "brass screwdriver"
-	desc = "A screwdriver made of brass. The handle feels freezing cold."
-	icon_state = "screwdriver_brass"
-	toolspeed = 0.5
-	random_color = FALSE
-	resistance_flags = FIRE_PROOF | ACID_PROOF
-
-/obj/item/screwdriver/abductor
-	name = "alien screwdriver"
-	desc = "An ultrasonic screwdriver."
-	icon = 'icons/obj/abductor.dmi'
-	icon_state = "screwdriver"
-	usesound = 'sound/items/pshoom.ogg'
-	toolspeed = 0.1
-	random_color = FALSE
-
-/obj/item/screwdriver/power
-	name = "hand drill"
-	desc = "A simple hand drill with a screwdriver bit attached."
-	icon_state = "drill_screw"
-	item_state = "drill"
-	materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25)
-	origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get
-	force = 8 //might or might not be too high, subject to change
-	throwforce = 8
-	throw_speed = 2
-	throw_range = 3//it's heavier than a screw driver/wrench, so it does more damage, but can't be thrown as far
-	attack_verb = list("drilled", "screwed", "jabbed","whacked")
-	hitsound = 'sound/items/drill_hit.ogg'
-	usesound = 'sound/items/drill_use.ogg'
-	toolspeed = 0.25
-	random_color = FALSE
-
-/obj/item/screwdriver/power/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] is putting [src] to [user.p_their()] temple. It looks like [user.p_theyre()] trying to commit suicide!</span>")
-	return BRUTELOSS
-
-/obj/item/screwdriver/power/attack_self(mob/user)
-	playsound(get_turf(user), 'sound/items/change_drill.ogg', 50, 1)
-	var/obj/item/wrench/power/b_drill = new /obj/item/wrench/power
-	to_chat(user, "<span class='notice'>You attach the bolt driver bit to [src].</span>")
-	qdel(src)
-	user.put_in_active_hand(b_drill)
-
-/obj/item/screwdriver/cyborg
-	name = "powered screwdriver"
-	desc = "An electrical screwdriver, designed to be both precise and quick."
-	usesound = 'sound/items/drill_use.ogg'
-	toolspeed = 0.5
-
-//Wirecutters
-/obj/item/wirecutters
-	name = "wirecutters"
-	desc = "This cuts wires."
-	icon = 'icons/obj/tools.dmi'
-	icon_state = "cutters"
-	flags = CONDUCT
-	slot_flags = SLOT_BELT
-	force = 6
-	throw_speed = 3
-	throw_range = 7
-	w_class = WEIGHT_CLASS_SMALL
-	materials = list(MAT_METAL=80)
-	origin_tech = "materials=1;engineering=1"
-	attack_verb = list("pinched", "nipped")
-	hitsound = 'sound/items/wirecutter.ogg'
-	usesound = 'sound/items/wirecutter.ogg'
-	sharp = 1
-	toolspeed = 1
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
-	var/random_color = TRUE
-
-/obj/item/wirecutters/New(loc, param_color = null)
-	..()
-	if(random_color)
-		if(!param_color)
-			param_color = pick("yellow", "red")
-		icon_state = "cutters_[param_color]"
-
-/obj/item/wirecutters/attack(mob/living/carbon/C, mob/user)
-	if(istype(C) && C.handcuffed && istype(C.handcuffed, /obj/item/restraints/handcuffs/cable))
-		user.visible_message("<span class='notice'>[user] cuts [C]'s restraints with [src]!</span>")
-		QDEL_NULL(C.handcuffed)
-		if(C.buckled && C.buckled.buckle_requires_restraints)
-			C.buckled.unbuckle_mob(C)
-		C.update_handcuffed()
-		return
-	else
-		..()
-
-/obj/item/wirecutters/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] is cutting at [user.p_their()] arteries with [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
-	playsound(loc, usesound, 50, 1, -1)
-	return BRUTELOSS
-
-/obj/item/wirecutters/brass
-	name = "brass wirecutters"
-	desc = "A pair of wirecutters made of brass. The handle feels freezing cold to the touch."
-	icon_state = "cutters_brass"
-	toolspeed = 0.5
-	random_color = FALSE
-	resistance_flags = FIRE_PROOF | ACID_PROOF
-
-/obj/item/wirecutters/abductor
-	name = "alien wirecutters"
-	desc = "Extremely sharp wirecutters, made out of a silvery-green metal."
-	icon = 'icons/obj/abductor.dmi'
-	icon_state = "cutters"
-	toolspeed = 0.1
-	origin_tech = "materials=5;engineering=4;abductor=3"
-	random_color = FALSE
-
-/obj/item/wirecutters/cyborg
-	name = "wirecutters"
-	desc = "This cuts wires."
-	toolspeed = 0.5
-
-/obj/item/wirecutters/power
-	name = "jaws of life"
-	desc = "A set of jaws of life, the magic of science has managed to fit it down into a device small enough to fit in a tool belt. It's fitted with a cutting head."
-	icon_state = "jaws_cutter"
-	item_state = "jawsoflife"
-	origin_tech = "materials=2;engineering=2"
-	materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25)
-	usesound = 'sound/items/jaws_cut.ogg'
-	toolspeed = 0.25
-	random_color = FALSE
-
-/obj/item/wirecutters/power/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] is wrapping \the [src] around [user.p_their()] neck. It looks like [user.p_theyre()] trying to rip [user.p_their()] head off!</span>")
-	playsound(loc, 'sound/items/jaws_cut.ogg', 50, 1, -1)
-	if(ishuman(user))
-		var/mob/living/carbon/human/H = user
-		var/obj/item/organ/external/head/head = H.bodyparts_by_name["head"]
-		if(head)
-			head.droplimb(0, DROPLIMB_BLUNT, FALSE, TRUE)
-			playsound(loc,pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg') ,50, 1, -1)
-	return BRUTELOSS
-
-/obj/item/wirecutters/power/attack_self(mob/user)
-	playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1)
-	var/obj/item/crowbar/power/pryjaws = new /obj/item/crowbar/power
-	to_chat(user, "<span class='notice'>You attach the pry jaws to [src].</span>")
-	qdel(src)
-	user.put_in_active_hand(pryjaws)
-
-//Welding Tool
-/obj/item/weldingtool
-	name = "welding tool"
-	desc = "A standard edition welder provided by Nanotrasen."
-	icon = 'icons/obj/tools.dmi'
-	icon_state = "welder"
-	item_state = "welder"
-	flags = CONDUCT
-	slot_flags = SLOT_BELT
-	force = 3
-	throwforce = 5
-	throw_speed = 3
-	throw_range = 5
-	hitsound = "swing_hit"
-	usesound = 'sound/items/welder.ogg'
-	var/acti_sound = 'sound/items/welderactivate.ogg'
-	var/deac_sound = 'sound/items/welderdeactivate.ogg'
-	w_class = WEIGHT_CLASS_SMALL
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
-	resistance_flags = FIRE_PROOF
-	materials = list(MAT_METAL=70, MAT_GLASS=30)
-	origin_tech = "engineering=1;plasmatech=1"
-	toolspeed = 1
-	var/welding = 0 	//Whether or not the welding tool is off(0), on(1) or currently welding(2)
-	var/status = 1 		//Whether the welder is secured or unsecured (able to attach rods to it to make a flamethrower)
-	var/max_fuel = 20 	//The max amount of fuel the welder can hold
-	var/change_icons = 1
-	var/can_off_process = 0
-	var/light_intensity = 2 //how powerful the emitted light is when used.
-	var/nextrefueltick = 0
-
-/obj/item/weldingtool/New()
-	..()
-	create_reagents(max_fuel)
-	reagents.add_reagent("fuel", max_fuel)
-	update_icon()
-
-/obj/item/weldingtool/examine(mob/user)
-	. = ..()
-	if(get_dist(user, src) <= 0)
-		. += "It contains [get_fuel()] unit\s of fuel out of [max_fuel]."
-
-/obj/item/weldingtool/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] welds [user.p_their()] every orifice closed! It looks like [user.p_theyre()] trying to commit suicide!</span>")
-	return FIRELOSS
-
-/obj/item/weldingtool/proc/update_torch()
-	overlays.Cut()
-	if(welding)
-		overlays += "[initial(icon_state)]-on"
-		item_state = "[initial(item_state)]1"
-	else
-		item_state = "[initial(item_state)]"
-
-/obj/item/weldingtool/update_icon()
-	if(change_icons)
-		var/ratio = get_fuel() / max_fuel
-		ratio = Ceiling(ratio*4) * 25
-		if(ratio == 100)
-			icon_state = initial(icon_state)
-		else
-			icon_state = "[initial(icon_state)][ratio]"
-	update_torch()
-	..()
-
-/obj/item/weldingtool/process()
-	switch(welding)
-		if(0)
-			force = 3
-			damtype = "brute"
-			update_icon()
-			if(!can_off_process)
-				STOP_PROCESSING(SSobj, src)
-			return
-	//Welders left on now use up fuel, but lets not have them run out quite that fast
-		if(1)
-			force = 15
-			damtype = "fire"
-			if(prob(5))
-				remove_fuel(1)
-			update_icon()
-
-	//This is to start fires. process() is only called if the welder is on.
-	var/turf/location = loc
-	if(ismob(location))
-		var/mob/M = location
-		if(M.l_hand == src || M.r_hand == src)
-			location = get_turf(M)
-	if(isturf(location))
-		location.hotspot_expose(700, 5)
-
-/obj/item/weldingtool/attackby(obj/item/I, mob/user, params)
-	if(isscrewdriver(I))
-		flamethrower_screwdriver(I, user)
-	else if(istype(I, /obj/item/stack/rods))
-		flamethrower_rods(I, user)
-	else
-		..()
-
-/obj/item/weldingtool/attack(mob/M, mob/user)
-	if(ishuman(M))
-		var/mob/living/carbon/human/H = M
-		var/obj/item/organ/external/S = H.bodyparts_by_name[user.zone_selected]
-
-		if(!S)
-			return
-
-		if(!S.is_robotic() || user.a_intent != INTENT_HELP || S.open == 2)
-			return ..()
-
-		if(!isOn())		//why wasn't this being checked already?
-			to_chat(user, "<span class='warning'>Turn on [src] before attempting repairs!</span>")
-			return 1
-
-		if(S.brute_dam > ROBOLIMB_SELF_REPAIR_CAP)
-			to_chat(user, "<span class='danger'>The damage is far too severe to patch over externally.</span>")
-			return
-
-		if(!S.brute_dam)
-			to_chat(user, "<span class='notice'>Nothing to fix!</span>")
-			return
-
-		if(get_fuel() >= 1)
-			if(H == user)
-				if(!do_mob(user, H, 10))
-					return 1
-			if(!remove_fuel(1,null))
-				to_chat(user, "<span class='warning'>Need more welding fuel!</span>")
-			var/rembrute = HEALPERWELD
-			var/nrembrute = 0
-			var/childlist
-			if(!isnull(S.children))
-				childlist = S.children.Copy()
-			var/parenthealed = FALSE
-			while(rembrute > 0)
-				var/obj/item/organ/external/E
-				if(S.brute_dam)
-					E = S
-				else if(LAZYLEN(childlist))
-					E = pick_n_take(childlist)
-					if(!E.brute_dam || !E.is_robotic())
-						continue
-				else if(S.parent && !parenthealed)
-					E = S.parent
-					parenthealed = TRUE
-					if(!E.brute_dam || !E.is_robotic())
-						break
-				else
-					break
-				playsound(src.loc, usesound, 50, 1)
-				nrembrute = max(rembrute - E.brute_dam, 0)
-				E.heal_damage(rembrute,0,0,1)
-				rembrute = nrembrute
-				user.visible_message("<span class='alert'>\The [user] patches some dents on \the [M]'s [E.name] with \the [src].</span>")
-			if(H.bleed_rate && H.isSynthetic())
-				H.bleed_rate = 0
-				user.visible_message("<span class='alert'>\The [user] patches some leaks on [M] with \the [src].</span>")
-			return 1
-	else
-		return ..()
-
-/obj/item/weldingtool/afterattack(atom/O, mob/user, proximity)
-	if(!proximity)
-		return
-	if(welding)
-		remove_fuel(1)
-		var/turf/location = get_turf(user)
-		location.hotspot_expose(700, 50, 1)
-		if(get_fuel() <= 0)
-			set_light(0)
-
-		if(isliving(O))
-			var/mob/living/L = O
-			if(L.IgniteMob())
-				message_admins("[key_name_admin(user)] set [key_name_admin(L)] on fire")
-				log_game("[key_name(user)] set [key_name(L)] on fire")
-
-/obj/item/weldingtool/attack_self(mob/user)
-	switched_on(user)
-	if(welding)
-		set_light(light_intensity)
-
-	update_icon()
-
-//Returns the amount of fuel in the welder
-/obj/item/weldingtool/proc/get_fuel()
-	return reagents.get_reagent_amount("fuel")
-
-//Removes fuel from the welding tool. If a mob is passed, it will try to flash the mob's eyes. This should probably be renamed to use()
-/obj/item/weldingtool/proc/remove_fuel(amount = 1, mob/living/M = null)
-	if(!welding || !check_fuel())
-		return FALSE
-	if(get_fuel() >= amount)
-		reagents.remove_reagent("fuel", amount)
-		check_fuel()
-		if(M)
-			M.flash_eyes(light_intensity)
-		return TRUE
-	else
-		if(M)
-			to_chat(M, "<span class='notice'>You need more welding fuel to complete this task.</span>")
-		return FALSE
-
-//Returns whether or not the welding tool is currently on.
-/obj/item/weldingtool/proc/isOn()
-	return welding
-
-//Turns off the welder if there is no more fuel (does this really need to be its own proc?)
-/obj/item/weldingtool/proc/check_fuel(mob/user)
-	if(get_fuel() <= 0 && welding)
-		switched_on(user)
-		update_icon()
-		//mob icon update
-		if(ismob(loc))
-			var/mob/M = loc
-			M.update_inv_r_hand(0)
-			M.update_inv_l_hand(0)
-		return 0
-	return 1
-
-//Switches the welder on
-/obj/item/weldingtool/proc/switched_on(mob/user)
-	if(!status)
-		to_chat(user, "<span class='warning'>[src] can't be turned on while unsecured!</span>")
-		return
-	welding = !welding
-	if(welding)
-		if(get_fuel() >= 1)
-			to_chat(user, "<span class='notice'>You switch [src] on.</span>")
-			playsound(loc, acti_sound, 50, 1)
-			force = 15
-			damtype = "fire"
-			hitsound = 'sound/items/welder.ogg'
-			update_icon()
-			START_PROCESSING(SSobj, src)
-		else
-			to_chat(user, "<span class='warning'>You need more fuel!</span>")
-			switched_off(user)
-	else
-		if(user)
-			to_chat(user, "<span class='notice'>You switch [src] off.</span>")
-		playsound(loc, deac_sound, 50, 1)
-		switched_off(user)
-
-//Switches the welder off
-/obj/item/weldingtool/proc/switched_off(mob/user)
-	welding = 0
-	set_light(0)
-
-	force = 3
-	damtype = "brute"
-	hitsound = "swing_hit"
-	update_icon()
-
-/obj/item/weldingtool/proc/flamethrower_screwdriver(obj/item/I, mob/user)
-	if(welding)
-		to_chat(user, "<span class='warning'>Turn it off first!</span>")
-		return
-	status = !status
-	if(status)
-		to_chat(user, "<span class='notice'>You resecure [src].</span>")
-	else
-		to_chat(user, "<span class='notice'>[src] can now be attached and modified.</span>")
-	add_fingerprint(user)
-
-/obj/item/weldingtool/proc/flamethrower_rods(obj/item/I, mob/user)
-	if(!status)
-		var/obj/item/stack/rods/R = I
-		if(R.use(1))
-			var/obj/item/flamethrower/F = new /obj/item/flamethrower(user.loc)
-			if(!remove_item_from_storage(F))
-				user.unEquip(src)
-				loc = F
-			F.weldtool = src
-			add_fingerprint(user)
-			to_chat(user, "<span class='notice'>You add a rod to a welder, starting to build a flamethrower.</span>")
-			user.put_in_hands(F)
-		else
-			to_chat(user, "<span class='warning'>You need one rod to start building a flamethrower!</span>")
-
-/obj/item/weldingtool/largetank
-	name = "Industrial Welding Tool"
-	desc = "A slightly larger welder with a larger tank."
-	icon_state = "indwelder"
-	max_fuel = 40
-	materials = list(MAT_METAL=70, MAT_GLASS=60)
-	origin_tech = "engineering=2;plasmatech=2"
-
-/obj/item/weldingtool/largetank/cyborg
-	name = "integrated welding tool"
-	desc = "An advanced welder designed to be used in robotic systems."
-	toolspeed = 0.5
-
-/obj/item/weldingtool/largetank/flamethrower_screwdriver()
-	return
-
-/obj/item/weldingtool/mini
-	name = "emergency welding tool"
-	desc = "A miniature welder used during emergencies."
-	icon_state = "miniwelder"
-	max_fuel = 10
-	w_class = WEIGHT_CLASS_TINY
-	materials = list(MAT_METAL=30, MAT_GLASS=10)
-	change_icons = 0
-
-/obj/item/weldingtool/mini/flamethrower_screwdriver()
-	return
-
-/obj/item/weldingtool/abductor
-	name = "alien welding tool"
-	desc = "An alien welding tool. Whatever fuel it uses, it never runs out."
-	icon = 'icons/obj/abductor.dmi'
-	icon_state = "welder"
-	toolspeed = 0.1
-	light_intensity = 0
-	change_icons = 0
-	origin_tech = "plasmatech=5;engineering=5;abductor=3"
-	can_off_process = 1
-
-/obj/item/weldingtool/abductor/process()
-	if(get_fuel() <= max_fuel)
-		reagents.add_reagent("fuel", 1)
-	..()
-
-/obj/item/weldingtool/hugetank
-	name = "Upgraded Welding Tool"
-	desc = "An upgraded welder based off the industrial welder."
-	icon_state = "upindwelder"
-	item_state = "upindwelder"
-	max_fuel = 80
-	materials = list(MAT_METAL=70, MAT_GLASS=120)
-	origin_tech = "engineering=3;plasmatech=2"
-
-/obj/item/weldingtool/experimental
-	name = "Experimental Welding Tool"
-	desc = "An experimental welder capable of self-fuel generation and less harmful to the eyes."
-	icon_state = "exwelder"
-	item_state = "exwelder"
-	max_fuel = 40
-	materials = list(MAT_METAL=70, MAT_GLASS=120)
-	origin_tech = "materials=4;engineering=4;bluespace=3;plasmatech=4"
-	change_icons = 0
-	can_off_process = 1
-	light_intensity = 1
-	toolspeed = 0.5
-	var/last_gen = 0
-
-/obj/item/weldingtool/experimental/brass
-	name = "brass welding tool"
-	desc = "A brass welder that seems to constantly refuel itself. It is faintly warm to the touch."
-	icon_state = "brasswelder"
-	item_state = "brasswelder"
-	resistance_flags = FIRE_PROOF | ACID_PROOF
-
-obj/item/weldingtool/experimental/process()
-	..()
-	if(get_fuel() < max_fuel && nextrefueltick < world.time)
-		nextrefueltick = world.time + 10
-		reagents.add_reagent("fuel", 1)
-
-//Crowbar
-/obj/item/crowbar
-	name = "pocket crowbar"
-	desc = "A small crowbar. This handy tool is useful for lots of things, such as prying floor tiles or opening unpowered doors."
-	icon = 'icons/obj/tools.dmi'
-	icon_state = "crowbar"
-	item_state = "crowbar"
-	usesound = 'sound/items/crowbar.ogg'
-	flags = CONDUCT
-	slot_flags = SLOT_BELT
-	force = 5
-	throwforce = 7
-	item_state = "crowbar"
-	w_class = WEIGHT_CLASS_SMALL
-	materials = list(MAT_METAL=50)
-	origin_tech = "engineering=1;combat=1"
-	attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
-	toolspeed = 1
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
-
-/obj/item/crowbar/red
-	icon_state = "crowbar_red"
-	item_state = "crowbar_red"
-	force = 8
-
-/obj/item/crowbar/brass
-	name = "brass crowbar"
-	desc = "A brass crowbar. It feels faintly warm to the touch."
-	icon_state = "crowbar_brass"
-	item_state = "crowbar_brass"
-	toolspeed = 0.5
-	resistance_flags = FIRE_PROOF | ACID_PROOF
-
-/obj/item/crowbar/abductor
-	name = "alien crowbar"
-	desc = "A hard-light crowbar. It appears to pry by itself, without any effort required."
-	icon = 'icons/obj/abductor.dmi'
-	usesound = 'sound/weapons/sonic_jackhammer.ogg'
-	icon_state = "crowbar"
-	toolspeed = 0.1
-	origin_tech = "combat=4;engineering=4;abductor=3"
-
-/obj/item/crowbar/large
-	name = "crowbar"
-	desc = "It's a big crowbar. It doesn't fit in your pockets, because its too big."
-	force = 12
-	w_class = WEIGHT_CLASS_NORMAL
-	throw_speed = 3
-	throw_range = 3
-	materials = list(MAT_METAL=70)
-	icon_state = "crowbar_large"
-	item_state = "crowbar_large"
-	toolspeed = 0.5
-
-/obj/item/crowbar/cyborg
-	name = "hydraulic crowbar"
-	desc = "A hydraulic prying tool, compact but powerful. Designed to replace crowbar in construction cyborgs."
-	usesound = 'sound/items/jaws_pry.ogg'
-	force = 10
-	toolspeed = 0.5
-
-/obj/item/crowbar/power
-	name = "jaws of life"
-	desc = "A set of jaws of life, the magic of science has managed to fit it down into a device small enough to fit in a tool belt. It's fitted with a prying head."
-	icon_state = "jaws_pry"
-	item_state = "jawsoflife"
-	materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25)
-	origin_tech = "materials=2;engineering=2"
-	usesound = 'sound/items/jaws_pry.ogg'
-	force = 15
-	toolspeed = 0.25
-	var/airlock_open_time = 100 // Time required to open powered airlocks
-
-/obj/item/crowbar/power/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] is putting [user.p_their()] head in [src]. It looks like [user.p_theyre()] trying to commit suicide!</span>")
-	playsound(loc, 'sound/items/jaws_pry.ogg', 50, 1, -1)
-	return BRUTELOSS
-
-/obj/item/crowbar/power/attack_self(mob/user)
-	playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1)
-	var/obj/item/wirecutters/power/cutjaws = new /obj/item/wirecutters/power
-	to_chat(user, "<span class='notice'>You attach the cutting jaws to [src].</span>")
-	qdel(src)
-	user.put_in_active_hand(cutjaws)
-
-// Conversion kit
-/obj/item/conversion_kit
-	name = "\improper Revolver Conversion Kit"
-	desc = "A professional conversion kit used to convert any knock off revolver into the real deal capable of shooting lethal .357 rounds without the possibility of catastrophic failure."
-	icon_state = "kit"
-	flags = CONDUCT
-	w_class = WEIGHT_CLASS_SMALL
-	origin_tech = "combat=2"
-	var/open = 0
-
-/obj/item/conversion_kit/New()
-	..()
-	update_icon()
-
-/obj/item/conversion_kit/update_icon()
-	icon_state = "[initial(icon_state)]_[open]"
-
-/obj/item/conversion_kit/attack_self(mob/user)
-	open = !open
-	to_chat(user, "<span class='notice'>You [open ? "open" : "close"] the conversion kit.</span>")
-	update_icon()

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."

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

@@ -34,15 +34,15 @@
 		if(TH.force_wielded > initial(TH.force_wielded))
 			to_chat(user, "<span class='warning'>[TH] has already been refined before. It cannot be sharpened further!</span>")
 			return
-		TH.force_wielded = Clamp(TH.force_wielded + increment, 0, max)//wieldforce is increased since normal force wont stay
+		TH.force_wielded = clamp(TH.force_wielded + increment, 0, max)//wieldforce is increased since normal force wont stay
 	if(I.force > initial(I.force))
 		to_chat(user, "<span class='warning'>[I] has already been refined before. It cannot be sharpened further!</span>")
 		return
 	user.visible_message("<span class='notice'>[user] sharpens [I] with [src]!</span>", "<span class='notice'>You sharpen [I], making it much more deadly than before.</span>")
 	if(!requires_sharpness)
 		I.sharp = 1
-	I.force = Clamp(I.force + increment, 0, max)
-	I.throwforce = Clamp(I.throwforce + increment, 0, max)
+	I.force = clamp(I.force + increment, 0, max)
+	I.throwforce = clamp(I.throwforce + increment, 0, max)
 	I.name = "[prefix] [I.name]"
 	playsound(get_turf(src), usesound, 50, 1)
 	name = "worn out [name]"

code/game/objects/obj_defense.dm

@@ -30,9 +30,9 @@
 			return 0
 	var/armor_protection = 0
 	if(damage_flag)
-		armor_protection = armor[damage_flag]
+		armor_protection = armor.getRating(damage_flag)
 	if(armor_protection)		//Only apply weak-against-armor/hollowpoint effects if there actually IS armor.
-		armor_protection = Clamp(armor_protection - armour_penetration, min(armor_protection, 0), 100)
+		armor_protection = clamp(armor_protection - armour_penetration, min(armor_protection, 0), 100)
 	return round(damage_amount * (100 - armor_protection)*0.01, DAMAGE_PRECISION)
 
 ///the sound played when the obj is damaged.
@@ -201,7 +201,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e
 			return
 	..()
 	if(exposed_temperature && !(resistance_flags & FIRE_PROOF))
-		take_damage(Clamp(0.02 * exposed_temperature, 0, 20), BURN, "fire", 0)
+		take_damage(clamp(0.02 * exposed_temperature, 0, 20), BURN, "fire", 0)
 	if(!(resistance_flags & ON_FIRE) && (resistance_flags & FLAMMABLE) && !(resistance_flags & FIRE_PROOF))
 		resistance_flags |= ON_FIRE
 		SSfires.processing[src] = src

code/game/objects/objs.dm

@@ -1,15 +1,14 @@
 /obj
 	//var/datum/module/mod		//not used
 	var/origin_tech = null	//Used by R&D to determine what research bonuses it grants.
-	var/crit_fail = 0
+	var/crit_fail = FALSE
 	animate_movement = 2
-	var/list/attack_verb = list() //Used in attackby() to say how something was attacked "[x] has been [z.attack_verb] by [y] with [z]"
 	var/list/species_exception = null	// list() of species types, if a species cannot put items in a certain slot, but species type is in list, it will be able to wear that item
-	var/sharp = 0		// whether this object cuts
-	var/in_use = 0 // If we have a user using us, this will be set on. We will check if the user has stopped using us, and thus stop updating and LAGGING EVERYTHING!
+	var/sharp = FALSE		// whether this object cuts
+	var/in_use = FALSE // If we have a user using us, this will be set on. We will check if the user has stopped using us, and thus stop updating and LAGGING EVERYTHING!
 	var/damtype = "brute"
 	var/force = 0
-	var/list/armor
+	var/datum/armor/armor
 	var/obj_integrity	//defaults to max_integrity
 	var/max_integrity = 500
 	var/integrity_failure = 0 //0 if we have no special broken behavior
@@ -22,9 +21,9 @@
 
 	var/can_be_hit = TRUE //can this be bludgeoned by items?
 
-	var/Mtoollink = 0 // variable to decide if an object should show the multitool menu linking menu, not all objects use it
+	var/Mtoollink = FALSE // variable to decide if an object should show the multitool menu linking menu, not all objects use it
 
-	var/being_shocked = 0
+	var/being_shocked = FALSE
 	var/speed_process = FALSE
 
 	var/on_blueprints = FALSE //Are we visible on the station blueprints at roundstart?
@@ -33,8 +32,6 @@
 
 /obj/New()
 	..()
-	if(!armor)
-		armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
 	if(obj_integrity == null)
 		obj_integrity = max_integrity
 	if(on_blueprints && isturf(loc))
@@ -44,25 +41,34 @@
 		else
 			T.add_blueprints_preround(src)
 
-/obj/Topic(href, href_list, var/nowindow = 0, var/datum/topic_state/state = GLOB.default_state)
+/obj/Initialize(mapload)
+	. = ..()
+	if(islist(armor))
+		armor = getArmor(arglist(armor))
+	else if(!armor)
+		armor = getArmor()
+	else if(!istype(armor, /datum/armor))
+		stack_trace("Invalid type [armor.type] found in .armor during /obj Initialize()")
+
+/obj/Topic(href, href_list, nowindow = FALSE, datum/topic_state/state = GLOB.default_state)
 	// Calling Topic without a corresponding window open causes runtime errors
 	if(!nowindow && ..())
-		return 1
+		return TRUE
 
 	// In the far future no checks are made in an overriding Topic() beyond if(..()) return
 	// Instead any such checks are made in CanUseTopic()
 	if(CanUseTopic(usr, state, href_list) == STATUS_INTERACTIVE)
 		CouldUseTopic(usr)
-		return 0
+		return FALSE
 
 	CouldNotUseTopic(usr)
-	return 1
+	return TRUE
 
-/obj/proc/CouldUseTopic(var/mob/user)
+/obj/proc/CouldUseTopic(mob/user)
 	var/atom/host = nano_host()
 	host.add_fingerprint(user)
 
-/obj/proc/CouldNotUseTopic(var/mob/user)
+/obj/proc/CouldNotUseTopic(mob/user)
 	// Nada
 
 /obj/Destroy()
@@ -110,23 +116,23 @@
 	//		null if object handles breathing logic for lifeform
 	//		datum/air_group to tell lifeform to process using that breath return
 	//DEFAULT: Take air from turf to give to have mob process
-	if(breath_request>0)
+	if(breath_request > 0)
 		return remove_air(breath_request)
 	else
 		return null
 
 /obj/proc/updateUsrDialog()
 	if(in_use)
-		var/is_in_use = 0
+		var/is_in_use = FALSE
 		var/list/nearby = viewers(1, src)
 		for(var/mob/M in nearby)
 			if((M.client && M.machine == src))
-				is_in_use = 1
+				is_in_use = TRUE
 				src.attack_hand(M)
 		if(istype(usr, /mob/living/silicon/ai) || istype(usr, /mob/living/silicon/robot))
 			if(!(usr in nearby))
 				if(usr.client && usr.machine==src) // && M.machine == src is omitted because if we triggered this by using the dialog, it doesn't matter if our machine changed in between triggering it and this - the dialog is probably still supposed to refresh.
-					is_in_use = 1
+					is_in_use = TRUE
 					src.attack_ai(usr)
 
 		// check for TK users
@@ -134,8 +140,8 @@
 		if(istype(usr, /mob/living/carbon/human))
 			if(istype(usr.l_hand, /obj/item/tk_grab) || istype(usr.r_hand, /obj/item/tk_grab/))
 				if(!(usr in nearby))
-					if(usr.client && usr.machine==src)
-						is_in_use = 1
+					if(usr.client && usr.machine == src)
+						is_in_use = TRUE
 						src.attack_hand(usr)
 		in_use = is_in_use
 
@@ -143,15 +149,15 @@
 	// Check that people are actually using the machine. If not, don't update anymore.
 	if(in_use)
 		var/list/nearby = viewers(1, src)
-		var/is_in_use = 0
+		var/is_in_use = FALSE
 		for(var/mob/M in nearby)
 			if((M.client && M.machine == src))
-				is_in_use = 1
+				is_in_use = TRUE
 				src.interact(M)
 		var/ai_in_use = AutoUpdateAI(src)
 
 		if(!ai_in_use && !is_in_use)
-			in_use = 0
+			in_use = FALSE
 
 /obj/proc/interact(mob/user)
 	return
@@ -168,12 +174,12 @@
 /atom/movable/proc/on_unset_machine(mob/user)
 	return
 
-/mob/proc/set_machine(var/obj/O)
+/mob/proc/set_machine(obj/O)
 	if(src.machine)
 		unset_machine()
 	src.machine = O
 	if(istype(O))
-		O.in_use = 1
+		O.in_use = TRUE
 
 /obj/item/proc/updateSelfDialog()
 	var/mob/M = src.loc
@@ -183,48 +189,48 @@
 /obj/proc/hide(h)
 	return
 
-
 /obj/proc/hear_talk(mob/M, list/message_pieces)
 	return
 
-/obj/proc/hear_message(mob/M as mob, text)
+/obj/proc/hear_message(mob/M, text)
 
-/obj/proc/multitool_menu(var/mob/user,var/obj/item/multitool/P)
+/obj/proc/multitool_menu(mob/user, obj/item/multitool/P)
 	return "<b>NO MULTITOOL_MENU!</b>"
 
-/obj/proc/linkWith(var/mob/user, var/obj/buffer, var/context)
-	return 0
+/obj/proc/linkWith(mob/user, obj/buffer, context)
+	return FALSE
 
-/obj/proc/unlinkFrom(var/mob/user, var/obj/buffer)
-	return 0
+/obj/proc/unlinkFrom(mob/user, obj/buffer)
+	return FALSE
 
-/obj/proc/canLink(var/obj/O, var/context)
-	return 0
+/obj/proc/canLink(obj/O, list/context)
+	return FALSE
 
-/obj/proc/isLinkedWith(var/obj/O)
-	return 0
+/obj/proc/isLinkedWith(obj/O)
+	return FALSE
 
-/obj/proc/getLink(var/idx)
+/obj/proc/getLink(idx)
 	return null
 
-/obj/proc/linkMenu(var/obj/O)
-	var/dat=""
+/obj/proc/linkMenu(obj/O)
+	var/dat = ""
 	if(canLink(O, list()))
 		dat += " <a href='?src=[UID()];link=1'>\[Link\]</a> "
 	return dat
 
-/obj/proc/format_tag(var/label,var/varname, var/act="set_tag")
+/obj/proc/format_tag(label, varname, act = "set_tag")
 	var/value = vars[varname]
-	if(!value || value=="")
-		value="-----"
+	if(!value || value == "")
+		value = "-----"
 	return "<b>[label]:</b> <a href=\"?src=[UID()];[act]=[varname]\">[value]</a>"
 
 
-/obj/proc/update_multitool_menu(mob/user as mob)
+/obj/proc/update_multitool_menu(mob/user)
 	var/obj/item/multitool/P = get_multitool(user)
 
 	if(!istype(P))
-		return 0
+		return FALSE
+
 	var/dat = {"<html>
 	<head>
 		<title>[name] Configuration</title>
@@ -246,13 +252,13 @@ a {
 		<h3>[name]</h3>
 "}
 	if(allowed(user))//no, assistants, you're not ruining all vents on the station with just a multitool
-		dat += multitool_menu(user,P)
+		dat += multitool_menu(user, P)
 		if(Mtoollink)
 			if(P)
 				if(P.buffer)
 					var/id = null
 					if("id_tag" in P.buffer.vars)
-						id=P.buffer:id_tag
+						id = P.buffer:id_tag
 					dat += "<p><b>MULTITOOL BUFFER:</b> [P.buffer] [id ? "([id])" : ""]"
 
 					dat += linkMenu(P.buffer)
@@ -309,12 +315,12 @@ a {
 /obj/singularity_pull(S, current_size)
 	..()
 	if(!anchored || current_size >= STAGE_FIVE)
-		step_towards(src,S)
+		step_towards(src, S)
 
-/obj/proc/container_resist(var/mob/living)
+/obj/proc/container_resist(mob/living)
 	return
 
-/obj/proc/CanAStarPass()
+/obj/proc/CanAStarPass(ID, dir, caller)
 	. = !density
 
 /obj/proc/on_mob_move(dir, mob/user)
@@ -341,6 +347,13 @@ a {
 		.["Make speed process"] = "?_src_=vars;makespeedy=[UID()]"
 	else
 		.["Make normal process"] = "?_src_=vars;makenormalspeed=[UID()]"
+	.["Modify armor values"] = "?_src_=vars;modifyarmor=[UID()]"
 
 /obj/proc/check_uplink_validity()
-	return 1
+	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/structures.dm

@@ -7,8 +7,6 @@
 	var/broken = FALSE
 
 /obj/structure/New()
-	if (!armor)
-		armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
 	..()
 	if(smooth)
 		if(SSticker && SSticker.current_state == GAME_STATE_PLAYING)
@@ -20,6 +18,11 @@
 	if(SSticker)
 		GLOB.cameranet.updateVisibility(src)
 
+/obj/structure/Initialize(mapload)
+	if(!armor)
+		armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+	return ..()
+
 /obj/structure/Destroy()
 	if(SSticker)
 		GLOB.cameranet.updateVisibility(src)

code/game/objects/structures/aliens.dm

@@ -141,7 +141,6 @@
 	return ..()
 
 /obj/structure/alien/weeds/proc/Life()
-	set background = BACKGROUND_ENABLED
 	var/turf/U = get_turf(src)
 
 	if(istype(U, /turf/space))

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

@@ -12,6 +12,8 @@
 	var/opened = FALSE
 	var/welded = FALSE
 	var/locked = FALSE
+	var/large = TRUE
+	var/can_be_emaged = FALSE
 	var/wall_mounted = 0 //never solid (You can always pass over it)
 	var/lastbang
 	var/sound = 'sound/machines/click.ogg'
@@ -23,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()
@@ -143,84 +149,21 @@
 
 /obj/structure/closet/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/rcs) && !opened)
-		if(user in contents) //to prevent self-teleporting.
-			return
 		var/obj/item/rcs/E = W
-		if(E.rcell && (E.rcell.charge >= E.chargecost))
-			if(!is_level_reachable(z))
-				to_chat(user, "<span class='warning'>The rapid-crate-sender can't locate any telepads!</span>")
-				return
-			if(E.mode == 0)
-				if(!E.teleporting)
-					var/list/L = list()
-					var/list/areaindex = list()
-					for(var/obj/machinery/telepad_cargo/R in world)
-						if(R.stage == 0)
-							var/turf/T = get_turf(R)
-							var/tmpname = T.loc.name
-							if(areaindex[tmpname])
-								tmpname = "[tmpname] ([++areaindex[tmpname]])"
-							else
-								areaindex[tmpname] = 1
-							L[tmpname] = R
-					var/desc = input("Please select a telepad.", "RCS") in L
-					E.pad = L[desc]
-					if(!Adjacent(user))
-						to_chat(user, "<span class='notice'>Unable to teleport, too far from crate.</span>")
-						return
-					playsound(E.loc, E.usesound, 50, 1)
-					to_chat(user, "<span class='notice'>Teleporting [name]...</span>")
-					E.teleporting = 1
-					if(!do_after(user, 50 * E.toolspeed, target = src))
-						E.teleporting = 0
-						return
-					E.teleporting = 0
-					if(user in contents)
-						to_chat(user, "<span class='warning'>Error: User located in container--aborting for safety.</span>")
-						playsound(E.loc, 'sound/machines/buzz-sigh.ogg', 50, 1)
-						return
-					if(!(E.rcell && E.rcell.use(E.chargecost)))
-						to_chat(user, "<span class='notice'>Unable to teleport, insufficient charge.</span>")
-						return
-					do_sparks(5, 1, src)
-					do_teleport(src, E.pad, 0)
-					to_chat(user, "<span class='notice'>Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left.</span>")
-					return
-			else
-				E.rand_x = rand(50,200)
-				E.rand_y = rand(50,200)
-				var/L = locate(E.rand_x, E.rand_y, 6)
-				if(!Adjacent(user))
-					to_chat(user, "<span class='notice'>Unable to teleport, too far from crate.</span>")
-					return
-				playsound(E.loc, E.usesound, 50, 1)
-				to_chat(user, "<span class='notice'>Teleporting [name]...</span>")
-				E.teleporting = 1
-				if(!do_after(user, 50, E.toolspeed, target = src))
-					E.teleporting = 0
-					return
-				E.teleporting = 0
-				if(user in contents)
-					to_chat(user, "<span class='warning'>Error: User located in container--aborting for safety.</span>")
-					playsound(E.loc, 'sound/machines/buzz-sigh.ogg', 50, 1)
-					return
-				if(!(E.rcell && E.rcell.use(E.chargecost)))
-					to_chat(user, "<span class='notice'>Unable to teleport, insufficient charge.</span>")
-					return
-				do_sparks(5, 1, src)
-				do_teleport(src, L)
-				to_chat(user, "<span class='notice'>Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left.</span>")
-				return
-		else
-			to_chat(user, "<span class='warning'>Out of charges.</span>")
-			return
+		E.try_send_container(user, src)
 		return
 
 	if(opened)
 		if(istype(W, /obj/item/grab))
-			MouseDrop_T(W:affecting, user)      //act like they were dragged onto the closet
-		if(istype(W,/obj/item/tk_grab))
+			var/obj/item/grab/G = W
+			if(large)
+				MouseDrop_T(G.affecting, user)      //act like they were dragged onto the closet
+			else
+				to_chat(user, "<span class='notice'>[src] is too small to stuff [G.affecting] into!</span>")
+		if(istype(W, /obj/item/tk_grab))
 			return FALSE
+		if(user.a_intent != INTENT_HELP) // Stops you from putting your baton in the closet on accident
+			return
 		if(isrobot(user))
 			return
 		if(!user.drop_item()) //couldn't drop the item
@@ -228,13 +171,20 @@
 			return
 		if(W)
 			W.forceMove(loc)
+			return TRUE // It's resolved. No afterattack needed. Stops you from emagging lockers when putting in an emag
+	else if(can_be_emaged && (istype(W, /obj/item/card/emag) || istype(W, /obj/item/melee/energy/blade) && !broken))
+		emag_act(user)
 	else if(istype(W, /obj/item/stack/packageWrap))
 		return
 	else if(user.a_intent != INTENT_HARM)
-		attack_hand(user)
+		closed_item_click(user)
 	else
 		return ..()
 
+// What happens when the closet is attacked by a random item not on harm mode
+/obj/structure/closet/proc/closed_item_click(mob/user)
+	attack_hand(user)
+
 /obj/structure/closet/welder_act(mob/user, obj/item/I)
 	. = TRUE
 	if(!opened && user.loc == src)
@@ -284,7 +234,7 @@
 	add_fingerprint(user)
 
 /obj/structure/closet/attack_ai(mob/user)
-	if(isrobot(user) && Adjacent(user)) //Robots can open/close it, but not the AI
+	if(isrobot(user) && Adjacent(user) && !istype(user.loc, /obj/machinery/atmospherics)) //Robots can open/close it, but not the AI
 		attack_hand(user)
 
 /obj/structure/closet/relaymove(mob/user)
@@ -408,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/job_closets.dm

@@ -115,6 +115,8 @@
 	new /obj/item/clothing/shoes/black(src)
 	new /obj/item/clothing/glasses/sunglasses/big(src)
 	new /obj/item/clothing/glasses/sunglasses/big(src)
+	new /obj/item/clothing/accessory/lawyers_badge(src)
+	new /obj/item/clothing/accessory/lawyers_badge(src)
 
 //Paramedic
 

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

@@ -55,7 +55,7 @@
 	new /obj/item/radio/headset( src )
 
 /obj/structure/closet/secure_closet/personal/attackby(obj/item/W, mob/user, params)
-	if(!istype(W, /obj/item/card/id))
+	if(opened || !istype(W, /obj/item/card/id))
 		return ..()
 
 	if(broken)

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

@@ -7,10 +7,10 @@
 	opened = 0
 	locked = 1
 	broken = 0
+	can_be_emaged = TRUE
 	max_integrity = 250
 	armor = list("melee" = 30, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80)
 	damage_deflection = 20
-	var/large = 1
 	icon_closed = "secure"
 	var/icon_locked = "secure1"
 	icon_opened = "secureopen"
@@ -66,31 +66,13 @@
 	else
 		to_chat(user, "<span class='notice'>Access Denied</span>")
 
-/obj/structure/closet/secure_closet/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/rcs))
-		return ..()
+/obj/structure/closet/secure_closet/closed_item_click(mob/user)
+	togglelock(user)
 
-	if(opened)
-		if(istype(W, /obj/item/grab))
-			if(large)
-				MouseDrop_T(W:affecting, user)	//act like they were dragged onto the closet
-			else
-				to_chat(user, "<span class='notice'>The locker is too small to stuff [W:affecting] into!</span>")
-		if(isrobot(user))
-			return
-		if(!user.drop_item()) //couldn't drop the item
-			to_chat(user, "<span class='notice'>\The [W] is stuck to your hand, you cannot put it in \the [src]!</span>")
-			return
-		if(W)
-			W.forceMove(loc)
-	else if((istype(W, /obj/item/card/emag)||istype(W, /obj/item/melee/energy/blade)) && !broken)
-		emag_act(user)
-	else if(istype(W,/obj/item/stack/packageWrap) || istype(W,/obj/item/weldingtool))
-		return ..(W, user)
-	else if(user.a_intent != INTENT_HARM)
+/obj/structure/closet/secure_closet/AltClick(mob/user)
+	..()
+	if(Adjacent(user))
 		togglelock(user)
-	else
-		return ..()
 
 /obj/structure/closet/secure_closet/emag_act(mob/user)
 	if(!broken)

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

@@ -426,7 +426,7 @@
 	icon_off = "wall-lockeroff"
 
 	//too small to put a man in
-	large = 0
+	large = FALSE
 
 /obj/structure/closet/secure_closet/wall/update_icon()
 	if(broken)
@@ -466,3 +466,4 @@
 	new /obj/item/gavelhammer(src)
 	new /obj/item/clothing/head/justice_wig(src)
 	new /obj/item/clothing/accessory/medal/legal(src)
+	new /obj/item/clothing/accessory/lawyers_badge(src)

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

@@ -79,111 +79,42 @@
 	return TRUE
 
 /obj/structure/closet/crate/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/rcs) && !src.opened)
-		var/obj/item/rcs/E = W
-		if(E.rcell && (E.rcell.charge >= E.chargecost))
-			if(!is_level_reachable(src.z)) // This is inconsistent with the closet sending code
-				to_chat(user, "<span class='warning'>The rapid-crate-sender can't locate any telepads!</span>")
-				return
-			if(E.mode == 0)
-				if(!E.teleporting)
-					var/list/L = list()
-					var/list/areaindex = list()
-					for(var/obj/machinery/telepad_cargo/R in world)
-						if(R.stage == 0)
-							var/turf/T = get_turf(R)
-							var/tmpname = T.loc.name
-							if(areaindex[tmpname])
-								tmpname = "[tmpname] ([++areaindex[tmpname]])"
-							else
-								areaindex[tmpname] = 1
-							L[tmpname] = R
-					var/desc = input("Please select a telepad.", "RCS") in L
-					E.pad = L[desc]
-					if(!Adjacent(user))
-						to_chat(user, "<span class='notice'>Unable to teleport, too far from crate.</span>")
-						return
-					playsound(E.loc, E.usesound, 50, 1)
-					to_chat(user, "<span class='notice'>Teleporting [src.name]...</span>")
-					E.teleporting = TRUE
-					if(!do_after(user, 50 * E.toolspeed, target = src))
-						E.teleporting = 0
-						return
-					E.teleporting = 0
-					if(!(E.rcell && E.rcell.use(E.chargecost)))
-						to_chat(user, "<span class='notice'>Unable to teleport, insufficient charge.</span>")
-						return
-					do_sparks(5, 1, src)
-					do_teleport(src, E.pad, 0)
-					to_chat(user, "<span class='notice'>Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left.</span>")
-					return
-
-			else
-				E.rand_x = rand(50,200)
-				E.rand_y = rand(50,200)
-				var/L = locate(E.rand_x, E.rand_y, 6)
-				if(!Adjacent(user))
-					to_chat(user, "<span class='notice'>Unable to teleport, too far from crate.</span>")
-					return
-				playsound(E.loc, E.usesound, 50, 1)
-				to_chat(user, "<span class='notice'>Teleporting [src.name]...</span>")
-				E.teleporting = TRUE
-				if(!do_after(user, 50 * E.toolspeed, target = src))
-					E.teleporting = FALSE
-					return
-				E.teleporting = 0
-				if(!(E.rcell && E.rcell.use(E.chargecost)))
-					to_chat(user, "<span class='notice'>Unable to teleport, insufficient charge.</span>")
-					return
-				do_sparks(5, 1, src)
-				do_teleport(src, L)
-				to_chat(user, "<span class='notice'>Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left.</span>")
-				return
-		else
-			to_chat(user, "<span class='warning'>Out of charges.</span>")
-			return
-
-	if(opened)
-		if(isrobot(user))
-			return
-		if(!user.drop_item()) //couldn't drop the item
-			to_chat(user, "<span class='notice'>\The [W] is stuck to your hand, you cannot put it in \the [src]!</span>")
-			return
-		if(W)
-			W.forceMove(loc)
-	else if(istype(W, /obj/item/stack/packageWrap))
+	if(!opened && try_rig(W, user))
 		return
-	else if(istype(W, /obj/item/stack/cable_coil))
+	return ..()
+
+/obj/structure/closet/crate/proc/try_rig(obj/item/W, mob/user)
+	if(istype(W, /obj/item/stack/cable_coil))
 		var/obj/item/stack/cable_coil/C = W
 		if(rigged)
 			to_chat(user, "<span class='notice'>[src] is already rigged!</span>")
-			return
+			return TRUE
 		if(C.use(15))
 			to_chat(user, "<span class='notice'>You rig [src].</span>")
 			rigged = TRUE
 		else
 			to_chat(user, "<span class='warning'>You need atleast 15 wires to rig [src]!</span>")
-			return
-	else if(istype(W, /obj/item/radio/electropack))
+		return TRUE
+	if(istype(W, /obj/item/radio/electropack))
 		if(rigged)
+			if(!user.drop_item())
+				to_chat(user, "<span class='warning'>[W] seems to be stuck to your hand!</span>")
+				return TRUE
 			to_chat(user, "<span class='notice'>You attach [W] to [src].</span>")
-			user.drop_item()
 			W.forceMove(src)
-			return
-	else if(istype(W, /obj/item/wirecutters))
-		if(rigged)
-			to_chat(user, "<span class='notice'>You cut away the wiring.</span>")
-			playsound(loc, W.usesound, 100, 1)
-			rigged = FALSE
-			return
-	else if(user.a_intent != INTENT_HARM)
-		attack_hand(user)
-	else
-		return ..()
+		return TRUE
 
-/obj/structure/closet/singularity_act()
-	dump_contents()
-	..()
+/obj/structure/closet/crate/wirecutter_act(mob/living/user, obj/item/I)
+	if(opened)
+		return
+	if(!rigged)
+		return
+
+	if(I.use_tool(src, user))
+		to_chat(user, "<span class='notice'>You cut away the wiring.</span>")
+		playsound(loc, I.usesound, 100, 1)
+		rigged = FALSE
+		return TRUE
 
 /obj/structure/closet/crate/welder_act()
 	return
@@ -229,9 +160,10 @@
 	max_integrity = 500
 	armor = list("melee" = 30, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80)
 	damage_deflection = 25
-	var/tamperproof = 0
-	broken = 0
-	locked = 1
+	var/tamperproof = FALSE
+	broken = FALSE
+	locked = TRUE
+	can_be_emaged = TRUE
 
 /obj/structure/closet/crate/secure/update_icon()
 	..()
@@ -307,17 +239,8 @@
 	else
 		src.toggle(user)
 
-
-/obj/structure/closet/crate/secure/attackby(obj/item/W, mob/user, params)
-	if(is_type_in_list(W, list(/obj/item/stack/packageWrap, /obj/item/stack/cable_coil, /obj/item/radio/electropack, /obj/item/wirecutters,/obj/item/rcs)))
-		return ..()
-	if((istype(W, /obj/item/card/emag) || istype(W, /obj/item/melee/energy/blade)))
-		emag_act(user)
-		return
-	if(!opened)
-		src.togglelock(user)
-		return
-	return ..()
+/obj/structure/closet/crate/secure/closed_item_click(mob/user)
+	togglelock(user)
 
 /obj/structure/closet/crate/secure/emag_act(mob/user)
 	if(locked)

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/curtains.dm

@@ -46,7 +46,7 @@
 
 /obj/structure/curtain/screwdriver_act(mob/user, obj/item/I)
 	. = TRUE
-	if(!I.tool_start_check(user, 0))
+	if(!I.tool_start_check(src, user, 0))
 		return
 	if(anchored)
 		user.visible_message("<span class='warning'>[user] unscrews [src] from the floor.</span>", "<span class='notice'>You start to unscrew [src] from the floor...</span>", "You hear rustling noises.")
@@ -65,7 +65,7 @@
 	if(anchored)
 		return
 	. = TRUE
-	if(!I.tool_start_check(user, 0))
+	if(!I.tool_start_check(src, user, 0))
 		return
 	WIRECUTTER_ATTEMPT_DISMANTLE_MESSAGE
 	if(I.use_tool(src, user, 50, volume = I.tool_volume))

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(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)
+	..()