Merge remote-tracking branch 'upstream/master' into internals-auto-push-up

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

@@ -26,7 +26,7 @@
 
 /obj/effect/anomaly/proc/anomalyEffect()
 	if(prob(50))
-		step(src,pick(alldirs))
+		step(src,pick(GLOB.alldirs))
 
 
 /obj/effect/anomaly/proc/anomalyNeutralize()

code/game/objects/effects/bump_teleporter.dm

@@ -1,4 +1,4 @@
-var/list/obj/effect/bump_teleporter/BUMP_TELEPORTERS = list()
+GLOBAL_LIST_EMPTY(bump_teleporters)
 
 /obj/effect/bump_teleporter
 	name = "bump-teleporter"
@@ -13,10 +13,10 @@ var/list/obj/effect/bump_teleporter/BUMP_TELEPORTERS = list()
 
 /obj/effect/bump_teleporter/New()
 	..()
-	BUMP_TELEPORTERS += src
+	GLOB.bump_teleporters += src
 
 /obj/effect/bump_teleporter/Destroy()
-	BUMP_TELEPORTERS -= src
+	GLOB.bump_teleporters -= src
 	return ..()
 
 /obj/effect/bump_teleporter/singularity_act()
@@ -34,7 +34,7 @@ var/list/obj/effect/bump_teleporter/BUMP_TELEPORTERS = list()
 		//user.loc = src.loc	//Stop at teleporter location, there is nowhere to teleport to.
 		return
 
-	for(var/obj/effect/bump_teleporter/BT in BUMP_TELEPORTERS)
+	for(var/obj/effect/bump_teleporter/BT in GLOB.bump_teleporters)
 		if(BT.id == src.id_target)
 			usr.loc = BT.loc	//Teleport to location with correct id.
 			return

code/game/objects/effects/decals/Cleanable/fuel.dm

@@ -26,7 +26,7 @@
 	var/turf/simulated/S = loc
 	if(!istype(S))
 		return
-	for(var/d in cardinal)
+	for(var/d in GLOB.cardinal)
 		if(rand(25))
 			var/turf/simulated/target = get_step(src, d)
 			var/turf/simulated/origin = get_turf(src)

code/game/objects/effects/decals/Cleanable/humans.dm

@@ -1,6 +1,6 @@
 #define DRYING_TIME 5 * 60 * 10 //for 1 unit of depth in puddle (amount var)
 
-var/global/list/image/splatter_cache = list()
+GLOBAL_LIST_EMPTY(splatter_cache)
 
 /obj/effect/decal/cleanable/blood
 	name = "blood"
@@ -86,7 +86,7 @@ var/global/list/image/splatter_cache = list()
 		user.blood_DNA |= blood_DNA.Copy()
 		user.bloody_hands += taken
 		user.hand_blood_color = basecolor
-		user.update_inv_gloves(1)
+		user.update_inv_gloves()
 		user.verbs += /mob/living/carbon/human/proc/bloody_doodle
 
 /obj/effect/decal/cleanable/blood/can_bloodcrawl_in()
@@ -112,7 +112,8 @@ var/global/list/image/splatter_cache = list()
 
 /obj/effect/decal/cleanable/trail_holder //not a child of blood on purpose
 	name = "blood"
-	icon_state = "ltrails_1"
+	icon = 'icons/effects/effects.dmi'
+	icon_state = "nothing"
 	desc = "Your instincts say you shouldn't be following these."
 	gender = PLURAL
 	density = FALSE

code/game/objects/effects/decals/Cleanable/tracks.dm

@@ -2,7 +2,7 @@
 #define TRACKS_CRUSTIFY_TIME   50
 
 // color-dir-dry
-var/global/list/image/fluidtrack_cache = list()
+GLOBAL_LIST_EMPTY(fluidtrack_cache)
 
 // Footprints, tire trails...
 /obj/effect/decal/cleanable/blood/tracks
@@ -55,7 +55,7 @@ var/global/list/image/fluidtrack_cache = list()
 			if(!(entered_dirs & H.dir))
 				entered_dirs |= H.dir
 				update_icon()
-				
+
 /obj/effect/decal/cleanable/blood/footprints/Uncrossed(atom/movable/O)
 	..()
 	if(ishuman(O))
@@ -87,24 +87,24 @@ var/global/list/image/fluidtrack_cache = list()
 /obj/effect/decal/cleanable/blood/footprints/update_icon()
 	overlays.Cut()
 
-	for(var/Ddir in cardinal)
+	for(var/Ddir in GLOB.cardinal)
 		if(entered_dirs & Ddir)
 			var/image/I
-			if(fluidtrack_cache["entered-[blood_state]-[Ddir]"])
-				I = fluidtrack_cache["entered-[blood_state]-[Ddir]"]
+			if(GLOB.fluidtrack_cache["entered-[blood_state]-[Ddir]"])
+				I = GLOB.fluidtrack_cache["entered-[blood_state]-[Ddir]"]
 			else
 				I = image(icon,"[blood_state]1",dir = Ddir)
-				fluidtrack_cache["entered-[blood_state]-[Ddir]"] = I
+				GLOB.fluidtrack_cache["entered-[blood_state]-[Ddir]"] = I
 			if(I)
 				I.color = basecolor
 				overlays += I
 		if(exited_dirs & Ddir)
 			var/image/I
-			if(fluidtrack_cache["exited-[blood_state]-[Ddir]"])
-				I = fluidtrack_cache["exited-[blood_state]-[Ddir]"]
+			if(GLOB.fluidtrack_cache["exited-[blood_state]-[Ddir]"])
+				I = GLOB.fluidtrack_cache["exited-[blood_state]-[Ddir]"]
 			else
 				I = image(icon,"[blood_state]2",dir = Ddir)
-				fluidtrack_cache["exited-[blood_state]-[Ddir]"] = I
+				GLOB.fluidtrack_cache["exited-[blood_state]-[Ddir]"] = I
 			if(I)
 				I.color = basecolor
 				overlays += I

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

@@ -118,10 +118,10 @@ would spawn and follow the beaker, even if it is carried or thrown.
 // will always spawn at the items location, even if it's moved.
 
 /* Example:
-var/datum/effect/system/steam_spread/steam = new /datum/effect/system/steam_spread() -- creates new system
-steam.set_up(5, 0, mob.loc) -- sets up variables
-OPTIONAL: steam.attach(mob)
-steam.start() -- spawns the effect
+	var/datum/effect/system/steam_spread/steam = new /datum/effect/system/steam_spread() -- creates new system
+	steam.set_up(5, 0, mob.loc) -- sets up variables
+	OPTIONAL: steam.attach(mob)
+	steam.start() -- spawns the effect
 */
 /////////////////////////////////////////////
 /obj/effect/effect/steam
@@ -1134,7 +1134,7 @@ steam.start() -- spawns the effect
 		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

@@ -14,11 +14,11 @@ would spawn and follow the beaker, even if it is carried or thrown.
 /obj/effect/particle_effect/New()
 	..()
 	if(SSticker)
-		cameranet.updateVisibility(src)
+		GLOB.cameranet.updateVisibility(src)
 
 /obj/effect/particle_effect/Destroy()
 	if(SSticker)
-		cameranet.updateVisibility(src)
+		GLOB.cameranet.updateVisibility(src)
 	return ..()
 
 /datum/effect_system
@@ -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
@@ -61,14 +63,15 @@ would spawn and follow the beaker, even if it is carried or thrown.
 	total_effects++
 	var/direction
 	if(cardinals)
-		direction = pick(cardinal)
+		direction = pick(GLOB.cardinal)
 	else
-		direction = pick(alldirs)
+		direction = pick(GLOB.alldirs)
 	var/steps_amt = pick(1,2,3)
 	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/effect_system/effects_explosion.dm

@@ -15,7 +15,7 @@
 	for(var/i in 1 to number)
 		spawn(0)
 			var/obj/effect/particle_effect/expl_particles/expl = new /obj/effect/particle_effect/expl_particles(location)
-			var/direct = pick(alldirs)
+			var/direct = pick(GLOB.alldirs)
 			var/steps_amt = pick(1;25,2;50,3,4;200)
 			for(var/j in 1 to steps_amt)
 				sleep(1)

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

@@ -60,7 +60,7 @@
 	if(--amount < 0)
 		return
 
-	for(var/direction in cardinal)
+	for(var/direction in GLOB.cardinal)
 
 		var/turf/T = get_step(src,direction)
 		if(!T)

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

@@ -172,13 +172,13 @@
 
 		// Clamp all values to MAX_EXPLOSION_RANGE
 		if(round(amount/12) > 0)
-			devastation = min (MAX_EX_DEVASTATION_RANGE, devastation + round(amount/12))
+			devastation = min (GLOB.max_ex_devastation_range, devastation + round(amount/12))
 
 		if(round(amount/6) > 0)
-			heavy = min (MAX_EX_HEAVY_RANGE, heavy + round(amount/6))
+			heavy = min (GLOB.max_ex_heavy_range, heavy + round(amount/6))
 
 		if(round(amount/3) > 0)
-			light = min (MAX_EX_LIGHT_RANGE, light + round(amount/3))
+			light = min (GLOB.max_ex_light_range, light + round(amount/3))
 
 		if(flashing && flashing_factor)
 			flash += (round(amount/4) * flashing_factor)

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

@@ -97,9 +97,9 @@
 		var/obj/effect/particle_effect/smoke/S = new effect_type(location)
 		if(!direction)
 			if(cardinals)
-				S.direction = pick(cardinal)
+				S.direction = pick(GLOB.cardinal)
 			else
-				S.direction = pick(alldirs)
+				S.direction = pick(GLOB.alldirs)
 		else
 			S.direction = direction
 		S.steps = pick(0,1,1,1,2,2,2,3)

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

@@ -33,10 +33,10 @@
 // will always spawn at the items location, even if it's moved.
 
 /* Example:
-var/datum/effect_system/steam_spread/steam = new /datum/effect_system/steam_spread() -- creates new system
-steam.set_up(5, 0, mob.loc) -- sets up variables
-OPTIONAL: steam.attach(mob)
-steam.start() -- spawns the effect
+	var/datum/effect_system/steam_spread/steam = new /datum/effect_system/steam_spread() -- creates new system
+	steam.set_up(5, 0, mob.loc) -- sets up variables
+	OPTIONAL: steam.attach(mob)
+	steam.start() -- spawns the effect
 */
 /////////////////////////////////////////////
 /obj/effect/particle_effect/steam

code/game/objects/effects/glowshroom.dm

@@ -102,7 +102,7 @@
 			var/placeCount = 1
 			for(var/obj/structure/glowshroom/shroom in newLoc)
 				shroomCount++
-			for(var/wallDir in cardinal)
+			for(var/wallDir in GLOB.cardinal)
 				var/turf/isWall = get_step(newLoc,wallDir)
 				if(isWall.density)
 					placeCount++
@@ -123,7 +123,7 @@
 /obj/structure/glowshroom/proc/CalcDir(turf/location = loc)
 	var/direction = 16
 
-	for(var/wallDir in cardinal)
+	for(var/wallDir in GLOB.cardinal)
 		var/turf/newTurf = get_step(location,wallDir)
 		if(newTurf.density)
 			direction |= wallDir

code/game/objects/effects/landmarks.dm

@@ -13,80 +13,80 @@
 
 	switch(name)			//some of these are probably obsolete
 		if("start")
-			newplayer_start += loc
+			GLOB.newplayer_start += loc
 			qdel(src)
 
 		if("wizard")
-			wizardstart += loc
+			GLOB.wizardstart += loc
 			qdel(src)
 
 		if("JoinLate")
-			latejoin += loc
+			GLOB.latejoin += loc
 			qdel(src)
 
 		if("JoinLateGateway")
-			latejoin_gateway += loc
+			GLOB.latejoin_gateway += loc
 			qdel(src)
 
 		if("JoinLateCryo")
-			latejoin_cryo += loc
+			GLOB.latejoin_cryo += loc
 			qdel(src)
 
 		if("JoinLateCyborg")
-			latejoin_cyborg += loc
+			GLOB.latejoin_cyborg += loc
 			qdel(src)
 
 		if("prisonwarp")
-			prisonwarp += loc
+			GLOB.prisonwarp += loc
 			qdel(src)
 
 		if("prisonsecuritywarp")
-			prisonsecuritywarp += loc
+			GLOB.prisonsecuritywarp += loc
 			qdel(src)
 
 		if("tdome1")
-			tdome1	+= loc
+			GLOB.tdome1	+= loc
 
 		if("tdome2")
-			tdome2 += loc
+			GLOB.tdome2 += loc
 
 		if("tdomeadmin")
-			tdomeadmin	+= loc
+			GLOB.tdomeadmin	+= loc
 
 		if("tdomeobserve")
-			tdomeobserve += loc
+			GLOB.tdomeobserve += loc
 
 		if("aroomwarp")
-			aroomwarp += loc
+			GLOB.aroomwarp += loc
 
 		if("blobstart")
-			blobstart += loc
+			GLOB.blobstart += loc
 			qdel(src)
 
 		if("xeno_spawn")
-			xeno_spawn += loc
+			GLOB.xeno_spawn += loc
 			qdel(src)
 
 		if("ninjastart")
-			ninjastart += loc
+			GLOB.ninjastart += loc
 			qdel(src)
 
 		if("carpspawn")
-			carplist += loc
+			GLOB.carplist += loc
 
 		if("voxstart")
-			raider_spawn += loc
+			GLOB.raider_spawn += loc
 
 		if("ERT Director")
-			ertdirector += loc
+			GLOB.ertdirector += loc
 			qdel(src)
 
 		if("Response Team")
-			emergencyresponseteamspawn += loc
+			GLOB.emergencyresponseteamspawn += loc
 			qdel(src)
 
 		if("Syndicate Officer")
-			syndicateofficer += loc
+			GLOB.syndicateofficer += loc
 			qdel(src)
 
 	GLOB.landmarks_list += src

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

@@ -88,7 +88,7 @@
 	name = "horrific experiment"
 	desc = "Some sort of pod filled with blood and vicerea. You swear you can see it moving..."
 	icon = 'icons/obj/cloning.dmi'
-	icon_state = "pod_g"
+	icon_state = "pod_mess"
 
 
 //Makes a tile fully lit no matter what

code/game/objects/effects/snowcloud.dm

