Merge branch 'master' into tgglassfloors

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

@@ -222,7 +222,7 @@
 	anchored = TRUE
 
 /obj/effect/decal/cleanable/insectguts
-	name = "cockroach guts"
+	name = "bug guts"
 	desc = "One bug squashed. Four more will rise in its place."
 	icon = 'icons/effects/blood.dmi'
 	icon_state = "xfloor1"

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

@@ -45,15 +45,15 @@
 		var/light = -1
 		var/flash = -1
 
-		// Clamp all values to MAX_EXPLOSION_RANGE
+		// We dont need to clamp here. It gets clamped inside explosion()
 		if(round(amount/12) > 0)
-			devastation = min (GLOB.max_ex_devastation_range, devastation + round(amount/12))
+			devastation += round(amount/12)
 
 		if(round(amount/6) > 0)
-			heavy = min (GLOB.max_ex_heavy_range, heavy + round(amount/6))
+			heavy += round(amount/6)
 
 		if(round(amount/3) > 0)
-			light = min (GLOB.max_ex_light_range, light + round(amount/3))
+			light += round(amount/3)
 
 		if(flashing && flashing_factor)
 			flash += (round(amount/4) * flashing_factor)

code/game/objects/effects/gibs.dm

@@ -1,8 +1,8 @@
-/proc/gibs(atom/location, datum/dna/MobDNA)		//CARN MARKER
-	new /obj/effect/gibspawner/generic(get_turf(location), MobDNA)
+/proc/gibs(atom/location, datum/dna/mob_dna)		//CARN MARKER
+	new /obj/effect/gibspawner/generic(get_turf(location), mob_dna)
 
-/proc/hgibs(atom/location, datum/dna/MobDNA)
-	new /obj/effect/gibspawner/human(get_turf(location), MobDNA)
+/proc/hgibs(atom/location, datum/dna/mob_dna)
+	new /obj/effect/gibspawner/human(get_turf(location), mob_dna)
 
 /proc/xgibs(atom/location)
 	new /obj/effect/gibspawner/xeno(get_turf(location))
@@ -16,38 +16,55 @@
 	var/list/gibamounts = list()
 	var/list/gibdirections = list() //of lists
 
-/obj/effect/gibspawner/New(location, datum/dna/MobDNA)
+/obj/effect/gibspawner/Initialize(mapload, datum/dna/mob_dna)
 	..()
+	ASSERT(length(gibtypes) == length(gibamounts))
+	ASSERT(length(gibamounts) == length(gibdirections))
 
-	if(istype(loc,/turf)) //basically if a badmin spawns it
-		Gib(loc, MobDNA)
+	if(isturf(loc))
+		spawn_gibs(loc, mob_dna)
 
-/obj/effect/gibspawner/proc/Gib(atom/location, datum/dna/MobDNA = null)
-	if(gibtypes.len != gibamounts.len || gibamounts.len != gibdirections.len)
-		to_chat(world, "<span class='warning'>Gib list length mismatch!</span>")
-		return
+	return INITIALIZE_HINT_QDEL // qdel once done
 
+/**
+  * Spawns the gibs (and sparks if applicable) from the gib spawner.
+  *
+  * Arguments:
+  * * location - The position to spawn the gibs on.
+  * * mob_dna - The [/datum/dna] controlling the blood DNA and colour of the gibs.
+  */
+/obj/effect/gibspawner/proc/spawn_gibs(atom/location, datum/dna/mob_dna)
 	var/obj/effect/decal/cleanable/blood/gibs/gib = null
 
 	if(sparks)
 		do_sparks(2, 1, location)
 
-	for(var/i = 1, i<= gibtypes.len, i++)
-		if(gibamounts[i])
-			for(var/j = 1, j<= gibamounts[i], j++)
-				var/gibType = gibtypes[i]
-				gib = new gibType(location)
+	for(var/gibtype in 1 to length(gibtypes))
+		if(!gibamounts[gibtype])
+			continue
+		for(var/I in 1 to gibamounts[gibtype])
+			var/gib_type = gibtypes[gibtype]
+			gib = new gib_type(location)
 
+			gib_dna(gib, mob_dna)
 
-				gib.blood_DNA = list()
-				if(MobDNA)
-					gib.blood_DNA[MobDNA.unique_enzymes] = MobDNA.blood_type
-				else if(istype(src, /obj/effect/gibspawner/xeno))
-					gib.blood_DNA["UNKNOWN DNA"] = "X*"
-				else if(istype(src, /obj/effect/gibspawner/human)) // Probably a monkey
-					gib.blood_DNA["Non-human DNA"] = "A+"
-				var/list/directions = gibdirections[i]
-				if(directions.len)
-					gib.streak(directions)
+			var/list/directions = gibdirections[gibtype]
+			if(length(directions))
+				gib.streak(directions)
 
-	qdel(src)
+/**
+  * Assigns DNA and blood colour to mob gibs.
+  *
+  * Returns FALSE if there was no DNA data to transfer to the gibs, and TRUE if there was.
+  * Arguments:
+  * * gib - The [/obj/effect/decal/cleanable/blood/gibs] that is being edited.
+  * * mob_dna - The [/datum/dna] which is being transferred onto the gib.
+  */
+/obj/effect/gibspawner/proc/gib_dna(obj/effect/decal/cleanable/blood/gibs/gib, datum/dna/mob_dna)
+	if(!mob_dna)
+		return FALSE
+
+	gib.basecolor = mob_dna.species.blood_color
+	gib.update_icon()
+	gib.blood_DNA[mob_dna.unique_enzymes] = mob_dna.blood_type
+	return TRUE

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

@@ -15,6 +15,10 @@
 	gibamounts[6] = pick(0,1,2)
 	..()
 
+/obj/effect/gibspawner/human/gib_dna(obj/effect/decal/cleanable/blood/gibs/gib, datum/dna/mob_dna)
+	if(!..()) // Probably admin spawned
+		gib.blood_DNA["Non-human DNA"] = "A+"
+
 /obj/effect/gibspawner/xeno
 	gibtypes = list(/obj/effect/decal/cleanable/blood/gibs/xeno/up,/obj/effect/decal/cleanable/blood/gibs/xeno/down,/obj/effect/decal/cleanable/blood/gibs/xeno,/obj/effect/decal/cleanable/blood/gibs/xeno,/obj/effect/decal/cleanable/blood/gibs/xeno/body,/obj/effect/decal/cleanable/blood/gibs/xeno/limb,/obj/effect/decal/cleanable/blood/gibs/xeno/core)
 	gibamounts = list(1,1,1,1,1,1,1)