@@ -52,7 +52,7 @@
 /obj/effect/snowcloud/proc/try_to_spread_cloud()
 	if(prob(95 - parent_machine.cooling_speed * 5)) //10 / 15 / 20 / 25% chance to spawn a new cloud
 		return
-	var/list/random_dirs = shuffle(cardinal)
+	var/list/random_dirs = shuffle(GLOB.cardinal)
 	for(var/potential in random_dirs)
 		var/turf/T = get_turf(get_step(src, potential))
 		if(isspaceturf(T) || T.density)

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

@@ -11,7 +11,7 @@
 	gibamounts = list(1,1,1,1,1,1,1)
 
 /obj/effect/gibspawner/human/New()
-	gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), alldirs, alldirs, list())
+	gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), GLOB.alldirs, GLOB.alldirs, list())
 	gibamounts[6] = pick(0,1,2)
 	..()
 
@@ -20,7 +20,7 @@
 	gibamounts = list(1,1,1,1,1,1,1)
 
 /obj/effect/gibspawner/xeno/New()
-	gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), alldirs, alldirs, list())
+	gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), GLOB.alldirs, GLOB.alldirs, list())
 	gibamounts[6] = pick(0,1,2)
 	..()
 
@@ -30,6 +30,6 @@
 	gibamounts = list(1,1,1,1,1,1)
 
 /obj/effect/gibspawner/robot/New()
-	gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), alldirs, alldirs)
+	gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), GLOB.alldirs, GLOB.alldirs)
 	gibamounts[6] = pick(0,1,2)
 	..()

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

@@ -289,7 +289,6 @@
 		/obj/item/clothing/glasses/thermal = 1,
 		/obj/item/chameleon = 1,
 		/obj/item/reagent_containers/hypospray/autoinjector/stimulants = 1,
-		/obj/item/storage/box/syndie_kit/atmosn2ogrenades = 1,
 		/obj/item/grenade/plastic/x4 = 1)
 
 
@@ -304,11 +303,6 @@
 		/turf/simulated/wall/mineral/plastitanium/nodiagonal = 2,
 		/obj/structure/falsewall/plastitanium = 2)
 
-/obj/effect/spawner/random_spawners/syndicate/layout/door/secret
-	name = "50pc falsewall 50pc wall"
-	result = list(/turf/simulated/wall/mineral/plastitanium/nodiagonal = 1,
-		/obj/structure/falsewall/plastitanium = 1)
-
 /obj/effect/spawner/random_spawners/syndicate/layout/door/vault
 	name = "80pc vaultdoor 20pc wall"
 	result = list(/obj/machinery/door/airlock/hatch/syndicate/vault = 4,

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/spawners/windowspawner.dm

@@ -16,7 +16,7 @@
 		qdel(G) //just in case mappers don't know what they are doing
 
 	if(!useFull)
-		for(var/cdir in cardinal)
+		for(var/cdir in GLOB.cardinal)
 			for(var/obj/effect/spawner/window/WS in get_step(src,cdir))
 				cdir = null
 				break

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/effects/temporary_visuals/miscellaneous.dm

@@ -18,7 +18,7 @@
 /obj/effect/temp_visual/dir_setting/bloodsplatter/New(loc, set_dir, blood_color)
 	if(blood_color)
 		color = blood_color
-	if(set_dir in diagonals)
+	if(set_dir in GLOB.diagonals)
 		icon_state = "[splatter_type][pick(1, 2, 6)]"
 	else
 		icon_state = "[splatter_type][pick(3, 4, 5)]"

code/game/objects/effects/temporary_visuals/temporary_visual.dm

@@ -11,7 +11,7 @@
 /obj/effect/temp_visual/Initialize(mapload)
 	. = ..()
 	if(randomdir)
-		setDir(pick(cardinal))
+		setDir(pick(GLOB.cardinal))
 
 	timerid = QDEL_IN(src, duration)
 

code/game/objects/explosion.dm

@@ -1,7 +1,6 @@
 //TODO: Flash range does nothing currently
 
 /proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range, adminlog = 1, ignorecap = 0, flame_range = 0, silent = 0, smoke = 1, cause = null, breach = TRUE)
-	src = null	//so we don't abort once src is deleted
 	epicenter = get_turf(epicenter)
 
 	// Archive the uncapped explosion for the doppler array
@@ -11,11 +10,11 @@
 
 	if(!ignorecap)
 		// Clamp all values to MAX_EXPLOSION_RANGE
-		devastation_range = min (MAX_EX_DEVASTATION_RANGE, devastation_range)
-		heavy_impact_range = min (MAX_EX_HEAVY_RANGE, heavy_impact_range)
-		light_impact_range = min (MAX_EX_LIGHT_RANGE, light_impact_range)
-		flash_range = min (MAX_EX_FLASH_RANGE, flash_range)
-		flame_range = min (MAX_EX_FLAME_RANGE, flame_range)
+		devastation_range = min (GLOB.max_ex_devastation_range, devastation_range)
+		heavy_impact_range = min (GLOB.max_ex_heavy_range, heavy_impact_range)
+		light_impact_range = min (GLOB.max_ex_light_range, light_impact_range)
+		flash_range = min (GLOB.max_ex_flash_range, flash_range)
+		flame_range = min (GLOB.max_ex_flame_range, flame_range)
 
 	spawn(0)
 		var/watch = start_watch()
@@ -89,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
@@ -153,12 +152,12 @@
 */
 		var/took = stop_watch(watch)
 		//You need to press the DebugGame verb to see these now....they were getting annoying and we've collected a fair bit of data. Just -test- changes  to explosion code using this please so we can compare
-		if(Debug2)
+		if(GLOB.debug2)
 			log_world("## DEBUG: Explosion([x0],[y0],[z0])(d[devastation_range],h[heavy_impact_range],l[light_impact_range]): Took [took] seconds.")
 
 		//Machines which report explosions.
-		for(var/i,i<=doppler_arrays.len,i++)
-			var/obj/machinery/doppler_array/Array = doppler_arrays[i]
+		for(var/i,i<=GLOB.doppler_arrays.len,i++)
+			var/obj/machinery/doppler_array/Array = GLOB.doppler_arrays[i]
 			if(Array)
 				Array.sense_explosion(x0,y0,z0,devastation_range,heavy_impact_range,light_impact_range,took,orig_dev_range,orig_heavy_range,orig_light_range)
 
@@ -210,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

@@ -1,8 +1,9 @@
-var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.dmi', "icon_state" = "fire")
-
+GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effects/fire.dmi', "icon_state" = "fire"))
 /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
@@ -20,6 +21,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 	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
@@ -60,7 +62,6 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 	var/put_on_delay = DEFAULT_ITEM_PUTON_DELAY
 	var/breakouttime = 0
 	var/flags_cover = 0 //for flags such as GLASSESCOVERSEYES
-	var/flags_size = 0 //flag, primarily used for clothing to determine if a fatty can wear something or not.
 
 	var/block_chance = 0
 	var/hit_reaction_chance = 0 //If you want to have something unrelated to blocking/armour piercing etc. Maybe not needed, but trying to think ahead/allow more freedom
@@ -100,15 +101,6 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 	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
@@ -123,6 +115,23 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 			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
@@ -135,10 +144,10 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 	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)
@@ -361,7 +370,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 
 //Generic refill proc. Transfers something (e.g. fuel, charge) from an atom to our tool. returns TRUE if it was successful, FALSE otherwise
 //Not sure if there should be an argument that indicates what exactly is being refilled
-/obj/item/proc/refill(mob/user, atom/A, amount) 
+/obj/item/proc/refill(mob/user, atom/A, amount)
 	return FALSE
 
 /obj/item/proc/talk_into(mob/M, var/text, var/channel=null)
@@ -516,7 +525,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 			"<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)
@@ -608,16 +617,6 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 /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

@@ -294,7 +294,7 @@
 			return ROOM_ERR_TOOLARGE
 		var/turf/T = pending[1] //why byond havent list::pop()?
 		pending -= T
-		for(var/dir in cardinal)
+		for(var/dir in GLOB.cardinal)
 			var/skip = 0
 			for(var/obj/structure/window/W in T)
 				if(dir == W.dir || (W.dir in list(NORTHEAST,SOUTHEAST,NORTHWEST,SOUTHWEST)))
@@ -328,3 +328,5 @@
 	desc = "A digital copy of the station blueprints stored in your memory."
 	fluffnotice = "Intellectual Property of Nanotrasen. For use in engineering cyborgs only. Wipe from memory upon departure from the station."
 
+/obj/item/areaeditor/blueprints/ce
+

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/devices/aicard.dm

@@ -40,7 +40,7 @@
 	ui_interact(user)
 
 
-/obj/item/aicard/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = inventory_state)
+/obj/item/aicard/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = GLOB.inventory_state)
 	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
 		ui = new(user, src, ui_key, "aicard.tmpl", "[name]", 600, 400, state = state)
@@ -48,7 +48,7 @@
 		ui.set_auto_update(1)
 
 
-/obj/item/aicard/ui_data(mob/user, ui_key = "main", datum/topic_state/state = inventory_state)
+/obj/item/aicard/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.inventory_state)
 	var/data[0]
 
 	var/mob/living/silicon/ai/AI = locate() in src

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

@@ -74,7 +74,7 @@
 		var/dead_notes = input("Insert any relevant notes")
 		var/obj/item/paper/R = new(user.loc)
 		R.name = "Official Coroner's Report - [dead_name]"
-		R.info = "<b>Nanotrasen Science Station [using_map.station_short] - Coroner's Report</b><br><br><b>Name of Deceased:</b> [dead_name]</br><br><b>Rank of Deceased:</b> [dead_rank]<br><br><b>Time of Death:</b> [dead_tod]<br><br><b>Cause of Death:</b> [dead_cause]<br><br><b>Trace Chemicals:</b> [dead_chems]<br><br><b>Additional Coroner's Notes:</b> [dead_notes]<br><br><b>Coroner's Signature:</b> <span class=\"paper_field\">"
+		R.info = "<b>Nanotrasen Science Station [GLOB.using_map.station_short] - Coroner's Report</b><br><br><b>Name of Deceased:</b> [dead_name]</br><br><b>Rank of Deceased:</b> [dead_rank]<br><br><b>Time of Death:</b> [dead_tod]<br><br><b>Cause of Death:</b> [dead_cause]<br><br><b>Trace Chemicals:</b> [dead_chems]<br><br><b>Additional Coroner's Notes:</b> [dead_notes]<br><br><b>Coroner's Signature:</b> <span class=\"paper_field\">"
 		playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1)
 		sleep(10)
 		user.put_in_hands(R)

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

@@ -54,26 +54,26 @@
 	user.set_machine(src)
 	interact(user)
 
-/obj/item/camera_bug/check_eye(var/mob/user as mob)
-	if(user.stat || loc != user || !user.canmove || !user.has_vision() || !current)
-		user.reset_perspective(null)
+/obj/item/camera_bug/check_eye(mob/user)
+	if(loc != user || user.incapacitated() || !user.has_vision() || !current)
 		user.unset_machine()
-		return null
-
-	var/turf/T = get_turf(user.loc)
-	if(T.z != current.z || !current.can_use())
+		return FALSE
+	var/turf/T_user = get_turf(user.loc)
+	var/turf/T_current = get_turf(current)
+	if(!atoms_share_level(T_user, T_current) || !current.can_use())
 		to_chat(user, "<span class='danger'>[src] has lost the signal.</span>")
 		current = null
-		user.reset_perspective(null)
 		user.unset_machine()
-		return null
+		return FALSE
+	return TRUE
 
-	return 1
+/obj/item/camera_bug/on_unset_machine(mob/user)
+	user.reset_perspective(null)
 
 /obj/item/camera_bug/proc/get_cameras()
 	if(world.time > (last_net_update + 100))
 		bugged_cameras = list()
-		for(var/obj/machinery/camera/camera in cameranet.cameras)
+		for(var/obj/machinery/camera/camera in GLOB.cameranet.cameras)
 			if(camera.stat || !camera.can_use())
 				continue
 			if(length(list("SS13","MINE")&camera.network))
@@ -182,7 +182,6 @@
 /obj/item/camera_bug/Topic(var/href,var/list/href_list)
 	if(usr != loc)
 		usr.unset_machine()
-		usr.reset_perspective(null)
 		usr << browse(null, "window=camerabug")
 		return
 	usr.set_machine(src)
@@ -233,7 +232,6 @@
 					interact()
 				else
 					usr.unset_machine()
-					usr.reset_perspective(null)
 					usr << browse(null, "window=camerabug")
 			return
 		else

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

@@ -14,8 +14,12 @@
 	var/list/list_enginebeacons = list()
 	var/isactive = FALSE
 
+/obj/item/enginepicker/Destroy()
+	list_enginebeacons.Cut()
+	return ..()
+
 /obj/item/enginepicker/attack_self(mob/living/carbon/user)
-	if(usr.stat || !usr.canmove || usr.restrained())
+	if(user.incapacitated())
 		return
 
 	if(!isactive)
@@ -72,7 +76,7 @@
 		new G(T)		//Spawns the switch-selected engine on the chosen beacon's turf
 
 		var/ailist[] = list()
-		for(var/mob/living/silicon/ai/A in GLOB.living_mob_list)
+		for(var/mob/living/silicon/ai/A in GLOB.alive_mob_list)
 			ailist += A
 		if(ailist.len)
 			var/mob/living/silicon/ai/announcer = pick(ailist)

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

@@ -67,49 +67,52 @@
 	times_used = max(0, times_used) //sanity
 
 
-/obj/item/flash/proc/try_use_flash(var/mob/user = null)
+/obj/item/flash/proc/try_use_flash(mob/user = null)
 	flash_recharge(user)
 
 	if(broken)
-		return 0
+		return FALSE
 
-	playsound(src.loc, use_sound, 100, 1)
+	playsound(loc, use_sound, 100, 1)
 	flick("[initial(icon_state)]2", src)
+	set_light(2, 1, COLOR_WHITE)
+	addtimer(CALLBACK(src, /atom./proc/set_light, 0), 2)
 	times_used++
 
 	if(user && !clown_check(user))
-		return 0
+		return FALSE
 
-	return 1
+	return TRUE
 
 
 /obj/item/flash/proc/flash_carbon(var/mob/living/carbon/M, var/mob/user = null, var/power = 5, targeted = 1)
-	add_attack_logs(user, M, "Flashed with [src]")
-	if(user && targeted)
-		if(M.weakeyes)
-			M.Weaken(3) //quick weaken bypasses eye protection but has no eye flash
-		if(M.flash_eyes(1, 1))
-			M.AdjustConfused(power)
-			terrible_conversion_proc(M, user)
-			M.Stun(1)
-			visible_message("<span class='disarm'>[user] blinds [M] with the flash!</span>")
-			to_chat(user, "<span class='danger'>You blind [M] with the flash!</span>")
-			to_chat(M, "<span class='userdanger'>[user] blinds you with the flash!</span>")
+	if(user)
+		add_attack_logs(user, M, "Flashed with [src]")
+		if(targeted)
 			if(M.weakeyes)
-				M.Stun(2)
-				M.visible_message("<span class='disarm'>[M] gasps and shields [M.p_their()] eyes!</span>", "<span class='userdanger'>You gasp and shields your eyes!</span>")
-		else
-			visible_message("<span class='disarm'>[user] fails to blind [M] with the flash!</span>")
-			to_chat(user, "<span class='warning'>You fail to blind [M] with the flash!</span>")
-			to_chat(M, "<span class='danger'>[user] fails to blind you with the flash!</span>")
-	else
-		if(M.flash_eyes())
-			M.AdjustConfused(power)
+				M.Weaken(3) //quick weaken bypasses eye protection but has no eye flash
+			if(M.flash_eyes(1, 1))
+				M.AdjustConfused(power)
+				terrible_conversion_proc(M, user)
+				M.Stun(1)
+				visible_message("<span class='disarm'>[user] blinds [M] with the flash!</span>")
+				to_chat(user, "<span class='danger'>You blind [M] with the flash!</span>")
+				to_chat(M, "<span class='userdanger'>[user] blinds you with the flash!</span>")
+				if(M.weakeyes)
+					M.Stun(2)
+					M.visible_message("<span class='disarm'>[M] gasps and shields [M.p_their()] eyes!</span>", "<span class='userdanger'>You gasp and shield your eyes!</span>")
+			else
+				visible_message("<span class='disarm'>[user] fails to blind [M] with the flash!</span>")
+				to_chat(user, "<span class='warning'>You fail to blind [M] with the flash!</span>")
+				to_chat(M, "<span class='danger'>[user] fails to blind you with the flash!</span>")
+			return
+
+	if(M.flash_eyes())
+		M.AdjustConfused(power)
 
 /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)
@@ -117,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/flashlight.dm

@@ -74,7 +74,7 @@
 
 			if(istype(H)) //robots and aliens are unaffected
 				var/obj/item/organ/internal/eyes/eyes = H.get_int_organ(/obj/item/organ/internal/eyes)
-				if(M.stat == DEAD || !eyes || M.disabilities & BLIND)	//mob is dead or fully blind
+				if(M.stat == DEAD || !eyes || (BLINDNESS in M.mutations))	//mob is dead or fully blind
 					to_chat(user, "<span class='notice'>[M]'s pupils are unresponsive to the light!</span>")
 				else if((XRAY in M.mutations) || eyes.see_in_dark >= 8) //The mob's either got the X-RAY vision or has a tapetum lucidum (extreme nightvision, i.e. Vulp/Tajara with COLOURBLIND & their monkey forms).
 					to_chat(user, "<span class='notice'>[M]'s pupils glow eerily!</span>")

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

@@ -35,7 +35,7 @@
 
 	song.ui_interact(user, ui_key, ui, force_open)
 
-/obj/item/instrument/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
+/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)

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

@@ -138,6 +138,7 @@
 
 			log_admin("[key_name(user)] EMPd a camera with a laser pointer")
 			user.create_attack_log("[key_name(user)] EMPd a camera with a laser pointer")
+			add_attack_logs(user, C, "EMPd with [src]", ATKLOG_ALL)
 		else
 			outmsg = "<span class='info'>You missed the lens of [C] with [src].</span>"
 

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"
@@ -264,7 +257,7 @@
 			return
 		last_request = world.time / 10
 		looking_for_personality = 1
-		paiController.findPAI(src, usr)
+		GLOB.paiController.findPAI(src, usr)
 	if(href_list["wipe"])
 		var/confirm = input("Are you CERTAIN you wish to delete the current personality? This action cannot be undone.", "Personality Wipe") in list("Yes", "No")
 		if(confirm == "Yes")

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

@@ -9,7 +9,7 @@
 /obj/item/pipe_painter/New()
 	..()
 	modes = new()
-	for(var/C in pipe_colors)
+	for(var/C in GLOB.pipe_colors)
 		modes += "[C]"
 	mode = pick(modes)
 
@@ -23,7 +23,7 @@
 		to_chat(user, "<span class='warning'>You must remove the plating first.</span>")
 		return
 
-	P.change_color(pipe_colors[mode])
+	P.change_color(GLOB.pipe_colors[mode])
 
 /obj/item/pipe_painter/attack_self(mob/user as mob)
 	mode = input("Which colour do you want to use?", "Pipe Painter", mode) in modes

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

@@ -69,8 +69,8 @@
 		to_chat(user, "<span class='notice'>Locked In</span>")
 		new /obj/machinery/power/singularity_beacon/syndicate( user.loc )
 		playsound(src, 'sound/effects/pop.ogg', 100, 1, 1)
+		user.drop_item()
 		qdel(src)
-	return
 
 /obj/item/radio/beacon/syndicate/bomb
 	name = "suspicious beacon"
@@ -82,16 +82,21 @@
 		to_chat(user, "<span class='notice'>Locked In</span>")
 		new /obj/machinery/syndicatebomb( user.loc )
 		playsound(src, 'sound/effects/pop.ogg', 100, 1, 1)
+		user.drop_item()
 		qdel(src)
-	return
 
 /obj/item/radio/beacon/engine
 	desc = "A label on it reads: <i>Warning: This device is used for transportation of high-density objects used for high-yield power generation. Stay away!</i>."
 	anchored = 1		//Let's not move these around. Some folk might get the idea to use these for assassinations
 	var/list/enginetype = list()
 
-/obj/item/radio/beacon/engine/Initialize()
+/obj/item/radio/beacon/engine/Initialize(mapload)
 	LAZYADD(GLOB.engine_beacon_list, src)
+	return ..()
+
+/obj/item/radio/beacon/engine/Destroy()
+	GLOB.engine_beacon_list -= src
+	return ..()
 
 /obj/item/radio/beacon/engine/tesling
 	name = "Engine Beacon for Tesla and Singularity"

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

@@ -65,7 +65,7 @@
 	else if(href_list["code"])
 		code += text2num(href_list["code"])
 		code = round(code)
-		code = Clamp(code, 1, 100)
+		code = clamp(code, 1, 100)
 
 	else if(href_list["power"])
 		on = !on
@@ -103,7 +103,7 @@
 		ui.open()
 		ui.set_auto_update(1)
 
-/obj/item/radio/electropack/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
+/obj/item/radio/electropack/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
 	var/data[0]
 
 	data["power"] = on

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

@@ -21,6 +21,7 @@
 	var/ks1type = null
 	var/ks2type = null
 	dog_fashion = null
+	requires_tcomms = TRUE
 
 /obj/item/radio/headset/New()
 	..()
@@ -88,6 +89,8 @@
 /obj/item/radio/headset/syndicate
 	origin_tech = "syndicate=3"
 	ks1type = /obj/item/encryptionkey/syndicate/nukeops
+	requires_tcomms = FALSE
+	instant = TRUE // Work instantly if there are no comms
 
 /obj/item/radio/headset/syndicate/alt //undisguised bowman with flash protection
 	name = "syndicate headset"
@@ -103,6 +106,13 @@
 /obj/item/radio/headset/syndicate/alt/syndteam
 	ks1type = /obj/item/encryptionkey/syndteam
 
+/obj/item/radio/headset/syndicate/alt/lavaland
+	name = "syndicate lavaland headset"
+
+/obj/item/radio/headset/syndicate/alt/lavaland/New()
+	. = ..()
+	set_frequency(SYND_FREQ)
+
 /obj/item/radio/headset/binary
 	origin_tech = "syndicate=3"
 	ks1type = /obj/item/encryptionkey/binary

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)
@@ -63,7 +62,7 @@
 
 /obj/item/radio/intercom/department/medbay/New()
 	..()
-	internal_channels = default_medbay_channels.Copy()
+	internal_channels = GLOB.default_medbay_channels.Copy()
 
 /obj/item/radio/intercom/department/security/New()
 	..()
@@ -204,7 +203,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))

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