@@ -24,6 +28,10 @@
 	gibamounts[6] = pick(0,1,2)
 	..()
 
+/obj/effect/gibspawner/xeno/gib_dna(obj/effect/decal/cleanable/blood/gibs/gib, datum/dna/mob_dna)
+	if(!..())
+		gib.blood_DNA["UNKNOWN DNA"] = "X*"
+
 /obj/effect/gibspawner/robot
 	sparks = 1
 	gibtypes = list(/obj/effect/decal/cleanable/blood/gibs/robot/up,/obj/effect/decal/cleanable/blood/gibs/robot/down,/obj/effect/decal/cleanable/blood/gibs/robot,/obj/effect/decal/cleanable/blood/gibs/robot,/obj/effect/decal/cleanable/blood/gibs/robot,/obj/effect/decal/cleanable/blood/gibs/robot/limb)

code/game/objects/empulse.dm

@@ -1,3 +1,13 @@
+/**
+ * Will cause an EMP on the given epicenter.
+ * This proc can sleep depending on the affected objects. So assume it sleeps!
+ *
+ * epicenter - The center of the EMP. Can be an atom, as long as the given atom is on a turf (in)directly
+ * heavy_range - The max distance from the epicenter where objects will be get heavy EMPed
+ * light_range - The max distance from the epicenter where objects will get light EMPed
+ * log - Whether or not this action should be logged or not. Will use the cause if provided
+ * cause - The cause of the EMP. Used for the logging
+ */
 /proc/empulse(turf/epicenter, heavy_range, light_range, log = FALSE, cause = null)
 	if(!epicenter) return
 

code/game/objects/explosion.dm

@@ -24,11 +24,11 @@
 
 	if(!ignorecap)
 		// Clamp all values to MAX_EXPLOSION_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)
+		devastation_range = min(GLOB.configuration.general.bomb_cap / 4, devastation_range)
+		heavy_impact_range = min(GLOB.configuration.general.bomb_cap / 2, heavy_impact_range)
+		light_impact_range = min(GLOB.configuration.general.bomb_cap, light_impact_range)
+		flash_range = min(GLOB.configuration.general.bomb_cap, flash_range)
+		flame_range = min(GLOB.configuration.general.bomb_cap, flame_range)
 
 	var/max_range = max(devastation_range, heavy_impact_range, light_impact_range, flame_range)
 
@@ -118,7 +118,7 @@
 
 		var/list/affected_turfs = spiral_range_turfs(max_range, epicenter)
 
-		if(config.reactionary_explosions)
+		if(GLOB.configuration.general.reactionary_explosions)
 			for(var/A in affected_turfs) // we cache the explosion block rating of every turf in the explosion area
 				var/turf/T = A
 				cached_exp_block[T] = 0
@@ -136,7 +136,7 @@
 				continue
 			var/dist = HYPOTENUSE(T.x, T.y, x0, y0)
 
-			if(config.reactionary_explosions)
+			if(GLOB.configuration.general.reactionary_explosions)
 				var/turf/Trajectory = T
 				while(Trajectory != epicenter)
 					Trajectory = get_step_towards(Trajectory, epicenter)

code/game/objects/items/devices/painter/floor_painter.dm

@@ -23,6 +23,7 @@
 /datum/painter/floor/paint_atom(atom/target, mob/user)
 	if(!istype(target, /turf/simulated/floor/plasteel))
 		to_chat(user, "<span class='warning'>[holder] can only be used on station flooring.</span>")
+		return
 	var/turf/simulated/floor/plasteel/F = target
 
 	if(F.icon_state == floor_state && F.dir == floor_dir)

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

@@ -1,6 +1,7 @@
 /obj/item/painter
 	name = "modular painter"
 	icon = 'icons/obj/painting.dmi'
+	icon_state = "floor_painter"
 	usesound = 'sound/effects/spray2.ogg'
 	flags = CONDUCT | NOBLUDGEON
 	w_class = WEIGHT_CLASS_SMALL

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

@@ -264,6 +264,9 @@ REAGENT SCANNER
 	else
 		to_chat(user, "<span class='notice'>Subject's genes are stable.</span>")
 
+	if(HAS_TRAIT(H, TRAIT_HUSK))
+		to_chat(user, "<span class='danger'>Subject is husked. Application of synthflesh is recommended.</span>")
+
 /obj/item/healthanalyzer/attack_self(mob/user)
 	toggle_mode()
 

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

@@ -23,6 +23,10 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
 	usesound = 'sound/items/deconstruct.ogg'
 	merge_type = /obj/item/stack/rods
 
+/obj/item/stack/rods/detailed_examine()
+	return "Made from metal sheets. You can build a grille by using it in your hand. \
+			Clicking on a floor without any tiles will reinforce the floor. You can make reinforced glass by combining rods and normal glass sheets."
+
 /obj/item/stack/rods/cyborg
 	energy_type = /datum/robot_energy_storage/rods
 	is_cyborg = TRUE

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

@@ -36,6 +36,9 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
 	merge_type = /obj/item/stack/sheet/glass
 	point_value = 1
 
+/obj/item/stack/sheet/glass/detailed_examine()
+	return "Use in your hand to build a window. Can be upgraded to reinforced glass by adding metal rods, which are made from metal sheets."
+
 /obj/item/stack/sheet/glass/fifty
 	amount = 50
 
@@ -44,6 +47,10 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
 	is_cyborg = TRUE
 	materials = list()
 
+/obj/item/stack/sheet/glass/cyborg/detailed_examine()
+	return "Use in your hand to build a window. Can be upgraded to reinforced glass by adding metal rods, which are made from metal sheets.<br>\
+			As a synthetic, you can acquire more sheets of glass by recharging."
+
 /obj/item/stack/sheet/glass/New(loc, amount)
 	recipes = GLOB.glass_recipes
 	..()
@@ -103,6 +110,9 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \
 	recipes = GLOB.reinforced_glass_recipes
 	..()
 