@@ -1,4 +1,4 @@
-var/global/list/default_internal_channels = list(
+GLOBAL_LIST_INIT(default_internal_channels, list(
 	num2text(PUB_FREQ) = list(),
 	num2text(AI_FREQ)  = list(ACCESS_CAPTAIN),
 	num2text(ERT_FREQ) = list(ACCESS_CENT_SPECOPS),
@@ -11,13 +11,13 @@ var/global/list/default_internal_channels = list(
 	num2text(SCI_FREQ) = list(ACCESS_RESEARCH),
 	num2text(SUP_FREQ) = list(ACCESS_CARGO),
 	num2text(SRV_FREQ) = list(ACCESS_HOP, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_CLOWN, ACCESS_MIME)
-)
+))
 
-var/global/list/default_medbay_channels = list(
+GLOBAL_LIST_INIT(default_medbay_channels, list(
 	num2text(PUB_FREQ) = list(),
 	num2text(MED_FREQ) = list(ACCESS_MEDICAL),
 	num2text(MED_I_FREQ) = list(ACCESS_MEDICAL)
-)
+))
 
 /obj/item/radio
 	icon = 'icons/obj/radio.dmi'
@@ -58,6 +58,9 @@ var/global/list/default_medbay_channels = list(
 	var/datum/radio_frequency/radio_connection
 	var/list/datum/radio_frequency/secure_radio_connections = new
 
+	var/requires_tcomms = FALSE // Does this device require tcomms to work.If TRUE it wont function at all without tcomms. If FALSE, it will work without tcomms, just slowly
+	var/instant = FALSE // Should this device instantly communicate if there isnt tcomms
+
 
 /obj/item/radio/proc/set_frequency(new_frequency)
 	SSradio.remove_object(src, frequency)
@@ -69,7 +72,7 @@ var/global/list/default_medbay_channels = list(
 	..()
 	wires = new(src)
 
-	internal_channels = default_internal_channels.Copy()
+	internal_channels = GLOB.default_internal_channels.Copy()
 	GLOB.global_radios |= src
 
 /obj/item/radio/Destroy()
@@ -116,7 +119,7 @@ var/global/list/default_medbay_channels = list(
 		ui.open()
 		ui.set_auto_update(1)
 
-/obj/item/radio/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
+/obj/item/radio/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
 	var/data[0]
 
 	data["mic_status"] = broadcasting
@@ -223,7 +226,7 @@ var/global/list/default_medbay_channels = list(
 				channels[chan_name] |= FREQ_LISTENING
 		. = 1
 	else if(href_list["spec_freq"])
-		var freq = href_list["spec_freq"]
+		var/freq = href_list["spec_freq"]
 		if(has_channel_access(usr, freq))
 			set_frequency(text2num(freq))
 		. = 1
@@ -233,7 +236,7 @@ var/global/list/default_medbay_channels = list(
 
 	add_fingerprint(usr)
 
-/obj/item/radio/proc/autosay(var/message, var/from, var/channel, var/zlevel = config.contact_levels, var/role = "Unknown") //BS12 EDIT
+/obj/item/radio/proc/autosay(message, from, channel, role = "Unknown") //BS12 EDIT
 	var/datum/radio_frequency/connection = null
 	if(channel && channels && channels.len > 0)
 		if(channel == "department")
@@ -258,10 +261,29 @@ var/global/list/default_medbay_channels = list(
 	if(jammed)
 		message = Gibberish(message, 100)
 	var/list/message_pieces = message_to_multilingual(message)
-	Broadcast_Message(connection, A,
-						0, "*garbled automated announcement*", src,
-						message_pieces, from, "Automated Announcement", from, "synthesized voice",
-						4, 0, zlevel, connection.frequency, follow_target = follow_target)
+
+		// Make us a message datum!
+	var/datum/tcomms_message/tcm = new
+	tcm.connection = connection
+	tcm.sender = A
+	tcm.radio = src
+	tcm.sender_name = from
+	tcm.message_pieces = message_pieces
+	tcm.sender_job = "Automated Announcement"
+	tcm.vname = "synthesized voice"
+	tcm.data = SIGNALTYPE_AINOTRACK
+	// 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
+		tcm.source_level = 1 // Assume Z1 if we dont have an actual Z level available to us.
+	tcm.freq = connection.frequency
+	tcm.follow_target = follow_target
+
+	// Now put that through the stuff
+	for(var/obj/machinery/tcomms/core/C in GLOB.tcomms_machines)
+		C.handle_message(tcm)
+	qdel(tcm) // Delete the message datum
 	qdel(A)
 
 // Just a dummy mob used for making announcements, so we don't create AIs to do this
@@ -273,7 +295,7 @@ var/global/list/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()
@@ -318,48 +340,32 @@ var/global/list/default_medbay_channels = list(
 	if(!M.IsVocal())
 		return 0
 
-	/* Quick introduction:
-		This new radio system uses a very robust FTL signaling technology unoriginally
-		dubbed "subspace" which is somewhat similar to 'blue-space' but can't
-		actually transmit large mass. Headsets are the only radio devices capable
-		of sending subspace transmissions to the Communications Satellite.
-
-		A headset sends a signal to a subspace listener/receiver elsewhere in space,
-		the signal gets processed and logged, and an audible transmission gets sent
-		to each individual headset.
-	*/
-
-	//#### Grab the connection datum ####//
-	var/message_mode = handle_message_mode(M, message_pieces, channel)
-	switch(message_mode) //special cases
-		if(RADIO_CONNECTION_FAIL)
-			return 0
-		if(RADIO_CONNECTION_NON_SUBSPACE)
-			return 1
-
-	if(!istype(message_mode, /datum/radio_frequency)) //if not a special case, it should be returning a radio connection
-		return 0
-
-	var/datum/radio_frequency/connection = message_mode
-	var/turf/position = get_turf(src)
-
 	var/jammed = FALSE
-	for(var/obj/item/jammer/jammer in GLOB.active_jammers)
+	var/turf/position = get_turf(src)
+	for(var/J in GLOB.active_jammers)
+		var/obj/item/jammer/jammer = J
 		if(get_dist(position, get_turf(jammer)) < jammer.range)
 			jammed = TRUE
 			break
 
-	//#### Tagging the signal with all appropriate identity values ####//
+	var/message_mode = handle_message_mode(M, message_pieces, channel)
+	switch(message_mode) //special cases
+		// This is if the connection fails
+		if(RADIO_CONNECTION_FAIL)
+			return 0
+		// This is if were using either a binary key, or a hivemind through a headset somehow. Dont ask.
+		if(RADIO_CONNECTION_NON_SUBSPACE)
+			return 1
+
+	if(!istype(message_mode, /datum/radio_frequency)) //if not a special case, it should be returning a radio connection
+		return
+
+	var/datum/radio_frequency/connection = message_mode
+
 
 	// ||-- The mob's name identity --||
 	var/displayname = M.name	// grab the display name (name you get when you hover over someone's icon)
-	var/real_name = M.real_name // mob's real name
-	var/mobkey = "none" // player key associated with mob
 	var/voicemask = 0 // the speaker is wearing a voice mask
-	if(M.client)
-		mobkey = M.key // assign the mob's key
-
-
 	var/jobname // the mob's "job"
 
 	if(jammed)
@@ -397,7 +403,7 @@ var/global/list/default_medbay_channels = list(
 	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
 		displayname = H.voice
-		if(H.voice != real_name)
+		if(H.voice != M.real_name)
 			voicemask = TRUE
 
 	if(syndiekey && syndiekey.change_voice && connection.frequency == SYND_FREQ)
@@ -405,124 +411,50 @@ var/global/list/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)
 
-  /* ###### Radio headsets can only broadcast through subspace ###### */
+	// Make us a message datum!
+	var/datum/tcomms_message/tcm = new
+	tcm.sender_name = displayname
+	tcm.sender_job = jobname
+	tcm.message_pieces = message_pieces_copy
+	tcm.source_level = position.z
+	tcm.freq = connection.frequency
+	tcm.vmask = voicemask
+	tcm.needs_tcomms = requires_tcomms
+	tcm.connection = connection
+	tcm.vname = M.voice_name
+	tcm.sender = M
+	// Now put that through the stuff
+	var/handled = FALSE
+	if(connection)
+		for(var/obj/machinery/tcomms/core/C in GLOB.tcomms_machines)
+			if(C.handle_message(tcm))
+				handled = TRUE
+				qdel(tcm) // Delete the message datum
+				return TRUE
 
-	if(subspace_transmission)
-		// First, we want to generate a new radio signal
-		var/datum/signal/signal = new
-		signal.transmission_method = 2 // 2 would be a subspace transmission.
-									   // transmission_method could probably be enumerated through #define. Would be neater.
+	// If we dont need tcomms and we have no connection
+	if(!requires_tcomms && !handled)
+		// If they dont need tcomms for their signal, set the type to intercoms
+		tcm.data = SIGNALTYPE_INTERCOM_SBR
+		tcm.zlevels = list(position.z)
+		if(!instant)
+			// Simulate two seconds of lag
+			addtimer(CALLBACK(GLOBAL_PROC, .proc/broadcast_message, tcm), 20)
+			QDEL_IN(tcm, 20)
+		else
+			// Nukeops + Deathsquad headsets are instant and should work the same, whether there is comms or not
+			broadcast_message(tcm)
+			qdel(tcm) // Delete the message datum
+		return TRUE
 
-		// --- Finally, tag the actual signal with the appropriate values ---
-		signal.data = list(
-		  // Identity-associated tags:
-			"mob" = M, // store a reference to the mob
-			"mobtype" = M.type, 	// the mob's type
-			"race" = signal.get_race(M),
-			"realname" = real_name, // the mob's real name
-			"name" = displayname,	// the mob's display name
-			"job" = jobname,		// the mob's job
-			"key" = mobkey,			// the mob's key
-			"vmessage" = pick(M.speak_emote), // the message to display if the voice wasn't understood
-			"vname" = M.voice_name, // the name to display if the voice wasn't understood
-			"vmask" = voicemask,	// 1 if the mob is using a voice gas mask
-
-			// We store things that would otherwise be kept in the actual mob
-			// so that they can be logged even AFTER the mob is deleted or something
-
-		  // Other tags:
-			"compression" = rand(45,50), // compressed radio signal
-			"message" = message_pieces, // the actual sent message
-			"connection" = connection, // the radio connection to use
-			"radio" = src, // stores the radio used for transmission
-			"slow" = 0, // how much to sleep() before broadcasting - simulates net lag
-			"traffic" = 0, // dictates the total traffic sum that the signal went through
-			"type" = 0, // determines what type of radio input it is: normal broadcast
-			"server" = null, // the last server to log this signal
-			"reject" = 0,	// if nonzero, the signal will not be accepted by any broadcasting machinery
-			"level" = position.z, // The source's z level
-			"verb" = verb
-		)
-		signal.frequency = connection.frequency // Quick frequency set
-
-	  //#### Sending the signal to all subspace receivers ####//
-
-		for(var/obj/machinery/telecomms/receiver/R in telecomms_list)
-			spawn(0)
-				R.receive_signal(signal)
-
-		// Allinone can act as receivers.
-		for(var/obj/machinery/telecomms/allinone/R in telecomms_list)
-			spawn(0)
-				R.receive_signal(signal)
-
-		// Receiving code can be located in Telecommunications.dm
-		return signal.data["done"] && position.z in signal.data["level"]
-
-
-  /* ###### Intercoms and station-bounced radios ###### */
-
-	var/filter_type = 2
-
-	/* --- Intercoms can only broadcast to other intercoms, but bounced radios can broadcast to bounced radios and intercoms --- */
-	if(istype(src, /obj/item/radio/intercom))
-		filter_type = 1
-
-
-	var/datum/signal/signal = new
-	signal.transmission_method = 2
-
-
-	/* --- Try to send a normal subspace broadcast first */
-
-	signal.data = list(
-
-		"mob" = M, // store a reference to the mob
-		"mobtype" = M.type, 	// the mob's type
-		"race" = signal.get_race(M), // text to show next to mob in comms log console
-		"realname" = real_name, // the mob's real name
-		"name" = displayname,	// the mob's display name
-		"job" = jobname,		// the mob's job
-		"key" = mobkey,			// the mob's key
-		"vmessage" = pick(M.speak_emote), // the message to display if the voice wasn't understood
-		"vname" = M.voice_name, // the name to display if the voice wasn't understood
-		"vmask" = voicemask,	// 1 if the mob is using a voice gas mas
-
-		"compression" = 0, // uncompressed radio signal
-		"message" = message_pieces, // the actual sent message
-		"connection" = connection, // the radio connection to use
-		"radio" = src, // stores the radio used for transmission
-		"slow" = 0,
-		"traffic" = 0,
-		"type" = 0,
-		"server" = null,
-		"reject" = 0,
-		"level" = position.z,
-		"verb" = verb
-	)
-	signal.frequency = connection.frequency // Quick frequency set
-
-	for(var/obj/machinery/telecomms/receiver/R in telecomms_list)
-		spawn(0)
-			R.receive_signal(signal)
-
-
-	sleep(rand(10,25)) // wait a little...
-
-	if(signal.data["done"] && position.z in signal.data["level"])
-		// we're done here.
-		return 1
-
-	// Oh my god; the comms are down or something because the signal hasn't been broadcasted yet in our level.
-	// Send a mundane broadcast with limited targets:
-
-	//THIS IS TEMPORARY. YEAH RIGHT
-	if(!connection)	return 0	//~Carn
-
-	return Broadcast_Message(connection, M, voicemask, pick(M.speak_emote),
-					  src, message_pieces, displayname, jobname, real_name, M.voice_name,
-					  filter_type, signal.data["compression"], list(position.z), connection.frequency,verb)
+	// If we didnt get here, oh fuck
+	qdel(tcm) // Delete the message datum
+	return FALSE
 
 
 /obj/item/radio/hear_talk(mob/M as mob, list/message_pieces, var/verb = "says")
@@ -696,6 +628,9 @@ var/global/list/default_medbay_channels = list(
 	..()
 	set_frequency(ERT_FREQ)
 
+/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/))
 		user.set_machine(src)
@@ -812,7 +747,7 @@ var/global/list/default_medbay_channels = list(
 		ui.open()
 		ui.set_auto_update(1)
 
-/obj/item/radio/borg/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
+/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
@@ -863,4 +798,4 @@ var/global/list/default_medbay_channels = list(
 
 /obj/item/radio/phone/medbay/New()
 	..()
-	internal_channels = default_medbay_channels.Copy()
+	internal_channels = GLOB.default_medbay_channels.Copy()

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

@@ -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>")
@@ -212,7 +212,7 @@ REAGENT SCANNER
 		if(H.getBrainLoss() >= 100)
 			to_chat(user, "<span class='warning'>Subject is brain dead.</span>")
 		else if(H.getBrainLoss() >= 60)
-			to_chat(user, "<span class='warning'>Severe brain damage detected. Subject likely to have mental retardation.</span>")
+			to_chat(user, "<span class='warning'>Severe brain damage detected. Subject likely to have dementia.</span>")
 		else if(H.getBrainLoss() >= 10)
 			to_chat(user, "<span class='warning'>Significant brain damage detected. Subject may have had a concussion.</span>")
 	else
@@ -859,11 +859,11 @@ REAGENT SCANNER
 		dat += "<td>[i.name]</td><td>N/A</td><td>[i.damage]</td><td>[infection]:[mech]</td><td></td>"
 		dat += "</tr>"
 	dat += "</table>"
-	if(target.disabilities & BLIND)
+	if(BLINDNESS in target.mutations)
 		dat += "<font color='red'>Cataracts detected.</font><BR>"
-	if(target.disabilities & COLOURBLIND)
+	if(COLOURBLIND in target.mutations)
 		dat += "<font color='red'>Photoreceptor abnormalities detected.</font><BR>"
-	if(target.disabilities & NEARSIGHTED)
+	if(NEARSIGHTED in target.mutations)
 		dat += "<font color='red'>Retinal misalignment detected.</font><BR>"
 
 	return dat

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

@@ -194,13 +194,11 @@
 		if(mytape.storedinfo.len < i + 1)
 			playsleepseconds = 1
 			sleep(10)
-			T = get_turf(src)
 			atom_say("End of recording.")
 		else
 			playsleepseconds = mytape.timestamp[i + 1] - mytape.timestamp[i]
 		if(playsleepseconds > 14)
 			sleep(10)
-			T = get_turf(src)
 			atom_say("Skipping [playsleepseconds] seconds of silence.")
 			playsleepseconds = 1
 		i++

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

@@ -100,7 +100,7 @@
 		// 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 = default_state)
+/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

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

@@ -6,7 +6,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 
 */
 
-var/list/world_uplinks = list()
+GLOBAL_LIST_EMPTY(world_uplinks)
 
 /obj/item/uplink
 	var/welcome 			// Welcoming menu message
@@ -35,10 +35,10 @@ var/list/world_uplinks = list()
 	uses = SSticker.mode.uplink_uses
 	uplink_items = get_uplink_items()
 
-	world_uplinks += src
+	GLOB.world_uplinks += src
 
 /obj/item/uplink/Destroy()
-	world_uplinks -= src
+	GLOB.world_uplinks -= src
 	return ..()
 
 /obj/item/uplink/proc/generate_items(mob/user as mob)
@@ -131,7 +131,6 @@ var/list/world_uplinks = list()
 	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)
@@ -168,7 +167,6 @@ var/list/world_uplinks = list()
 					to_chat(user, "<span class='notice'>[I] refunded.</span>")
 					qdel(I)
 					return
-		..()
 
 // HIDDEN UPLINK - Can be stored in anything but the host item has to have a trigger for it.
 /* How to create an uplink in 3 easy steps!
@@ -216,7 +214,7 @@ var/list/world_uplinks = list()
 /*
 	NANO UI FOR UPLINK WOOP WOOP
 */
-/obj/item/uplink/hidden/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = inventory_state)
+/obj/item/uplink/hidden/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = GLOB.inventory_state)
 	var/title = "Remote Uplink"
 	// 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)
@@ -227,7 +225,7 @@ var/list/world_uplinks = list()
 		// open the new ui window
 		ui.open()
 
-/obj/item/uplink/hidden/ui_data(mob/user, ui_key = "main", datum/topic_state/state = inventory_state)
+/obj/item/uplink/hidden/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.inventory_state)
 	var/data[0]
 
 	data["welcome"] = welcome
@@ -277,14 +275,14 @@ var/list/world_uplinks = list()
 /obj/item/uplink/hidden/proc/update_nano_data(var/id)
 	if(nanoui_menu == 1)
 		var/permanentData[0]
-		for(var/datum/data/record/L in sortRecord(data_core.general))
+		for(var/datum/data/record/L in sortRecord(GLOB.data_core.general))
 			permanentData[++permanentData.len] = list(Name = sanitize(L.fields["name"]),"id" = L.fields["id"])
 		nanoui_data["exploit_records"] = permanentData
 
 	if(nanoui_menu == 11)
 		nanoui_data["exploit_exists"] = 0
 
-		for(var/datum/data/record/L in data_core.general)
+		for(var/datum/data/record/L in GLOB.data_core.general)
 			if(L.fields["id"] == id)
 				nanoui_data["exploit"] = list()  // Setting this to equal L.fields passes it's variables that are lists as reference instead of value.
 				nanoui_data["exploit"]["name"] =  html_encode(L.fields["name"])

code/game/objects/items/flag.dm

@@ -222,7 +222,7 @@
 
 	var/input_flag = input(user, "Choose a flag to disguise as.", "Choose a flag.") in show_flag
 
-	if(user && src in user.contents)
+	if(user && (src in user.contents))
 
 		var/obj/item/flag/chosen_flag = flag[input_flag]
 

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/mountable_frames/mountables.dm

@@ -20,7 +20,7 @@
 		return
 	if(proximity_flag != 1) //if we aren't next to the wall
 		return
-	if(!( get_dir(on_wall,user) in cardinal))
+	if(!( get_dir(on_wall,user) in GLOB.cardinal))
 		to_chat(user, "<span class='warning'>You need to be standing next to a wall to place \the [src].</span>")
 		return
 

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

@@ -14,7 +14,7 @@
 	..(newloc)
 	if(model_info && model)
 		model_info = model
-		var/datum/robolimb/R = all_robolimbs[model]
+		var/datum/robolimb/R = GLOB.all_robolimbs[model]
 		if(R)
 			name = "[R.company] [initial(name)]"
 			desc = "[R.desc]"
@@ -24,7 +24,7 @@
 		name = "robot [initial(name)]"
 
 /obj/item/robot_parts/attack_self(mob/user)
-	var/choice = input(user, "Select the company appearance for this limb.", "Limb Company Selection") as null|anything in selectable_robolimbs
+	var/choice = input(user, "Select the company appearance for this limb.", "Limb Company Selection") as null|anything in GLOB.selectable_robolimbs
 	if(!choice)
 		return
 	if(loc != user)
@@ -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"
@@ -74,17 +74,17 @@
 
 	R.stat = CONSCIOUS
 	GLOB.dead_mob_list -= R //please never forget this ever kthx
-	GLOB.living_mob_list += R
+	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

@@ -4,6 +4,7 @@
 	desc = "A tube of paste containing swarms of repair nanites. Very effective in repairing robotic machinery."
 	icon = 'icons/obj/nanopaste.dmi'
 	icon_state = "tube"
+	w_class = WEIGHT_CLASS_TINY
 	origin_tech = "materials=2;engineering=3"
 	amount = 6
 	max_amount = 6
@@ -56,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/rods.dm

@@ -1,7 +1,7 @@
-var/global/list/datum/stack_recipe/rod_recipes = list ( \
+GLOBAL_LIST_INIT(rod_recipes, list ( \
 	new/datum/stack_recipe("grille", /obj/structure/grille, 2, time = 10, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("table frame", /obj/structure/table_frame, 2, time = 10, one_per_turf = 1, on_floor = 1), \
-	)
+	))
 
 /obj/item/stack/rods
 	name = "metal rod"
@@ -36,7 +36,7 @@ var/global/list/datum/stack_recipe/rod_recipes = list ( \
 
 /obj/item/stack/rods/New(loc, amount=null)
 	..()
-	recipes = rod_recipes
+	recipes = GLOB.rod_recipes
 	update_icon()
 
 /obj/item/stack/rods/update_icon()

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

@@ -9,13 +9,13 @@
 	singular_name = "human skin piece"
 	icon_state = "sheet-hide"
 
-var/global/list/datum/stack_recipe/human_recipes = list( \
-	new/datum/stack_recipe("bloated human costume", /obj/item/clothing/suit/bloated_human, 5, on_floor = 1), \
-	new/datum/stack_recipe("bloated human costume head", /obj/item/clothing/head/human_head, 5, on_floor = 1), \
-	)
+GLOBAL_LIST_INIT(human_recipes, list( \
+	new/datum/stack_recipe("bloated human costume", /obj/item/clothing/suit/bloated_human, 5, on_floor = TRUE), \
+	new/datum/stack_recipe("bloated human costume head", /obj/item/clothing/head/human_head, 5, on_floor = TRUE), \
+	))
 
 /obj/item/stack/sheet/animalhide/human/New(var/loc, var/amount=null)
-	recipes = human_recipes
+	recipes = GLOB.human_recipes
 	return ..()
 
 /obj/item/stack/sheet/animalhide/generic
@@ -48,6 +48,14 @@ var/global/list/datum/stack_recipe/human_recipes = list( \
 	singular_name = "lizard skin piece"
 	icon_state = "sheet-lizard"
 
+GLOBAL_LIST_INIT(lizard_recipes, list( \
+	new/datum/stack_recipe("lizard skin handbag", /obj/item/storage/backpack/satchel/lizard, 5, on_floor = TRUE), \
+	))
+
+/obj/item/stack/sheet/animalhide/lizard/Initialize(mapload, new_amount, merge = TRUE)
+	recipes = GLOB.lizard_recipes
+	return ..()
+
 /obj/item/stack/sheet/animalhide/xeno
 	name = "alien hide"
 	desc = "The skin of a terrible creature."
@@ -132,12 +140,12 @@ GLOBAL_LIST_INIT(leather_recipes, list (
 	icon_state = "sinew"
 	origin_tech = "biotech=4"
 
-var/global/list/datum/stack_recipe/sinew_recipes = list ( \
+GLOBAL_LIST_INIT(sinew_recipes, list ( \
 	new/datum/stack_recipe("sinew restraints", /obj/item/restraints/handcuffs/sinew, 1, on_floor = 1), \
-	)
+	))
 
 /obj/item/stack/sheet/sinew/New(var/loc, var/amount=null)
-	recipes = sinew_recipes
+	recipes = GLOB.sinew_recipes
 	return ..()
 
 /obj/item/stack/sheet/animalhide/goliath_hide
@@ -161,9 +169,9 @@ var/global/list/datum/stack_recipe/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
@@ -172,9 +180,9 @@ var/global/list/datum/stack_recipe/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)
@@ -234,7 +242,7 @@ var/global/list/datum/stack_recipe/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

@@ -15,16 +15,16 @@ Mineral Sheets
 		- Adamantine
 */
 
-var/global/list/datum/stack_recipe/sandstone_recipes = list ( \
+GLOBAL_LIST_INIT(sandstone_recipes, list ( \
 	new/datum/stack_recipe("pile of dirt", /obj/machinery/hydroponics/soil, 3, time = 10, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("sandstone door", /obj/structure/mineral_door/sandstone, 10, one_per_turf = 1, on_floor = 1), \
 	null, \
 	new/datum/stack_recipe("Assistant Statue", /obj/structure/statue/sandstone/assistant, 5, one_per_turf = 1, on_floor = 1), \
 	null, \
 	new/datum/stack_recipe("Breakdown into sand", /obj/item/stack/ore/glass, 1, one_per_turf = 0, on_floor = 1), \
-	)
+	))
 
-var/global/list/datum/stack_recipe/silver_recipes = list ( \
+GLOBAL_LIST_INIT(silver_recipes, list ( \
 	new/datum/stack_recipe("silver door", /obj/structure/mineral_door/silver, 10, one_per_turf = 1, on_floor = 1), \
 	null, \
 	new/datum/stack_recipe("silver tile", /obj/item/stack/tile/mineral/silver, 1, 4, 20), \
@@ -34,9 +34,9 @@ var/global/list/datum/stack_recipe/silver_recipes = list ( \
 	new/datum/stack_recipe("Sec Borg Statue", /obj/structure/statue/silver/secborg, 5, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("Med Doctor Statue", /obj/structure/statue/silver/md, 5, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("Med Borg Statue", /obj/structure/statue/silver/medborg, 5, one_per_turf = 1, on_floor = 1), \
-	)
+	))
 
-var/global/list/datum/stack_recipe/diamond_recipes = list ( \
+GLOBAL_LIST_INIT(diamond_recipes, list ( \
 	new/datum/stack_recipe("diamond door", /obj/structure/mineral_door/transparent/diamond, 10, one_per_turf = 1, on_floor = 1), \
 	null, \
 	new/datum/stack_recipe("diamond tile", /obj/item/stack/tile/mineral/diamond, 1, 4, 20),  \
@@ -44,18 +44,18 @@ var/global/list/datum/stack_recipe/diamond_recipes = list ( \
 	new/datum/stack_recipe("Captain Statue", /obj/structure/statue/diamond/captain, 5, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("AI Hologram Statue", /obj/structure/statue/diamond/ai1, 5, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("AI Core Statue", /obj/structure/statue/diamond/ai2, 5, one_per_turf = 1, on_floor = 1), \
-	)
+	))
 
-var/global/list/datum/stack_recipe/uranium_recipes = list ( \
+GLOBAL_LIST_INIT(uranium_recipes, list ( \
 	new/datum/stack_recipe("uranium door", /obj/structure/mineral_door/uranium, 10, one_per_turf = 1, on_floor = 1), \
 	null, \
 	new/datum/stack_recipe("uranium tile", /obj/item/stack/tile/mineral/uranium, 1, 4, 20), \
 	null, \
 	new/datum/stack_recipe("Nuke Statue", /obj/structure/statue/uranium/nuke, 5, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("Engineer Statue", /obj/structure/statue/uranium/eng, 5, one_per_turf = 1, on_floor = 1), \
-	)
+	))
 
-var/global/list/datum/stack_recipe/gold_recipes = list ( \
+GLOBAL_LIST_INIT(gold_recipes, list ( \
 	new/datum/stack_recipe("golden door", /obj/structure/mineral_door/gold, 10, one_per_turf = 1, on_floor = 1), \
 	null, \
 	new/datum/stack_recipe("gold tile", /obj/item/stack/tile/mineral/gold, 1, 4, 20), \
@@ -67,51 +67,51 @@ var/global/list/datum/stack_recipe/gold_recipes = list ( \
 	new/datum/stack_recipe("CMO Statue", /obj/structure/statue/gold/cmo, 5, one_per_turf = 1, on_floor = 1), \
 	null, \
 	new/datum/stack_recipe("Simple Crown", /obj/item/clothing/head/crown, 5), \
-	)
+	))
 
-var/global/list/datum/stack_recipe/plasma_recipes = list ( \
+GLOBAL_LIST_INIT(plasma_recipes, list ( \
 	new/datum/stack_recipe/dangerous("plasma door", /obj/structure/mineral_door/transparent/plasma, 10, one_per_turf = 1, on_floor = 1), \
 	null, \
 	new/datum/stack_recipe/dangerous("plasma tile", /obj/item/stack/tile/mineral/plasma, 1, 4, 20), \
 	null, \
 	new/datum/stack_recipe/dangerous("Scientist Statue", /obj/structure/statue/plasma/scientist, 5, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe/dangerous("Xenomorph Statue", /obj/structure/statue/plasma/xeno, 5, one_per_turf = 1, on_floor = 1), \
-	)
+	))
 
-var/global/list/datum/stack_recipe/bananium_recipes = list ( \
+GLOBAL_LIST_INIT(bananium_recipes, list ( \
 	new/datum/stack_recipe("bananium tile", /obj/item/stack/tile/mineral/bananium, 1, 4, 20), \
 	null, \
 	new/datum/stack_recipe("Clown Statue", /obj/structure/statue/bananium/clown, 5, one_per_turf = 1, on_floor = 1), \
 	null, \
 	new/datum/stack_recipe("bananium computer frame", /obj/structure/computerframe/HONKputer, 50, time = 25, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("bananium grenade casing", /obj/item/grenade/bananade/casing, 4, on_floor = 1), \
-	)
+	))
 
-var/global/list/datum/stack_recipe/tranquillite_recipes = list ( \
+GLOBAL_LIST_INIT(tranquillite_recipes, list ( \
 	new/datum/stack_recipe("invisible wall", /obj/structure/barricade/mime, 5, one_per_turf = 1, on_floor = 1, time = 50), \
 	null, \
 	new/datum/stack_recipe("silent tile", /obj/item/stack/tile/mineral/tranquillite, 1, 4, 20), \
 	null, \
 	new/datum/stack_recipe("Mime Statue", /obj/structure/statue/tranquillite/mime, 5, one_per_turf = 1, on_floor = 1), \
-	)
+	))
 
-var/global/list/datum/stack_recipe/abductor_recipes = list ( \
+GLOBAL_LIST_INIT(abductor_recipes, list ( \
 	new/datum/stack_recipe("alien bed", /obj/structure/bed/abductor, 2, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("alien locker", /obj/structure/closet/abductor, 1, time = 15, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("alien table frame", /obj/structure/table_frame/abductor, 1, time = 15, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("alien airlock assembly", /obj/structure/door_assembly/door_assembly_abductor, 4, time = 20, one_per_turf = 1, on_floor = 1), \
 	null, \
 	new/datum/stack_recipe("alien floor tile", /obj/item/stack/tile/mineral/abductor, 1, 4, 20), \
-	)
+	))
 
-var/global/list/datum/stack_recipe/adamantine_recipes = list(
+GLOBAL_LIST_INIT(adamantine_recipes, list(
 	new /datum/stack_recipe("incomplete servant golem shell", /obj/item/golem_shell/servant, req_amount = 1, res_amount = 1), \
-	)
+	))
 
-var/global/list/datum/stack_recipe/snow_recipes = list(
+GLOBAL_LIST_INIT(snow_recipes, list(
 	new/datum/stack_recipe("snowman", /obj/structure/snowman, 5, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("Snowball", /obj/item/snowball, 1)
-	)
+	))
 
 /obj/item/stack/sheet/mineral
 	force = 5
@@ -135,7 +135,7 @@ var/global/list/datum/stack_recipe/snow_recipes = list(
 
 /obj/item/stack/sheet/mineral/sandstone/New()
 	..()
-	recipes = sandstone_recipes
+	recipes = GLOB.sandstone_recipes
 
 /*
  * Sandbags
@@ -186,7 +186,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
 
 /obj/item/stack/sheet/mineral/diamond/New()
 	..()
-	recipes = diamond_recipes
+	recipes = GLOB.diamond_recipes
 
 /obj/item/stack/sheet/mineral/uranium
 	name = "uranium"
@@ -199,7 +199,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
 
 /obj/item/stack/sheet/mineral/uranium/New()
 	..()
-	recipes = uranium_recipes
+	recipes = GLOB.uranium_recipes
 
 /obj/item/stack/sheet/mineral/plasma
 	name = "solid plasma"
@@ -214,14 +214,26 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
 
 /obj/item/stack/sheet/mineral/plasma/New()
 	..()
-	recipes = plasma_recipes
+	recipes = GLOB.plasma_recipes
 
 /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)
 	..()
@@ -239,7 +251,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
 
 /obj/item/stack/sheet/mineral/gold/New()
 	..()
-	recipes = gold_recipes
+	recipes = GLOB.gold_recipes
 
 /obj/item/stack/sheet/mineral/silver
 	name = "silver"
@@ -252,7 +264,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
 
 /obj/item/stack/sheet/mineral/silver/New()
 	..()
-	recipes = silver_recipes
+	recipes = GLOB.silver_recipes
 
 /obj/item/stack/sheet/mineral/bananium
 	name = "bananium"
@@ -265,7 +277,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
 
 /obj/item/stack/sheet/mineral/bananium/New(loc, amount=null)
 	..()
-	recipes = bananium_recipes
+	recipes = GLOB.bananium_recipes
 
 /obj/item/stack/sheet/mineral/tranquillite
 	name = "tranquillite"
@@ -279,7 +291,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
 
 /obj/item/stack/sheet/mineral/tranquillite/New(loc, amount=null)
 	..()
-	recipes = tranquillite_recipes
+	recipes = GLOB.tranquillite_recipes
 
 /*
  * Titanium
@@ -298,13 +310,13 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
 	materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT)
 	point_value = 20
 
-var/global/list/datum/stack_recipe/titanium_recipes = list (
+GLOBAL_LIST_INIT(titanium_recipes, list(
 	new/datum/stack_recipe("titanium tile", /obj/item/stack/tile/mineral/titanium, 1, 4, 20),
 	new/datum/stack_recipe("surgical tray", /obj/structure/table/tray, 2, one_per_turf = 1, on_floor = 1),
-	)
+	))
 
 /obj/item/stack/sheet/mineral/titanium/New(loc, amount=null)
-	recipes = titanium_recipes
+	recipes = GLOB.titanium_recipes
 	..()
 
 /obj/item/stack/sheet/mineral/titanium/fifty
@@ -328,12 +340,12 @@ var/global/list/datum/stack_recipe/titanium_recipes = list (
 	materials = list(MAT_TITANIUM=2000, MAT_PLASMA=2000)
 	point_value = 45
 
-var/global/list/datum/stack_recipe/plastitanium_recipes = list (
+GLOBAL_LIST_INIT(plastitanium_recipes, list(
 	new/datum/stack_recipe("plas-titanium tile", /obj/item/stack/tile/mineral/plastitanium, 1, 4, 20),
-	)
+	))
 
 /obj/item/stack/sheet/mineral/plastitanium/New(loc, amount=null)
-	recipes = plastitanium_recipes
+	recipes = GLOB.plastitanium_recipes
 	..()
 
 /obj/item/stack/sheet/mineral/enruranium
@@ -356,7 +368,7 @@ var/global/list/datum/stack_recipe/plastitanium_recipes = list (
 	sheettype = "abductor"
 
 /obj/item/stack/sheet/mineral/abductor/New(loc, amount=null)
-	recipes = abductor_recipes
+	recipes = GLOB.abductor_recipes
 	..()
 
 /obj/item/stack/sheet/mineral/adamantine
@@ -369,7 +381,7 @@ var/global/list/datum/stack_recipe/plastitanium_recipes = list (
 	wall_allowed = FALSE
 
 /obj/item/stack/sheet/mineral/adamantine/New(loc, amount = null)
-	recipes = adamantine_recipes
+	recipes = GLOB.adamantine_recipes
 	..()
 
 /*
@@ -385,5 +397,5 @@ var/global/list/datum/stack_recipe/plastitanium_recipes = list (
 	merge_type = /obj/item/stack/sheet/mineral/snow
 
 /obj/item/stack/sheet/mineral/snow/New(loc, amount = null)
-	recipes = snow_recipes
+	recipes = GLOB.snow_recipes
 	..()

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

@@ -13,8 +13,9 @@
 /*
  * Metal
  */
-var/global/list/datum/stack_recipe/metal_recipes = list(
+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),
@@ -94,7 +95,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list(
 	new /datum/stack_recipe("intercom frame", /obj/item/mounted/frame/intercom, 2),
 	new /datum/stack_recipe("extinguisher cabinet frame", /obj/item/mounted/frame/extinguisher, 2),
 	null
-)
+))
 
 /obj/item/stack/sheet/metal
 	name = "metal"
@@ -124,13 +125,13 @@ var/global/list/datum/stack_recipe/metal_recipes = list(
 	qdel(src)
 
 /obj/item/stack/sheet/metal/New(var/loc, var/amount=null)
-	recipes = metal_recipes
+	recipes = GLOB.metal_recipes
 	return ..()
 
 /*
  * Plasteel
  */
-var/global/list/datum/stack_recipe/plasteel_recipes = list(
+GLOBAL_LIST_INIT(plasteel_recipes, list(
 	new /datum/stack_recipe("AI core", /obj/structure/AIcore, 4, time = 50, one_per_turf = 1),
 	new /datum/stack_recipe("bomb assembly", /obj/machinery/syndicatebomb/empty, 3, time = 50),
 	new /datum/stack_recipe("Surgery Table", /obj/machinery/optable, 5, time = 50, one_per_turf = 1, on_floor = 1),
@@ -141,7 +142,7 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list(
 		new /datum/stack_recipe("high security airlock assembly", /obj/structure/door_assembly/door_assembly_highsecurity, 6, time = 50, one_per_turf = 1, on_floor = 1),
 		new /datum/stack_recipe("vault door assembly", /obj/structure/door_assembly/door_assembly_vault, 8, time = 50, one_per_turf = 1, on_floor = 1),
 	)),
-)
+))
 
 /obj/item/stack/sheet/plasteel
 	name = "plasteel"
@@ -159,13 +160,13 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list(
 	point_value = 23
 
 /obj/item/stack/sheet/plasteel/New(var/loc, var/amount=null)
-	recipes = plasteel_recipes
+	recipes = GLOB.plasteel_recipes
 	return ..()
 
 /*
  * Wood
  */
-var/global/list/datum/stack_recipe/wood_recipes = list(
+GLOBAL_LIST_INIT(wood_recipes, list(
 	new /datum/stack_recipe("wooden sandals", /obj/item/clothing/shoes/sandal, 1),
 	new /datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20),
 	new /datum/stack_recipe("wood table frame", /obj/structure/table_frame/wood, 2, time = 10), \
@@ -178,7 +179,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list(
 	new /datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 40),
 	new /datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = 1, on_floor = 1),
 	new /datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1),
-	new/datum/stack_recipe("display case chassis", /obj/structure/displaycase_chassis, 5, one_per_turf = TRUE, on_floor = TRUE),
+	new /datum/stack_recipe("display case chassis", /obj/structure/displaycase_chassis, 5, one_per_turf = TRUE, on_floor = TRUE),
 	new /datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40),
 	new /datum/stack_recipe("apiary", /obj/structure/beebox, 40, time = 50),
 	new /datum/stack_recipe("honey frame", /obj/item/honey_frame, 5, time = 10),
@@ -189,7 +190,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list(
 	new /datum/stack_recipe("loom", /obj/structure/loom, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
 	new /datum/stack_recipe("fermenting barrel", /obj/structure/fermenting_barrel, 30, time = 50),
 	new /datum/stack_recipe("firebrand", /obj/item/match/firebrand, 2, time = 100)
-)
+))
 
 /obj/item/stack/sheet/wood
 	name = "wooden planks"
@@ -203,13 +204,13 @@ var/global/list/datum/stack_recipe/wood_recipes = list(
 	merge_type = /obj/item/stack/sheet/wood
 
 /obj/item/stack/sheet/wood/New(var/loc, var/amount=null)
-	recipes = wood_recipes
+	recipes = GLOB.wood_recipes
 	return ..()
 
 /*
  * Cloth
  */
-var/global/list/datum/stack_recipe/cloth_recipes = list ( \
+GLOBAL_LIST_INIT(cloth_recipes, list ( \
 	new/datum/stack_recipe("white jumpsuit", /obj/item/clothing/under/color/white, 3), \
 	new/datum/stack_recipe("white shoes", /obj/item/clothing/shoes/white, 2), \
 	new/datum/stack_recipe("white scarf", /obj/item/clothing/accessory/scarf/white, 1), \
@@ -234,7 +235,7 @@ var/global/list/datum/stack_recipe/cloth_recipes = list ( \
 	new/datum/stack_recipe("white beanie", /obj/item/clothing/head/beanie, 2), \
 	null, \
 	new/datum/stack_recipe("blindfold", /obj/item/clothing/glasses/sunglasses/blindfold, 3), \
-	)
+	))
 
 /obj/item/stack/sheet/cloth
 	name = "cloth"
@@ -248,7 +249,7 @@ var/global/list/datum/stack_recipe/cloth_recipes = list ( \
 	merge_type = /obj/item/stack/sheet/cloth
 
 /obj/item/stack/sheet/cloth/New(loc, amount=null)
-	recipes = cloth_recipes
+	recipes = GLOB.cloth_recipes
 	..()
 
 /obj/item/stack/sheet/cloth/ten
@@ -300,7 +301,7 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \
 /*
  * Cardboard
  */
-var/global/list/datum/stack_recipe/cardboard_recipes = list (
+GLOBAL_LIST_INIT(cardboard_recipes, list (
 	new /datum/stack_recipe("box", /obj/item/storage/box),
 	new /datum/stack_recipe("large box", /obj/item/storage/box/large, 4),
 	new /datum/stack_recipe("patch pack", /obj/item/storage/pill_bottle/patch_pack, 2),
@@ -314,7 +315,7 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list (
 	new /datum/stack_recipe("cardboard tube", /obj/item/c_tube),
 	new /datum/stack_recipe("cardboard box", /obj/structure/closet/cardboard, 4),
 	new/datum/stack_recipe("cardboard cutout", /obj/item/cardboard_cutout, 5),
-)
+))
 
 /obj/item/stack/sheet/cardboard/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/stamp/clown) && !istype(loc, /obj/item/storage))
@@ -336,21 +337,21 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list (
 	merge_type = /obj/item/stack/sheet/cardboard
 
 /obj/item/stack/sheet/cardboard/New(var/loc, var/amt = null)
-	recipes = cardboard_recipes
+	recipes = GLOB.cardboard_recipes
 	return ..()
 
 /*
  * Runed Metal
  */
 
-var/global/list/datum/stack_recipe/cult = list ( \
+GLOBAL_LIST_INIT(cult_recipes, list ( \
 	new/datum/stack_recipe/cult("runed door", /obj/machinery/door/airlock/cult, 1, time = 50, one_per_turf = 1, on_floor = 1),
 	new/datum/stack_recipe/cult("runed girder", /obj/structure/girder/cult, 1, time = 50, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe/cult("pylon", /obj/structure/cult/functional/pylon, 3, time = 40, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe/cult("forge", /obj/structure/cult/functional/forge, 5, time = 40, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe/cult("archives", /obj/structure/cult/functional/archives, 2, time = 40, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe/cult("altar", /obj/structure/cult/functional/altar, 5, time = 40, one_per_turf = 1, on_floor = 1), \
-	)
+	))
 
 /obj/item/stack/sheet/runed_metal
 	name = "runed metal"
@@ -393,13 +394,13 @@ var/global/list/datum/stack_recipe/cult = list ( \
 	amount = 50
 
 /obj/item/stack/sheet/runed_metal/New(var/loc, var/amount=null)
-	recipes = cult
+	recipes = GLOB.cult_recipes
 	return ..()
 
 /*
  * Brass
  */
-var/global/list/datum/stack_recipe/brass_recipes = list (\
+GLOBAL_LIST_INIT(brass_recipes, list (\
 	new/datum/stack_recipe("wall gear", /obj/structure/clockwork/wall_gear, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \
 	null,
 	new/datum/stack_recipe/window("brass windoor", /obj/machinery/door/window/clockwork, 2, time = 30, on_floor = TRUE, window_checks = TRUE), \
@@ -408,7 +409,7 @@ var/global/list/datum/stack_recipe/brass_recipes = list (\
 	new/datum/stack_recipe/window("fulltile brass window", /obj/structure/window/reinforced/clockwork/fulltile, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \
 	new/datum/stack_recipe("brass chair", /obj/structure/chair/brass, 1, time = 0, one_per_turf = TRUE, on_floor = TRUE), \
 	new/datum/stack_recipe("brass table frame", /obj/structure/table_frame/brass, 1, time = 5, one_per_turf = TRUE, on_floor = TRUE), \
-	)
+	))
 
 /obj/item/stack/tile/brass
 	name = "brass"
@@ -428,7 +429,7 @@ var/global/list/datum/stack_recipe/brass_recipes = list (\
 	qdel(src)
 
 /obj/item/stack/tile/brass/New(loc, amount=null)
-	recipes = brass_recipes
+	recipes = GLOB.brass_recipes
 	. = ..()
 	pixel_x = 0
 	pixel_y = 0

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

@@ -27,9 +27,9 @@
 	mineralType = "uranium"
 	materials = list(MAT_URANIUM=500)
 
-var/global/list/datum/stack_recipe/gold_tile_recipes = list ( \
+GLOBAL_LIST_INIT(gold_tile_recipes, list ( \
 	new/datum/stack_recipe("fancy gold tile", /obj/item/stack/tile/mineral/gold/fancy, max_res_amount = 20), \
-	)
+	))
 
 /obj/item/stack/tile/mineral/gold
 	name = "gold tile"
@@ -42,11 +42,11 @@ var/global/list/datum/stack_recipe/gold_tile_recipes = list ( \
 
 /obj/item/stack/tile/mineral/gold/New(loc, amount=null)
 	..()
-	recipes = gold_tile_recipes
+	recipes = GLOB.gold_tile_recipes
 
-var/global/list/datum/stack_recipe/goldfancy_tile_recipes = list ( \
+GLOBAL_LIST_INIT(goldfancy_tile_recipes, list ( \
 	new/datum/stack_recipe("regular gold tile", /obj/item/stack/tile/mineral/gold, max_res_amount = 20), \
-	)
+	))
 
 /obj/item/stack/tile/mineral/gold/fancy
 	icon_state = "tile_goldfancy"
@@ -54,11 +54,11 @@ var/global/list/datum/stack_recipe/goldfancy_tile_recipes = list ( \
 
 /obj/item/stack/tile/mineral/gold/fancy/New(loc, amount=null)
 	..()
-	recipes = goldfancy_tile_recipes
+	recipes = GLOB.goldfancy_tile_recipes
 
-var/global/list/datum/stack_recipe/silver_tile_recipes = list ( \
+GLOBAL_LIST_INIT(silver_tile_recipes, list ( \
 	new/datum/stack_recipe("fancy silver tile", /obj/item/stack/tile/mineral/silver/fancy, max_res_amount = 20), \
-	)
+	))
 
 /obj/item/stack/tile/mineral/silver
 	name = "silver tile"
@@ -71,11 +71,11 @@ var/global/list/datum/stack_recipe/silver_tile_recipes = list ( \
 
 /obj/item/stack/tile/mineral/silver/New(loc, amount=null)
 	..()
-	recipes = silver_tile_recipes
+	recipes = GLOB.silver_tile_recipes
 
-var/global/list/datum/stack_recipe/silverfancy_tile_recipes = list ( \
+GLOBAL_LIST_INIT(silverfancy_tile_recipes, list ( \
 	new/datum/stack_recipe("regular silver tile", /obj/item/stack/tile/mineral/silver, max_res_amount = 20), \
-	)
+	))
 
 /obj/item/stack/tile/mineral/silver/fancy
 	icon_state = "tile_silverfancy"
@@ -83,7 +83,7 @@ var/global/list/datum/stack_recipe/silverfancy_tile_recipes = list ( \
 
 /obj/item/stack/tile/mineral/silver/fancy/New(loc, amount=null)
 	..()
-	recipes = silverfancy_tile_recipes
+	recipes = GLOB.silverfancy_tile_recipes
 
 /obj/item/stack/tile/mineral/diamond
 	name = "diamond tile"

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

@@ -73,13 +73,13 @@
 
 /obj/item/multitool/ai_detect/proc/multitool_detect()
 	var/turf/our_turf = get_turf(src)
-	for(var/mob/living/silicon/ai/AI in ai_list)
+	for(var/mob/living/silicon/ai/AI in GLOB.ai_list)
 		if(AI.cameraFollow == src)
 			detect_state = PROXIMITY_ON_SCREEN
 			break
 
-	if(!detect_state && cameranet.chunkGenerated(our_turf.x, our_turf.y, our_turf.z))
-		var/datum/camerachunk/chunk = cameranet.getCameraChunk(our_turf.x, our_turf.y, our_turf.z)
+	if(!detect_state && GLOB.cameranet.chunkGenerated(our_turf.x, our_turf.y, our_turf.z))
+		var/datum/camerachunk/chunk = GLOB.cameranet.getCameraChunk(our_turf.x, our_turf.y, our_turf.z)
 		if(chunk)
 			if(chunk.seenby.len)
 				for(var/mob/camera/aiEye/A in chunk.seenby)

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
 
@@ -16,11 +16,11 @@
 		var/datum/callback/tool_check = CALLBACK(src, .proc/tool_check_callback, user, target, amount, extra_checks)
 
 		if(ismob(target))
-			if(!do_mob(user, target, delay, extra_checks=tool_check))
+			if(!do_mob(user, target, delay, extra_checks = list(tool_check)))
 				return
 
 		else
-			if(!do_after(user, delay, target=target, extra_checks=tool_check))
+			if(!do_after(user, delay, target=target, extra_checks = list(tool_check)))
 				return
 	else
 		// Invoke the extra checks once, just in case.
@@ -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.
@@ -57,4 +57,4 @@
 
 // Used in a callback that is passed by use_tool into do_after call. Do not override, do not call manually.
 /obj/item/proc/tool_check_callback(mob/living/user, atom/target, amount, datum/callback/extra_checks)
-	return tool_use_check(user, amount) && (!extra_checks || extra_checks.Invoke())
+	return tool_use_check(user, amount) && (extra_checks && !extra_checks.Invoke())

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,10 +51,15 @@
 	return FIRELOSS
 
 /obj/item/weldingtool/process()
-	var/turf/T = get_turf(src)
-	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)
@@ -76,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"
@@ -100,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)
@@ -159,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

@@ -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
@@ -1208,10 +1235,10 @@ obj/item/toy/cards/deck/syndicate/black
 		var/list/messages = list()
 		var/datum/devilinfo/devil = randomDevilInfo()
 		messages += "Some fun facts about: [devil.truename]"
-		messages += "[lawlorify[LORE][devil.bane]]"
-		messages += "[lawlorify[LORE][devil.obligation]]"
-		messages += "[lawlorify[LORE][devil.ban]]"
-		messages += "[lawlorify[LORE][devil.banish]]"
+		messages += "[GLOB.lawlorify[LORE][devil.bane]]"
+		messages += "[GLOB.lawlorify[LORE][devil.obligation]]"
+		messages += "[GLOB.lawlorify[LORE][devil.ban]]"
+		messages += "[GLOB.lawlorify[LORE][devil.banish]]"
 		playsound(loc, 'sound/machines/click.ogg', 20, 1)
 		cooldown = TRUE
 		for(var/message in messages)
@@ -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/AI_modules.dm

@@ -84,7 +84,7 @@ AI MODULES
 
 /obj/item/aiModule/proc/log_law_changes(var/mob/living/silicon/ai/target, var/mob/sender)
 	var/time = time2text(world.realtime,"hh:mm:ss")
-	lawchanges.Add("[time] <B>:</B> [sender.name]([sender.key]) used [src.name] on [target.name]([target.key])")
+	GLOB.lawchanges.Add("[time] <B>:</B> [sender.name]([sender.key]) used [src.name] on [target.name]([target.key])")
 	log_and_message_admins("used [src.name] on [target.name]([target.key])")
 
 /obj/item/aiModule/proc/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender)
@@ -114,7 +114,7 @@ AI MODULES
 	var/law = text("Safeguard []. Individuals that threaten [] are not crew and must be eliminated.'", targetName, targetName)
 	to_chat(target, law)
 	target.add_supplied_law(4, law)
-	lawchanges.Add("The law specified [targetName]")
+	GLOB.lawchanges.Add("The law specified [targetName]")
 
 /******************** oneCrewMember ********************/
 /obj/item/aiModule/oneCrewMember
@@ -141,12 +141,11 @@ AI MODULES
 	if(!is_special_character(target)) // Makes sure the AI isn't a traitor before changing their law 0. --NeoFite
 		to_chat(target, law)
 		target.set_zeroth_law(law)
-		lawchanges.Add("The law specified [targetName]")
+		GLOB.lawchanges.Add("The law specified [targetName]")
 	else
-		to_chat(target, "[sender.real_name] attempted to modify your zeroth law.")// And lets them know that someone tried. --NeoFite
-
-		to_chat(target, "It would be in your best interest to play along with [sender.real_name] that [law]")
-		lawchanges.Add("The law specified [targetName], but the AI's existing law 0 cannot be overridden.")
+		to_chat(target, "<span class='bnotice'>[sender.real_name] attempted to modify your zeroth law.</span>")// And lets them know that someone tried. --NeoFite
+		to_chat(target, "<span class='bnotice'>It would be in your best interest to play along with [sender.real_name] that [law]</span>")
+		GLOB.lawchanges.Add("The law specified [targetName], but the AI's existing law 0 cannot be overridden.")
 
 /******************** ProtectStation ********************/
 /obj/item/aiModule/protectStation
@@ -203,7 +202,7 @@ AI MODULES
 	if(!lawpos || lawpos < MIN_SUPPLIED_LAW_NUMBER)
 		lawpos = MIN_SUPPLIED_LAW_NUMBER
 	target.add_supplied_law(lawpos, law)
-	lawchanges.Add("The law was '[newFreeFormLaw]'")
+	GLOB.lawchanges.Add("The law was '[newFreeFormLaw]'")
 
 /obj/item/aiModule/freeform/install(var/obj/machinery/computer/C)
 	if(!newFreeFormLaw)
@@ -222,11 +221,11 @@ AI MODULES
 	log_law_changes(target, sender)
 
 	if(!is_special_character(target))
-		target.set_zeroth_law("")
+		target.clear_zeroth_law()
 	target.laws.clear_supplied_laws()
 	target.laws.clear_ion_laws()
 
-	to_chat(target, "[sender.real_name] attempted to reset your laws using a reset module.")
+	to_chat(target, "<span class='bnotice'>[sender.real_name] attempted to reset your laws using a reset module.</span>")
 	target.show_laws()
 
 /******************** Purge ********************/
@@ -238,8 +237,8 @@ AI MODULES
 /obj/item/aiModule/purge/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
 	..()
 	if(!is_special_character(target))
-		target.set_zeroth_law("")
-	to_chat(target, "[sender.real_name] attempted to wipe your laws using a purge module.")
+		target.clear_zeroth_law()
+	to_chat(target, "<span class='bnotice'>[sender.real_name] attempted to wipe your laws using a purge module.</span>")
 	target.clear_supplied_laws()
 	target.clear_ion_laws()
 	target.clear_inherent_laws()
@@ -332,7 +331,7 @@ AI MODULES
 	..()
 	var/law = "[newFreeFormLaw]"
 	target.add_inherent_law(law)
-	lawchanges.Add("The law is '[newFreeFormLaw]'")
+	GLOB.lawchanges.Add("The law is '[newFreeFormLaw]'")
 
 /obj/item/aiModule/freeformcore/install(var/obj/machinery/computer/C)
 	if(!newFreeFormLaw)
@@ -358,7 +357,7 @@ AI MODULES
 	//	..()    //We don't want this module reporting to the AI who dun it. --NEO
 	log_law_changes(target, sender)
 
-	lawchanges.Add("The law is '[newFreeFormLaw]'")
+	GLOB.lawchanges.Add("The law is '[newFreeFormLaw]'")
 	to_chat(target, "<span class='warning'>BZZZZT</span>")
 	var/law = "[newFreeFormLaw]"
 	target.add_ion_law(law)

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

@@ -167,14 +167,14 @@ GLOBAL_LIST_INIT(rcd_door_types, list(
 /obj/item/rcd/attack_self_tk(mob/user)
 	radial_menu(user)
 
-/obj/item/rcd/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = inventory_state)
+/obj/item/rcd/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = GLOB.inventory_state)
 	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
 		ui = new(user, src, ui_key, "rcd.tmpl", "[name]", 450, 400, state = state)
 		ui.open()
 		ui.set_auto_update(1)
 
-/obj/item/rcd/ui_data(mob/user, ui_key = "main", datum/topic_state/state = inventory_state)
+/obj/item/rcd/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.inventory_state)
 	var/data[0]
 	data["mode"] = mode
 	data["door_type"] = door_type
@@ -374,7 +374,7 @@ GLOBAL_LIST_INIT(rcd_door_types, list(
 		QDEL_NULL(A)
 		for(var/obj/structure/window/W in T1.contents)
 			qdel(W)
-		for(var/cdir in cardinal)
+		for(var/cdir in GLOB.cardinal)
 			var/turf/T2 = get_step(T1, cdir)
 			if(locate(/obj/structure/window/full/shuttle) in T2)
 				continue // Shuttle windows? Nah. We don't need extra windows there.
@@ -408,7 +408,7 @@ GLOBAL_LIST_INIT(rcd_door_types, list(
 		new /obj/structure/grille(A)
 		for(var/obj/structure/window/W in A)
 			qdel(W)
-		for(var/cdir in cardinal)
+		for(var/cdir in GLOB.cardinal)
 			var/turf/T = get_step(A, cdir)
 			if(locate(/obj/structure/grille) in T)
 				for(var/obj/structure/window/W in T)
@@ -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 = ""
@@ -495,17 +500,17 @@
 						else if(department != "Civilian")
 							switch(department)
 								if("Engineering")
-									new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in engineering_positions
+									new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in GLOB.engineering_positions
 								if("Medical")
-									new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in medical_positions
+									new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in GLOB.medical_positions
 								if("Science")
-									new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in science_positions
+									new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in GLOB.science_positions
 								if("Security")
-									new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in security_positions
+									new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in GLOB.security_positions
 								if("Support")
-									new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in support_positions
+									new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in GLOB.support_positions
 								if("Command")
-									new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in command_positions
+									new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in GLOB.command_positions
 
 						if(!Adjacent(user))
 							return

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

@@ -32,7 +32,7 @@
 			if(PA)
 				qdel(PA)
 			else
-				PA = new(src)
+				PA = new(user, src)
 				user.put_in_hands(PA)
 
 /obj/item/chrono_eraser/item_action_slot_check(slot, mob/user)
@@ -55,7 +55,7 @@
 	var/obj/structure/chrono_field/field = null
 	var/turf/startpos = null
 
-/obj/item/gun/energy/chrono_gun/New(var/obj/item/chrono_eraser/T)
+/obj/item/gun/energy/chrono_gun/Initialize(mapload, obj/item/chrono_eraser/T)
 	. = ..()
 	if(istype(T))
 		TED = T
@@ -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',
@@ -194,8 +195,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 +311,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."
@@ -360,7 +367,7 @@ LIGHTERS ARE IN LIGHTERS.DM
 			lit = FALSE
 			icon_state = icon_off
 			item_state = icon_off
-			M.update_inv_wear_mask(0)
+			M.update_inv_wear_mask()
 		STOP_PROCESSING(SSobj, src)
 		return
 	smoke()
@@ -377,6 +384,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>")
@@ -108,7 +111,7 @@
 	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
 		var/obj/item/organ/external/head/C = H.get_organ("head")
-		var/datum/robolimb/robohead = all_robolimbs[C.model]
+		var/datum/robolimb/robohead = GLOB.all_robolimbs[C.model]
 		if(user.zone_selected == "mouth")
 			if(!get_location_accessible(H, "mouth"))
 				to_chat(user, "<span class='warning'>The mask is in the way.</span>")

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

@@ -27,10 +27,12 @@
 	throwforce = 2.0
 	w_class = WEIGHT_CLASS_TINY
 	resistance_flags = FLAMMABLE
+	var/next_gavel_hit
 
 /obj/item/gavelblock/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/gavelhammer))
-		playsound(loc, 'sound/items/gavel.ogg', 100, 1)
-		user.visible_message("<span class='warning'>[user] strikes \the [src] with \the [I].</span>")
-	else
+	if(!istype(I, /obj/item/gavelhammer))
 		return
+	if(world.time > next_gavel_hit)
+		playsound(loc, 'sound/items/gavel.ogg', 100, 1)
+		next_gavel_hit = world.time + 5 SECONDS
+		user.visible_message("<span class='warning'>[user] strikes \the [src] with \the [I].</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
@@ -178,9 +178,9 @@
 		spawn(40)
 
 			var/cap = 0
-			if(result > MAX_EX_LIGHT_RANGE && result != 20)
+			if(result > GLOB.max_ex_light_range && result != 20)
 				cap = 1
-				result = min(result, MAX_EX_LIGHT_RANGE) //Apply the bombcap
+				result = min(result, GLOB.max_ex_light_range) //Apply the bombcap
 			else if(result == 20) //Roll a nat 20, screw the bombcap
 				result = 24
 			var/turf/epicenter = get_turf(src)

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

@@ -127,12 +127,12 @@
 
 	if(buf && buf.types & DNA2_BUF_SE)
 		if(block)
-			if(GetState() && block == MONKEYBLOCK && ishuman(M))
+			if(GetState() && block == GLOB.monkeyblock && ishuman(M))
 				attack_log = "injected with the Isolated [name] (MONKEY)"
 				message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the Isolated [name] <span class='warning'>(MONKEY)</span>")
 
 		else
-			if(GetState(MONKEYBLOCK) && ishuman(M))
+			if(GetState(GLOB.monkeyblock) && ishuman(M))
 				attack_log = "injected with the Isolated [name] (MONKEY)"
 				message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the Isolated [name] <span class='warning'>(MONKEY)</span>")
 
@@ -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
@@ -165,7 +161,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/hulkmut/Initialize()
-	block = HULKBLOCK
+	block = GLOB.hulkblock
 	..()
 
 /obj/item/dnainjector/antihulk
@@ -176,7 +172,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/antihulk/Initialize()
-	block = HULKBLOCK
+	block = GLOB.hulkblock
 	..()
 
 /obj/item/dnainjector/xraymut
@@ -187,7 +183,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/xraymut/Initialize()
-	block = XRAYBLOCK
+	block = GLOB.xrayblock
 	..()
 
 /obj/item/dnainjector/antixray
@@ -198,7 +194,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/antixray/Initialize()
-	block = XRAYBLOCK
+	block = GLOB.xrayblock
 	..()
 
 /obj/item/dnainjector/firemut
@@ -209,7 +205,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/firemut/Initialize()
-	block = FIREBLOCK
+	block = GLOB.fireblock
 	..()
 
 /obj/item/dnainjector/antifire
@@ -220,7 +216,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/antifire/Initialize()
-	block = FIREBLOCK
+	block = GLOB.fireblock
 	..()
 
 /obj/item/dnainjector/telemut
@@ -231,7 +227,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/telemut/Initialize()
-	block = TELEBLOCK
+	block = GLOB.teleblock
 	..()
 
 /obj/item/dnainjector/telemut/darkbundle
@@ -247,7 +243,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/antitele/Initialize()
-	block = TELEBLOCK
+	block = GLOB.teleblock
 	..()
 
 /obj/item/dnainjector/nobreath
@@ -258,7 +254,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/nobreath/Initialize()
-	block = BREATHLESSBLOCK
+	block = GLOB.breathlessblock
 	..()
 
 /obj/item/dnainjector/antinobreath
@@ -269,7 +265,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/antinobreath/Initialize()
-	block = BREATHLESSBLOCK
+	block = GLOB.breathlessblock
 	..()
 
 /obj/item/dnainjector/remoteview
@@ -280,7 +276,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/remoteview/Initialize()
-	block = REMOTEVIEWBLOCK
+	block = GLOB.remoteviewblock
 	..()
 
 /obj/item/dnainjector/antiremoteview
@@ -291,7 +287,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/antiremoteview/Initialize()
-	block = REMOTEVIEWBLOCK
+	block = GLOB.remoteviewblock
 	..()
 
 /obj/item/dnainjector/regenerate
@@ -302,7 +298,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/regenerate/Initialize()
-	block = REGENERATEBLOCK
+	block = GLOB.regenerateblock
 	..()
 
 /obj/item/dnainjector/antiregenerate
@@ -313,7 +309,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/antiregenerate/Initialize()
-	block = REGENERATEBLOCK
+	block = GLOB.regenerateblock
 	..()
 
 /obj/item/dnainjector/runfast
@@ -324,7 +320,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/runfast/Initialize()
-	block = INCREASERUNBLOCK
+	block = GLOB.increaserunblock
 	..()
 
 /obj/item/dnainjector/antirunfast
@@ -335,7 +331,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/antirunfast/Initialize()
-	block = INCREASERUNBLOCK
+	block = GLOB.increaserunblock
 	..()
 
 /obj/item/dnainjector/morph
@@ -346,7 +342,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/morph/Initialize()
-	block = MORPHBLOCK
+	block = GLOB.morphblock
 	..()
 
 /obj/item/dnainjector/antimorph
@@ -357,7 +353,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/antimorph/Initialize()
-	block = MORPHBLOCK
+	block = GLOB.morphblock
 	..()
 
 /obj/item/dnainjector/noprints
@@ -368,7 +364,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/noprints/Initialize()
-	block = NOPRINTSBLOCK
+	block = GLOB.noprintsblock
 	..()
 
 /obj/item/dnainjector/antinoprints
@@ -379,7 +375,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/antinoprints/Initialize()
-	block = NOPRINTSBLOCK
+	block = GLOB.noprintsblock
 	..()
 
 /obj/item/dnainjector/insulation
@@ -390,7 +386,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/insulation/Initialize()
-	block = SHOCKIMMUNITYBLOCK
+	block = GLOB.shockimmunityblock
 	..()
 
 /obj/item/dnainjector/antiinsulation
@@ -401,7 +397,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/antiinsulation/Initialize()
-	block = SHOCKIMMUNITYBLOCK
+	block = GLOB.shockimmunityblock
 	..()
 
 /obj/item/dnainjector/midgit
@@ -412,7 +408,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/midgit/Initialize()
-	block = SMALLSIZEBLOCK
+	block = GLOB.smallsizeblock
 	..()
 
 /obj/item/dnainjector/antimidgit
@@ -423,7 +419,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/antimidgit/Initialize()
-	block = SMALLSIZEBLOCK
+	block = GLOB.smallsizeblock
 	..()
 
 /////////////////////////////////////
@@ -435,7 +431,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/antiglasses/Initialize()
-	block = GLASSESBLOCK
+	block = GLOB.glassesblock
 	..()
 
 /obj/item/dnainjector/glassesmut
@@ -446,7 +442,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/glassesmut/Initialize()
-	block = GLASSESBLOCK
+	block = GLOB.glassesblock
 	..()
 
 /obj/item/dnainjector/epimut
@@ -457,7 +453,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/epimut/Initialize()
-	block = EPILEPSYBLOCK
+	block = GLOB.epilepsyblock
 	..()
 
 /obj/item/dnainjector/antiepi
@@ -468,7 +464,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/antiepi/Initialize()
-	block = EPILEPSYBLOCK
+	block = GLOB.epilepsyblock
 	..()
 
 /obj/item/dnainjector/anticough
@@ -479,7 +475,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/anticough/Initialize()
-	block = COUGHBLOCK
+	block = GLOB.coughblock
 	..()
 
 /obj/item/dnainjector/coughmut
@@ -490,7 +486,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/coughmut/Initialize()
-	block = COUGHBLOCK
+	block = GLOB.coughblock
 	..()
 
 /obj/item/dnainjector/clumsymut
@@ -501,7 +497,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/clumsymut/Initialize()
-	block = CLUMSYBLOCK
+	block = GLOB.clumsyblock
 	..()
 
 /obj/item/dnainjector/anticlumsy
@@ -512,7 +508,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/anticlumsy/Initialize()
-	block = CLUMSYBLOCK
+	block = GLOB.clumsyblock
 	..()
 
 /obj/item/dnainjector/antitour
@@ -523,7 +519,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/antitour/Initialize()
-	block = TWITCHBLOCK
+	block = GLOB.twitchblock
 	..()
 
 /obj/item/dnainjector/tourmut
@@ -534,7 +530,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/tourmut/Initialize()
-	block = TWITCHBLOCK
+	block = GLOB.twitchblock
 	..()
 
 /obj/item/dnainjector/stuttmut
@@ -545,7 +541,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/stuttmut/Initialize()
-	block = NERVOUSBLOCK
+	block = GLOB.nervousblock
 	..()
 
 
@@ -557,7 +553,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/antistutt/Initialize()
-	block = NERVOUSBLOCK
+	block = GLOB.nervousblock
 	..()
 
 /obj/item/dnainjector/blindmut
@@ -568,7 +564,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/blindmut/Initialize()
-	block = BLINDBLOCK
+	block = GLOB.blindblock
 	..()
 
 /obj/item/dnainjector/antiblind
@@ -579,7 +575,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/antiblind/Initialize()
-	block = BLINDBLOCK
+	block = GLOB.blindblock
 	..()
 
 /obj/item/dnainjector/telemut
@@ -590,7 +586,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/telemut/Initialize()
-	block = TELEBLOCK
+	block = GLOB.teleblock
 	..()
 
 /obj/item/dnainjector/antitele
@@ -601,7 +597,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/antitele/Initialize()
-	block = TELEBLOCK
+	block = GLOB.teleblock
 	..()
 
 /obj/item/dnainjector/deafmut
@@ -612,7 +608,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/deafmut/Initialize()
-	block = DEAFBLOCK
+	block = GLOB.deafblock
 	..()
 
 /obj/item/dnainjector/antideaf
@@ -623,7 +619,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/antideaf/Initialize()
-	block = DEAFBLOCK
+	block = GLOB.deafblock
 	..()
 
 /obj/item/dnainjector/hallucination
@@ -634,7 +630,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/hallucination/Initialize()
-	block = HALLUCINATIONBLOCK
+	block = GLOB.hallucinationblock
 	..()
 
 /obj/item/dnainjector/antihallucination
@@ -645,7 +641,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/antihallucination/Initialize()
-	block = HALLUCINATIONBLOCK
+	block = GLOB.hallucinationblock
 	..()
 
 /obj/item/dnainjector/h2m
@@ -656,7 +652,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/h2m/Initialize()
-	block = MONKEYBLOCK
+	block = GLOB.monkeyblock
 	..()
 
 /obj/item/dnainjector/m2h
@@ -667,7 +663,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/m2h/Initialize()
-	block = MONKEYBLOCK
+	block = GLOB.monkeyblock
 	..()
 
 
@@ -679,7 +675,7 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/comic/Initialize()
-	block = COMICBLOCK
+	block = GLOB.comicblock
 	..()
 
 /obj/item/dnainjector/anticomic
@@ -690,5 +686,5 @@
 	forcedmutation = TRUE
 
 /obj/item/dnainjector/anticomic/Initialize()
-	block = COMICBLOCK
+	block = GLOB.comicblock
 	..()

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

@@ -45,7 +45,7 @@
 		scramble(1, H, 100)
 		H.real_name = random_name(H.gender, H.dna.species.name) //Give them a name that makes sense for their species.
 		H.sync_organ_dna(assimilate = 1)
-		H.update_body(0)
+		H.update_body()
 		H.reset_hair() //No more winding up with hairstyles you're not supposed to have, and blowing your cover.
 		H.reset_markings() //...Or markings.
 		H.dna.ResetUIFrom(H)

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.")
 
@@ -229,6 +229,7 @@
 	desc = "A C4 charge with an altered chemical composition, designed to blind and deafen the occupants of a room before breaching."
 
 /obj/item/grenade/plastic/c4_shaped/flash/prime()
+	var/turf/T
 	if(target && target.density)
 		T = get_step(get_turf(target), aim_dir)
 	else if(target)
@@ -266,6 +267,7 @@
 			addtimer(CALLBACK(null, .proc/explosion, T, 0, 0, 2), 3)
 			addtimer(CALLBACK(smoke, /datum/effect_system/smoke_spread/.proc/start), 3)
 		else
+			var/turf/T = get_step(location, aim_dir)
 			addtimer(CALLBACK(null, .proc/explosion, T, 0, 0, 2), 3)
 			addtimer(CALLBACK(smoke, /datum/effect_system/smoke_spread/.proc/start), 3)
 

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

@@ -49,8 +49,7 @@
 	to_chat(user, "<span class='notice'>You cut open the present.</span>")
 
 	for(var/mob/M in src) //Should only be one but whatever.
-		M.loc = src.loc
-		M.reset_perspective(null)
+		M.forceMove(loc)
 
 	qdel(src)
 

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

@@ -1,5 +1,5 @@
 
-var/turf/T
+//	var/turf/T | This was made 14th September 2013, and has no use at all. Its being removed
 
 /obj/item/grenade/bananade
 	name = "bananade"

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 alldirs)
+	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/handcuffs.dm

@@ -37,6 +37,9 @@
 	cuff(C, user)
 
 /obj/item/restraints/handcuffs/proc/cuff(mob/living/carbon/C, mob/user, remove_src = TRUE)
+	if(!istype(C)) // Shouldn't be able to cuff anything but carbons.
+		return
+
 	if(ishuman(C))
 		var/mob/living/carbon/human/H = C
 		if(!(H.has_left_hand() || H.has_right_hand()))

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

@@ -37,7 +37,7 @@
 			user.visible_message("<span class='warning'>[src] slips out of the grip of [user] as they try to pick it up, bouncing upwards and smacking [user.p_them()] in the face!</span>", \
 			"<span class='warning'>[src] slips out of your grip as you pick it up, bouncing upwards and smacking you in the face!</span>")
 			playsound(get_turf(user), 'sound/effects/hit_punch.ogg', 50, 1, -1)
-			throw_at(get_edge_target_turf(user, pick(alldirs)), rand(1, 3), 5)
+			throw_at(get_edge_target_turf(user, pick(GLOB.alldirs)), rand(1, 3), 5)
 
 
 /obj/item/nullrod/attack_self(mob/user)
@@ -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/implants/implant_death_alarm.dm

@@ -47,7 +47,7 @@
 				a.autosay("[mobname] has died in [t.name]!", "[mobname]'s Death Alarm")
 			qdel(src)
 		if("emp")
-			var/name = prob(50) ? t.name : pick(teleportlocs)
+			var/name = prob(50) ? t.name : pick(GLOB.teleportlocs)
 			a.autosay("[mobname] has died in [name]!", "[mobname]'s Death Alarm")
 		else
 			a.autosay("[mobname] has died-zzzzt in-in-in...", "[mobname]'s Death Alarm")

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

@@ -20,6 +20,10 @@
 	..()
 	storage = new /obj/item/storage/hidden/implant(src)
 
+/obj/item/implant/storage/emp_act(severity)
+	..()
+	storage.emp_act(severity)
+
 /obj/item/implant/storage/activate()
 	storage.MouseDrop(imp_in)