+/obj/item/stack/sheet/rglass/detailed_examine()
+	return "Use in your hand to build a window. Reinforced glass is much stronger against damage."
+
 GLOBAL_LIST_INIT(pglass_recipes, list ( \
 	new/datum/stack_recipe/window("directional window", /obj/structure/window/plasmabasic, time = 0, on_floor = TRUE, window_checks = TRUE), \
 	new/datum/stack_recipe/window("fulltile window", /obj/structure/window/full/plasmabasic, 2, time = 0, on_floor = TRUE, window_checks = TRUE) \
@@ -113,6 +123,10 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( \
 	is_cyborg = TRUE
 	materials = list()
 
+/obj/item/stack/sheet/rglass/cyborg/detailed_examine()
+	return "Use in your hand to build a window. Reinforced glass is much stronger against damage.<br>\
+			As a synthetic, you can gain more reinforced glass by recharging."
+
 /obj/item/stack/sheet/plasmaglass
 	name = "plasma glass"
 	desc = "A very strong and very resistant sheet of a plasma-glass alloy."

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

@@ -114,6 +114,10 @@ GLOBAL_LIST_INIT(metal_recipes, list(
 	is_cyborg = TRUE
 	materials = list()
 
+/obj/item/stack/sheet/metal/cyborg/detailed_examine()
+	return "Use in your hand to bring up the recipe menu. If you have enough sheets, click on something on the list to build it.<br>\
+			You can replenish your supply of metal as a synthetic by recharging."
+
 /obj/item/stack/sheet/metal/fifty
 	amount = 50
 
@@ -378,6 +382,8 @@ GLOBAL_LIST_INIT(cult_recipes, list ( \
 	if(!iscultist(user))
 		to_chat(user, "<span class='warning'>Only one with forbidden knowledge could hope to work this metal...</span>")
 		return
+	if(usr.holy_check())
+		return
 	if(!is_level_reachable(user.z))
 		to_chat(user, "<span class='warning'>The energies of this place interfere with the metal shaping!</span>")
 		return

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

@@ -16,3 +16,6 @@
 	usesound = 'sound/items/deconstruct.ogg'
 	toolspeed = 1
 	var/wall_allowed = TRUE	//determines if sheet can be used in wall construction or not.
+
+/obj/item/stack/sheet/detailed_examine()
+	return "Use in your hand to bring up the recipe menu. If you have enough sheets, click on something on the list to build it."

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

@@ -25,7 +25,7 @@
 	var/to_transfer = 0
 	var/max_amount = 50 //also see stack recipes initialisation, param "max_res_amount" must be equal to this max_amount
 	var/merge_type = null // This path and its children should merge with this stack, defaults to src.type
-	var/recipe_width = 400 //Width of the recipe popup 
+	var/recipe_width = 400 //Width of the recipe popup
 	var/recipe_height = 400 //Height of the recipe popup
 
 /obj/item/stack/New(loc, new_amount, merge = TRUE)
@@ -197,25 +197,31 @@
 				to_chat(usr, "<span class='warning'>You haven't got enough [src] to build \the [R.title]!</span>")
 			return FALSE
 
-		if(R.window_checks && !valid_window_location(usr.loc, usr.dir))
+		if(R.window_checks && !valid_window_location(get_turf(src), usr.dir))
 			to_chat(usr, "<span class='warning'>\The [R.title] won't fit here!</span>")
 			return FALSE
 
-		if(R.one_per_turf && (locate(R.result_type) in usr.drop_location()))
+		if(R.one_per_turf && (locate(R.result_type) in get_turf(src)))
 			to_chat(usr, "<span class='warning'>There is another [R.title] here!</span>")
 			return FALSE
 
-		if(R.on_floor && !istype(usr.drop_location(), /turf/simulated))
+		if(R.on_floor && !istype(get_turf(src), /turf/simulated))
 			to_chat(usr, "<span class='warning'>\The [R.title] must be constructed on the floor!</span>")
 			return FALSE
 
-		if(R.no_cult_structure && (locate(/obj/structure/cult) in usr.drop_location()))
-			to_chat(usr, "<span class='warning'>There is a structure here!</span>")
-			return FALSE
+		if(R.no_cult_structure)
+			if(usr.holy_check())
+				return
+			if(!is_level_reachable(usr.z))
+				to_chat(usr, "<span class='warning'>The energies of this place interfere with the metal shaping!</span>")
+				return
+			if(locate(/obj/structure/cult) in get_turf(src))
+				to_chat(usr, "<span class='warning'>There is a structure here!</span>")
+				return FALSE
 
 		if(R.time)
-			to_chat(usr, "<span class='notice'>Building [R.title] ...</span>")
-			if(!do_after(usr, R.time, target = usr))
+			to_chat(usr, "<span class='notice'>Building [R.title]...</span>")
+			if(!do_after(usr, R.time, target = loc))
 				return 0
 
 		if(get_amount() < R.req_amount * multiplier)
@@ -223,9 +229,9 @@
 
 		var/atom/O
 		if(R.max_res_amount > 1) //Is it a stack?
-			O = new R.result_type(usr.drop_location(), R.res_amount * multiplier)
+			O = new R.result_type(get_turf(src), R.res_amount * multiplier)
 		else
-			O = new R.result_type(usr.drop_location())
+			O = new R.result_type(get_turf(src))
 		O.setDir(usr.dir)
 		use(R.req_amount * multiplier)
 		updateUsrDialog()

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

@@ -1,7 +1,6 @@
 /obj/item/stack/telecrystal
 	name = "telecrystal"
 	desc = "It seems to be pulsing with suspiciously enticing energies."
-	description_antag = "Telecrystals can be activated by utilizing them on devices with an actively running uplink. They will not activate on unactivated uplinks."
 	singular_name = "telecrystal"
 	icon = 'icons/obj/telescience.dmi'
 	icon_state = "telecrystal"
@@ -34,6 +33,9 @@
 		use(amount)
 		to_chat(user, "<span class='notice'>You slot [src] into [cart].  The next time it's used, it will also give telecrystals</span>")
 
+/obj/item/stack/telecrystal/detailed_examine_antag()
+	return "Telecrystals can be activated by utilizing them on devices with an actively running uplink. They will not activate on unactivated uplinks."
+
 /obj/item/stack/telecrystal/five
 	amount = 5
 

code/game/objects/items/toys.dm

@@ -1358,9 +1358,14 @@
 	. += "Has [fake_bullets] round\s remaining."
 	. += "[fake_bullets] of those are live rounds."
 
+/obj/item/toy/russian_revolver/trick_revolver/detailed_examine() //oh no
+	return "This is a ballistic weapon. To reload, click the weapon in your hand to unload (if needed), then add the appropriate ammo. The description \
+			will tell you what caliber you need."
+
 /obj/item/toy/russian_revolver/trick_revolver/post_shot(user)
 	to_chat(user, "<span class='danger'>[src] did look pretty dodgey!</span>")
 	SEND_SOUND(user, sound('sound/misc/sadtrombone.ogg')) //HONK
+
 /*
  * Rubber Chainsaw
  */

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

@@ -22,6 +22,14 @@ AI MODULES
 	materials = list(MAT_GOLD=50)
 	var/datum/ai_laws/laws = null
 
+/obj/item/aiModule/Initialize(mapload)
+	. = ..()
+	if(laws)
+		desc += "<br>"
+		for(var/datum/ai_law/current in laws.inherent_laws)
+			desc += current.law
+			desc += "<br>"
+
 /obj/item/aiModule/proc/install(obj/machinery/computer/C)
 	if(istype(C, /obj/machinery/computer/aiupload))
 		var/obj/machinery/computer/aiupload/comp = C
@@ -92,7 +100,7 @@ AI MODULES
 
 /******************** Safeguard ********************/
 /obj/item/aiModule/safeguard
-	name = "\improper 'Safeguard' AI module"
+	name = "\improper Safeguard AI module"
 	var/targetName = ""
 	desc = "A 'safeguard' AI module: 'Safeguard <name>. Individuals that threaten <name> are not crew and must be eliminated.'"
 	origin_tech = "programming=3;materials=3"
@@ -118,16 +126,16 @@ AI MODULES
 
 /******************** oneCrewMember ********************/
 /obj/item/aiModule/oneCrewMember
-	name = "\improper 'oneCrewMember' AI module"
+	name = "\improper One Crewmember AI module"
 	var/targetName = ""
-	desc = "A 'one human' AI module: 'Only <name> is crew.'"
+	desc = "A 'one crew' AI module: 'Only <name> is crew.'"
 	origin_tech = "programming=4;materials=4"
 
 /obj/item/aiModule/oneCrewMember/attack_self(mob/user as mob)
 	..()
 	var/targName = stripped_input(usr, "Please enter the name of the person who is the only crew.", "Who?", user.real_name)
 	targetName = targName
-	desc = text("A 'one human' AI module: 'Only [] is crew.'", targetName)
+	desc = text("A 'one crew' AI module: 'Only [] is crew.'", targetName)
 
 /obj/item/aiModule/oneCrewMember/install(obj/machinery/computer/C)
 	if(!targetName)
@@ -149,7 +157,7 @@ AI MODULES
 
 /******************** ProtectStation ********************/
 /obj/item/aiModule/protectStation
-	name = "\improper 'ProtectStation' AI module"
+	name = "\improper Protect Station AI module"
 	desc = "A 'protect station' AI module: 'Protect the space station against damage. Anyone you see harming the station is to be no longer considered crew, and is a threat to the station which must be neutralized.'"
 	origin_tech = "programming=4;materials=4" //made of gold
 
@@ -162,10 +170,10 @@ AI MODULES
 	to_chat(target, law)
 	target.add_supplied_law(5, law)
 
-/******************** OxygenIsToxicToHumans ********************/
+/******************** OxygenIsToxicToCrew ********************/
 /obj/item/aiModule/oxygen
-	name = "\improper 'OxygenIsToxicToHumans' AI module"
-	desc = "A 'OxygenIsToxicToHumans' AI module: 'Oxygen is highly toxic to crew members, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a crew member.'"
+	name = "\improper Oxygen Is Toxic To Crew AI module"
+	desc = "A 'Oxygen Is Toxic To Crew' AI module: 'Oxygen is highly toxic to crew members, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a crew member.'"
 	origin_tech = "programming=4;biotech=2;materials=4"
 
 /obj/item/aiModule/oxygen/attack_self(mob/user as mob)
@@ -179,7 +187,7 @@ AI MODULES
 
 /****************** New Freeform ******************/
 /obj/item/aiModule/freeform // Slightly more dynamic freeform module -- TLE
-	name = "\improper 'Freeform' AI module"
+	name = "\improper Freeform AI module"
 	var/newFreeFormLaw = "freeform"
 	var/lawpos = 15
 	desc = "A 'freeform' AI module: '<freeform>'"
@@ -212,7 +220,7 @@ AI MODULES
 
 /******************** Reset ********************/
 /obj/item/aiModule/reset
-	name = "\improper 'Reset' AI module"
+	name = "\improper Reset AI module"
 	var/targetName = "name"
 	desc = "A 'reset' AI module: 'Clears all laws except for the core laws.'"
 	origin_tech = "programming=3;materials=2"
@@ -230,7 +238,7 @@ AI MODULES
 
 /******************** Purge ********************/
 /obj/item/aiModule/purge // -- TLE
-	name = "\improper 'Purge' AI module"
+	name = "\improper Purge AI module"
 	desc = "A 'purge' AI Module: 'Purges all laws.'"
 	origin_tech = "programming=5;materials=4"
 
@@ -245,77 +253,107 @@ AI MODULES
 
 /******************** Asimov ********************/
 /obj/item/aiModule/asimov // -- TLE
-	name = "\improper 'Asimov' core AI module"
+	name = "\improper Asimov core AI module"
 	desc = "An 'Asimov' Core AI Module: 'Reconfigures the AI's core laws.'"
 	origin_tech = "programming=3;materials=4"
-	laws = new/datum/ai_laws/asimov
+	laws = new /datum/ai_laws/asimov
 
 /******************** Crewsimov ********************/
 /obj/item/aiModule/crewsimov // -- TLE
-	name = "\improper 'Crewsimov' core AI module"
+	name = "\improper Crewsimov core AI module"
 	desc = "An 'Crewsimov' Core AI Module: 'Reconfigures the AI's core laws.'"
 	origin_tech = "programming=3;materials=4"
-	laws = new/datum/ai_laws/crewsimov
+	laws = new /datum/ai_laws/crewsimov
 
 /******************* Quarantine ********************/
 /obj/item/aiModule/quarantine
-	name = "\improper 'Quarantine' core AI module"
+	name = "\improper Quarantine core AI module"
 	desc = "A 'Quarantine' Core AI Module: 'Reconfigures the AI's core laws.'"
 	origin_tech = "programming=3;materials=4"
-	laws = new/datum/ai_laws/quarantine
+	laws = new /datum/ai_laws/quarantine
 
 /******************** NanoTrasen ********************/
 /obj/item/aiModule/nanotrasen // -- TLE
-	name = "'NT Default' Core AI Module"
+	name = "\improper NT Default Core AI Module"
 	desc = "An 'NT Default' Core AI Module: 'Reconfigures the AI's core laws.'"
 	origin_tech = "programming=3;materials=4"
-	laws = new/datum/ai_laws/nanotrasen
+	laws = new /datum/ai_laws/nanotrasen
 
 /******************** Corporate ********************/
 /obj/item/aiModule/corp
-	name = "\improper 'Corporate' core AI module"
+	name = "\improper Corporate core AI module"
 	desc = "A 'Corporate' Core AI Module: 'Reconfigures the AI's core laws.'"
 	origin_tech = "programming=3;materials=4"
-	laws = new/datum/ai_laws/corporate
+	laws = new /datum/ai_laws/corporate
 
 /******************** Drone ********************/
 /obj/item/aiModule/drone
-	name = "\improper 'Drone' core AI module"
+	name = "\improper Drone core AI module"
 	desc = "A 'Drone' Core AI Module: 'Reconfigures the AI's core laws.'"
 	origin_tech = "programming=3;materials=4"
-	laws = new/datum/ai_laws/drone
+	laws = new /datum/ai_laws/drone
 
 /******************** Robocop ********************/
 /obj/item/aiModule/robocop // -- TLE
-	name = "\improper 'Robocop' core AI module"
+	name = "\improper Robocop core AI module"
 	desc = "A 'Robocop' Core AI Module: 'Reconfigures the AI's core three laws.'"
 	origin_tech = "programming=4"
-	laws = new/datum/ai_laws/robocop()
+	laws = new /datum/ai_laws/robocop()
 
 /****************** P.A.L.A.D.I.N. **************/
 /obj/item/aiModule/paladin // -- NEO
-	name = "\improper 'P.A.L.A.D.I.N.' core AI module"
+	name = "\improper P.A.L.A.D.I.N. core AI module"
 	desc = "A P.A.L.A.D.I.N. Core AI Module: 'Reconfigures the AI's core laws.'"
 	origin_tech = "programming=3;materials=4"
-	laws = new/datum/ai_laws/paladin
+	laws = new /datum/ai_laws/paladin
 
 /****************** T.Y.R.A.N.T. *****************/
 /obj/item/aiModule/tyrant // -- Darem
-	name = "\improper 'T.Y.R.A.N.T.' core AI module"
+	name = "\improper T.Y.R.A.N.T. core AI module"
 	desc = "A T.Y.R.A.N.T. Core AI Module: 'Reconfigures the AI's core laws.'"
 	origin_tech = "programming=3;materials=4;syndicate=1"
-	laws = new/datum/ai_laws/tyrant()
+	laws = new /datum/ai_laws/tyrant()
 
 /******************** Antimov ********************/
 /obj/item/aiModule/antimov // -- TLE
-	name = "\improper 'Antimov' core AI module"
+	name = "\improper Antimov core AI module"
 	desc = "An 'Antimov' Core AI Module: 'Reconfigures the AI's core laws.'"
 	origin_tech = "programming=4"
-	laws = new/datum/ai_laws/antimov()
+	laws = new /datum/ai_laws/antimov()
+
+/******************** NT Aggressive ********************/
+/obj/item/aiModule/nanotrasen_aggressive
+	name = "\improper NT Aggressive core AI module"
+	desc = "An 'NT Aggressive' Core AI Module: 'Reconfigures the AI's core laws.'"
+	laws = new /datum/ai_laws/nanotrasen_aggressive()
+
+/******************** CCTV ********************/
+/obj/item/aiModule/cctv
+	name = "\improper CCTV core AI module"
+	desc = "A 'CCTV' Core AI Module: 'Reconfigures the AI's core laws.'"
+	laws = new /datum/ai_laws/cctv()
+
+/******************** Hippocratic Oath ********************/
+/obj/item/aiModule/hippocratic
+	name = "\improper Hippocratic Oath core AI module"
+	desc = "An 'Hippocratic' Oath Core AI Module: 'Reconfigures the AI's core laws.'"
+	laws = new /datum/ai_laws/hippocratic()
+
+/******************** Station Efficiency ********************/
+/obj/item/aiModule/maintain
+	name = "\improper Station Efficiency core AI module"
+	desc = "A 'Station Efficiency' Core AI Module: 'Reconfigures the AI's core laws.'"
+	laws = new /datum/ai_laws/maintain()
+
+/******************** Peacekeeper ********************/
+/obj/item/aiModule/peacekeeper
+	name = "\improper Peacekeeper core AI module"
+	desc = "A 'Peacekeeper' Core AI Module: 'Reconfigures the AI's core laws.'"
+	laws = new /datum/ai_laws/peacekeeper()
 
 /******************** Freeform Core ******************/
 /obj/item/aiModule/freeformcore // Slightly more dynamic freeform module -- TLE
-	name = "\improper 'Freeform' core AI module"
+	name = "\improper Freeform core AI module"
 	var/newFreeFormLaw = ""
 	desc = "A 'freeform' Core AI module: '<freeform>'"
 	origin_tech = "programming=5;materials=4"

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

@@ -1,7 +1,6 @@
 /obj/item/bee_briefcase
 	name = "briefcase"
 	desc = "This briefcase has easy-release clasps and smells vaguely of honey and blood..."
-	description_antag = "A briefcase filled with deadly bees, you should inject this with a syringe of your own blood before opening it."
 	icon = 'icons/obj/storage.dmi'
 	icon_state = "briefcase"
 	item_state = "briefcase"
@@ -28,6 +27,9 @@
 		else
 			. += "<span class='danger'>The bees are gone... Colony collapse disorder?</span>"
 
+/obj/item/bee_briefcase/detailed_examine_antag()
+	return "A briefcase filled with deadly bees, you should inject this with a syringe of your own blood before opening it."
+
 /obj/item/bee_briefcase/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/reagent_containers/syringe))
 		var/obj/item/reagent_containers/syringe/S = I

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

@@ -416,7 +416,6 @@
 							"gold",
 							"silver",
 							"centcom",
-							"centcom_old",
 							"security",
 							"medical",
 							"HoS",
@@ -891,7 +890,7 @@
 	return list("data","id","gold","silver","security","medical","research","cargo","engineering","HoS","CMO","RD","CE","clown","mime","rainbow","prisoner")
 
 /proc/get_centcom_card_skins()
-	return list("centcom","centcom_old","nanotrasen","ERT_leader","ERT_empty","ERT_security","ERT_engineering","ERT_medical","ERT_janitorial","deathsquad","commander","syndie","TDred","TDgreen")
+	return list("centcom","nanotrasen","ERT_leader","ERT_empty","ERT_security","ERT_engineering","ERT_medical","ERT_janitorial","deathsquad","commander","syndie","TDred","TDgreen")
 
 /proc/get_all_card_skins()
 	return get_station_card_skins() + get_centcom_card_skins()
@@ -910,8 +909,6 @@
 			return "Research Director"
 		if("CE")
 			return "Chief Engineer"
-		if("centcom_old")
-			return "Centcom Old"
 		if("ERT_leader")
 			return "ERT Leader"
 		if("ERT_empty")

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

@@ -445,6 +445,8 @@
 							user.visible_message("<span class='boldnotice'>[defib] buzzes: Resuscitation failed - Heart tissue damage beyond point of no return for defibrillation.</span>")
 						else if(total_burn >= 180 || total_brute >= 180)
 							user.visible_message("<span class='boldnotice'>[defib] buzzes: Resuscitation failed - Severe tissue damage detected.</span>")
+						else if(HAS_TRAIT(H, TRAIT_HUSK))
+							user.visible_message("<span class='notice'>[defib] buzzes: Resucitation failed: Subject is husked.</span>")
 						else if(ghost)
 							if(!ghost.can_reenter_corpse) // DNR or AntagHUD
 								user.visible_message("<span class='notice'>[defib] buzzes: Resucitation failed: No electrical brain activity detected.</span>")

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

@@ -179,12 +179,11 @@
 		addtimer(CALLBACK(src, .proc/boom, user, result), 4 SECONDS)
 
 /obj/item/dice/d20/e20/proc/boom(mob/user, result)
-	var/capped = FALSE
+	var/capped = TRUE
 	var/actual_result = result
-	if(result != 20)
-		capped = TRUE
-		result = min(result, GLOB.max_ex_light_range) // Apply the bombcap
-	else // Rolled a nat 20, screw the bombcap
+	// Rolled a nat 20, screw the bombcap
+	if(result == 20)
+		capped = FALSE
 		result = 24
 
 	var/turf/epicenter = get_turf(src)

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

@@ -561,7 +561,6 @@
 /obj/item/nullrod/missionary_staff
 	name = "holy staff"
 	desc = "It has a mysterious, protective aura."
-	description_antag = "This seemingly standard holy staff is actually a disguised neurotransmitter capable of inducing blind zealotry in its victims. It must be allowed to recharge in the presence of a linked set of missionary robes. Activate the staff while wearing robes to link, then aim the staff at your victim to try and convert them."
 	reskinned = TRUE
 	reskin_selectable = FALSE
 	icon_state = "godstaff-red"
@@ -575,6 +574,10 @@
 	var/obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe/robes = null		//the robes linked with this staff
 	var/faith = 99	//a conversion requires 100 faith to attempt. faith recharges over time while you are wearing missionary robes that have been linked to the staff.
 
+/obj/item/nullrod/missionary_staff/detailed_examine_antag()
+	return "This seemingly standard holy staff is actually a disguised neurotransmitter capable of inducing blind zealotry in its victims. It must be allowed to recharge in the presence of a linked set of missionary robes. \
+			Activate the staff while wearing robes to link, then aim the staff at your victim to try and convert them."
+
 /obj/item/nullrod/missionary_staff/New()
 	..()
 	team_color = pick("red", "blue")

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(GLOB.teleportlocs)
+			var/name = prob(50) ? t.name : pick(SSmapping.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_misc.dm

@@ -58,7 +58,7 @@
 
 /obj/item/implant/emp/activate()
 	uses--
-	empulse(imp_in, 3, 5, 1)
+	INVOKE_ASYNC(GLOBAL_PROC, .proc/empulse, get_turf(imp_in), 3, 5, 1)
 	if(!uses)
 		qdel(src)
 

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

@@ -125,6 +125,11 @@
 	if(item_color == null)
 		item_color = pick("red", "blue", "green", "purple")
 
+/obj/item/melee/energy/sword/detailed_examine()
+	return "The energy sword is a very strong melee weapon, capable of severing limbs easily, if they are targeted. It can also has a chance \
+			to block projectiles and melee attacks while it is on and being held. The sword can be toggled on or off by using it in your hand. While it is off, \
+			it can be concealed in your pocket or bag."
+
 /obj/item/melee/energy/sword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
 	if(active)
 		return ..()

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

@@ -89,17 +89,20 @@
 					/mob/living/simple_animal/hostile/poison/bees/,
 					/mob/living/simple_animal/butterfly,
 					/mob/living/simple_animal/cockroach,
-					/obj/item/queen_bee
-	))
+					/obj/item/queen_bee))
+	strong_against -= /mob/living/simple_animal/hostile/poison/bees/syndi // Syndi-bees have special anti-flyswatter tech installed
 
-/obj/item/melee/flyswatter/afterattack(atom/target, mob/user, proximity_flag)
+/obj/item/melee/flyswatter/attack(mob/living/M, mob/living/user, def_zone)
 	. = ..()
-	if(proximity_flag)
-		if(is_type_in_typecache(target, strong_against))
-			new /obj/effect/decal/cleanable/insectguts(target.drop_location())
-			to_chat(user, "<span class='warning'>You easily splat [target].</span>")
-			if(istype(target, /mob/living/))
-				var/mob/living/bug = target
-				bug.death(1)
-			else
-				qdel(target)
+	if(!.)
+		return
+	if(is_type_in_typecache(M, strong_against))
+		new /obj/effect/decal/cleanable/insectguts(M.drop_location())
+		user.visible_message("<span class='warning'>[user] splats [M] with [src].</span>",
+			"<span class='warning'>You splat [M] with [src].</span>",
+			"<span class='warning'>You hear a splat.</span>")
+		if(isliving(M))
+			var/mob/living/bug = M
+			bug.death(TRUE)
+		if(!QDELETED(M))
+			qdel(M)

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

@@ -47,12 +47,12 @@
 
 	var/A
 
-	A = input(user, "Area to jump to", "BOOYEA", A) as null|anything in GLOB.teleportlocs
+	A = input(user, "Area to jump to", "BOOYEA", A) as null|anything in SSmapping.teleportlocs
 
 	if(!A)
 		return
 
-	var/area/thearea = GLOB.teleportlocs[A]
+	var/area/thearea = SSmapping.teleportlocs[A]
 
 	if(user.stat || user.restrained())
 		return

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

@@ -409,7 +409,6 @@
 	new /obj/item/soap(src)
 	new /obj/item/grenade/chem_grenade/cleaner(src)
 	new /obj/item/grenade/chem_grenade/cleaner(src)
-	new /obj/item/melee/flyswatter(src)
 	update_icon()
 
 /obj/item/storage/belt/lazarus

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

@@ -71,6 +71,11 @@
 	else
 		. += "<span class='warning'>The baton does not have a power source installed.</span>"
 
+/obj/item/melee/baton/detailed_examine()
+	return "The baton needs to be turned on to apply the stunning effect. Use it in your hand to toggle it on or off.  If your intent is \
+			set to 'harm', you will inflict damage when using it, regardless if it is on or not. Each stun reduces the baton's charge, which can be replenished by \
+			putting it inside a weapon recharger."
+
 /obj/item/melee/baton/get_cell()
 	return cell
 

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

@@ -643,13 +643,13 @@
 	slot_flags = SLOT_BACK
 	force = 5
 	force_unwielded = 5
-	force_wielded = 20
+	force_wielded = 40
 	throwforce = 15
 	throw_range = 1
 	w_class = WEIGHT_CLASS_HUGE
 	armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 0, "bomb" = 50, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
 	resistance_flags = FIRE_PROOF | ACID_PROOF
-	var/charged = 5
+	var/charged = 2
 	origin_tech = "combat=4;bluespace=4;plasmatech=7"
 
 /obj/item/twohanded/singularityhammer/New()
@@ -661,7 +661,7 @@
 	return ..()
 
 /obj/item/twohanded/singularityhammer/process()
-	if(charged < 5)
+	if(charged < 2)
 		charged++
 
 /obj/item/twohanded/singularityhammer/update_icon()  //Currently only here to fuck with the on-mob icons.
@@ -684,7 +684,7 @@
 				var/obj/item/clothing/shoes/magboots/M = H.shoes
 				if(M.magpulse)
 					continue
-			H.apply_effect(1, WEAKEN, 0)
+			H.Weaken(2)
 			step_towards(H, pull)
 			step_towards(H, pull)
 			step_towards(H, pull)
@@ -693,7 +693,7 @@
 	if(!proximity)
 		return
 	if(wielded)
-		if(charged == 5)
+		if(charged == 2)
 			charged = 0
 			if(isliving(A))
 				var/mob/living/Z = A

code/game/objects/structures.dm

@@ -2,6 +2,7 @@
 	icon = 'icons/obj/structures.dmi'
 	pressure_resistance = 8
 	max_integrity = 300
+	face_while_pulling = TRUE
 	var/climbable
 	var/mob/climber
 	var/broken = FALSE

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

@@ -24,7 +24,7 @@
 	var/oldloc = loc
 	step(src, direction)
 	if(oldloc != loc)
-		addtimer(CALLBACK(src, .proc/ResetMoveDelay), config.walk_speed)
+		addtimer(CALLBACK(src, .proc/ResetMoveDelay), GLOB.configuration.movement.base_walk_speed)
 	else
 		move_delay = FALSE
 

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

@@ -71,18 +71,18 @@
 	icon_opened = "fireclosetopen"
 
 /obj/structure/closet/firecloset/populate_contents()
+	new /obj/item/extinguisher(src)
 	new /obj/item/clothing/suit/fire/firefighter(src)
 	new /obj/item/clothing/mask/gas(src)
 	new /obj/item/tank/internals/oxygen/red(src)
-	new /obj/item/extinguisher(src)
 	new /obj/item/clothing/head/hardhat/red(src)
 
 /obj/structure/closet/firecloset/full/populate_contents()
+	new /obj/item/extinguisher(src)
 	new /obj/item/clothing/suit/fire/firefighter(src)
 	new /obj/item/clothing/mask/gas(src)
 	new /obj/item/flashlight(src)
 	new /obj/item/tank/internals/oxygen/red(src)
-	new /obj/item/extinguisher(src)
 	new /obj/item/clothing/head/hardhat/red(src)
 
 

code/game/objects/structures/curtains.dm

@@ -5,6 +5,7 @@
 	icon = 'icons/obj/curtain.dmi'
 	name = "curtain"
 	icon_state = "closed"
+	face_while_pulling = FALSE
 	layer = SHOWER_CLOSED_LAYER
 	opacity = 1
 	density = 0

code/game/objects/structures/engicart.dm

@@ -3,6 +3,7 @@
 	desc = "A cart for storing engineering items."
 	icon = 'icons/obj/engicart.dmi'
 	icon_state = "cart"
+	face_while_pulling = FALSE
 	anchored = 0
 	density = 1
 	var/obj/item/stack/sheet/glass/myglass = null

code/game/objects/structures/foodcart.dm

@@ -3,6 +3,7 @@
 	desc = "A cart for transporting food and drinks."
 	icon = 'icons/obj/foodcart.dmi'
 	icon_state = "cart"
+	face_while_pulling = FALSE
 	anchored = 0
 	density = 1
 	//Food slots

code/game/objects/structures/girders.dm

@@ -28,6 +28,11 @@
 		if(GIRDER_DISASSEMBLED)
 			. += "<span class='notice'>[src] is disassembled! You probably shouldn't be able to see this examine message.</span>"
 
+/obj/structure/girder/detailed_examine()
+	return "Use metal sheets on this to build a normal wall. Adding plasteel instead will make a reinforced wall.<br>\
+			A false wall can be made by using a crowbar on this girder, and then adding metal or plasteel.<br>\
+			You can dismantle the girder with a wrench."
+
 /obj/structure/girder/proc/refundMetal(metalAmount) //refunds metal used in construction when deconstructed
 	for(var/i=0;i < metalAmount;i++)
 		new metal_type(get_turf(src))
@@ -405,6 +410,9 @@
 	girderpasschance = 0
 	max_integrity = 350
 
+/obj/structure/girder/reinforced/detailed_examine()
+	return "Add another sheet of plasteel to finish."
+
 /obj/structure/girder/cult
 	name = "runed girder"
 	desc = "Framework made of a strange and shockingly cold metal. It doesn't seem to have any bolts."

code/game/objects/structures/grille.dm

@@ -21,6 +21,10 @@
 	var/shockcooldown = 0
 	var/my_shockcooldown = 1 SECONDS
 
+/obj/structure/grille/detailed_examine()
+	return "A powered and knotted wire underneath this will cause the grille to shock anyone not wearing insulated gloves.<br>\
+			Wirecutters will turn the grille into metal rods instantly. Grilles are made with metal rods."
+
 /obj/structure/grille/fence
 	var/width = 3
 

code/game/objects/structures/inflatable.dm

@@ -5,6 +5,9 @@
 	icon_state = "folded_wall"
 	w_class = WEIGHT_CLASS_NORMAL
 
+/obj/item/inflatable/detailed_examine()
+	return "Inflate by using it in your hand. The inflatable barrier will inflate on your tile. To deflate it, use the 'deflate' verb."
+
 /obj/item/inflatable/attack_self(mob/user)
 	playsound(loc, 'sound/items/zip.ogg', 75, 1)
 	to_chat(user, "<span class='notice'>You inflate [src].</span>")
@@ -25,6 +28,9 @@
 	var/torn = /obj/item/inflatable/torn
 	var/intact = /obj/item/inflatable
 
+/obj/structure/inflatable/detailed_examine()
+	return "To remove these safely, use the 'deflate' verb. Hitting these with any objects will probably puncture and break it forever."
+
 /obj/structure/inflatable/Initialize(location)
 	..()
 	air_update_turf(TRUE)
@@ -104,6 +110,10 @@
 	var/state = 0 //closed, 1 == open
 	var/isSwitchingStates = 0
 
+/obj/structure/inflatable/door/detailed_examine()
+	return "Click the door to open or close it. It only stops air while closed.<br>\
+			To remove these safely, use the 'deflate' verb. Hitting these with any objects will probably puncture and break it forever."
+
 /obj/structure/inflatable/door/attack_ai(mob/user as mob) //those aren't machinery, they're just big fucking slabs of a mineral
 	if(isAI(user)) //so the AI can't open it
 		return

code/game/objects/structures/janicart.dm

@@ -7,6 +7,7 @@
 	icon_state = "cart"
 	anchored = 0
 	density = 1
+	face_while_pulling = FALSE
 	container_type = OPENCONTAINER
 	//copypaste sorry
 	var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite

code/game/objects/structures/lattice.dm

@@ -26,6 +26,10 @@
 	. = ..()
 	. += deconstruction_hints(user)
 
+/obj/structure/lattice/detailed_examine()
+	return "Add a metal floor tile to build a floor on top of the lattice.<br>\
+			Lattices can be made by applying metal rods to a space tile."
+
 /obj/structure/lattice/proc/deconstruction_hints(mob/user)
 	return "<span class='notice'>The rods look like they could be <b>cut</b>. There's space for more <i>rods</i> or a <i>tile</i>.</span>"
 

code/game/objects/structures/mirror.dm

@@ -114,12 +114,9 @@
 
 		if("Body")
 			var/list/race_list = list("Human", "Tajaran", "Skrell", "Unathi", "Diona", "Vulpkanin")
-			if(config.usealienwhitelist)
-				for(var/Spec in GLOB.whitelisted_species)
-					if(is_alien_whitelisted(H, Spec))
-						race_list += Spec
-			else
-				race_list += GLOB.whitelisted_species
+			for(var/species in GLOB.whitelisted_species)
+				if(is_alien_whitelisted(H, species))
+					race_list += species
 
 			var/datum/ui_module/appearance_changer/AC = ui_users[user]
 			if(!AC)

code/game/objects/structures/spawner.dm

@@ -86,15 +86,3 @@
 	name = "basilisk den"
 	desc = "A den housing a nest of basilisks, bring a coat."
 	mob_types = list(/mob/living/simple_animal/hostile/asteroid/basilisk)
-
-/obj/structure/spawner/headcrab
-	name = "headcrab nest"
-	desc = "A living nest for headcrabs. It is moving ominously."
-	icon_state = "headcrab_nest"
-	icon = 'icons/mob/headcrab.dmi'
-	max_integrity = 200
-	max_mobs = 15
-	spawn_time = 600
-	mob_types = list(/mob/living/simple_animal/hostile/headcrab, /mob/living/simple_animal/hostile/headcrab/fast, /mob/living/simple_animal/hostile/headcrab/poison)
-	spawn_text = "crawls out of"
-	faction = list("hostile")

code/game/objects/structures/stool_bed_chair_nest/bed.dm

@@ -25,6 +25,12 @@
 	buckle_offset = -6
 	var/comfort = 2 // default comfort
 
+/obj/structure/bed/detailed_examine()
+	return "Click and drag yourself (or anyone) to this to buckle in. Click on this with an empty hand to undo the buckles.<br>\
+			<br>\
+			Anyone with restraints, such as handcuffs, will not be able to unbuckle themselves. They must use the Resist button, or verb, to break free of \
+			the buckles, instead."
+
 /obj/structure/bed/psych
 	name = "psych bed"
 	desc = "For prime comfort during psychiatric evaluations."
@@ -64,6 +70,7 @@
 	name = "roller bed"
 	icon = 'icons/obj/rollerbed.dmi'
 	icon_state = "down"
+	face_while_pulling = FALSE
 	resistance_flags = NONE
 	anchored = FALSE
 	comfort = 1

code/game/objects/structures/stool_bed_chair_nest/chairs.dm

@@ -11,6 +11,7 @@
 	max_integrity = 250
 	integrity_failure = 25
 	buckle_offset = 0
+	face_while_pulling = FALSE
 	var/buildstacktype = /obj/item/stack/sheet/metal
 	var/buildstackamount = 1
 	var/item_chair = /obj/item/chair // if null it can't be picked up
@@ -116,7 +117,7 @@
 	set category = "Object"
 	set src in oview(1)
 
-	if(config.ghost_interaction)
+	if(GLOB.configuration.general.ghost_interaction)
 		setDir(turn(dir, 90))
 		handle_rotation()
 		return