Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23

# Conflicts: # code/game/jobs/job_controller.dm # code/game/machinery/oxygen_pump.dm # code/game/objects/items/weapons/storage/firstaid.dm # code/game/objects/structures/crates_lockers/closets/secure/security.dm # code/modules/mob/new_player/new_player.dm # code/modules/organs/internal/eyes.dm # html/changelogs/.all_changelog.yml # maps/southern_cross/southern_cross-1.dmm # vorestation.dme
2026-01-24 16:23:22 +00:00 · 2018-02-23 20:32:44 -05:00
parent 4457c2ffd2 63667c4a02
commit 30454ccdc3
138 changed files with 2790 additions and 1112 deletions
--- a/code/__defines/items_clothing.dm
+++ b/code/__defines/items_clothing.dm
@@ -34,6 +34,7 @@
 #define ACCESSORY_SLOT_ARMOR_L  "Leg armor"
 #define ACCESSORY_SLOT_ARMOR_S  "Armor storage"
 #define ACCESSORY_SLOT_ARMOR_M  "Misc armor"
+#define ACCESSORY_SLOT_HELM_C	"Helmet cover"

 // Flags bitmasks.
 #define NOBLUDGEON         0x1    // When an item has this it produces no "X has been hit by Y with Z" message with the default handler.
@@ -111,6 +112,21 @@
 #define slot_w_uniform_str	"slot_w_uniform"
 #define slot_head_str		"slot_head"
 #define slot_wear_suit_str	"slot_suit"
+#define slot_l_ear_str      "slot_l_ear"
+#define slot_r_ear_str      "slot_r_ear"
+#define slot_belt_str       "slot_belt"
+#define slot_shoes_str      "slot_shoes"
+#define slot_head_str      	"slot_head"
+#define slot_wear_mask_str 	"slot_wear_mask"
+#define slot_handcuffed_str "slot_handcuffed"
+#define slot_legcuffed_str "slot_legcuffed"
+#define slot_wear_mask_str 	"slot_wear_mask"
+#define slot_wear_id_str  	"slot_wear_id"
+#define slot_gloves_str  	"slot_gloves"
+#define slot_glasses_str  	"slot_glasses"
+#define slot_s_store_str	"slot_s_store"
+#define slot_tie_str		"slot_tie"
+

 // Bitflags for clothing parts.
 #define HEAD        0x1
--- a/code/_helpers/unsorted.dm
+++ b/code/_helpers/unsorted.dm
@@ -1433,4 +1433,51 @@ var/mob/dview/dview_mob = new
 		return USE_FAIL_NOT_IN_USER

 #undef NOT_FLAG
-#undef HAS_FLAG
+#undef HAS_FLAG
+
+// Returns direction-string, rounded to multiples of 22.5, from the first parameter to the second
+// N, NNE, NE, ENE, E, ESE, SE, SSE, S, SSW, SW, WSW, W, WNW, NW, NNW
+/proc/get_adir(var/turf/A, var/turf/B)
+	var/degree = Get_Angle(A, B)
+	switch(round(degree%360, 22.5))
+		if(0)
+			return "North"
+		if(22.5)
+			return "North-Northeast"
+		if(45)
+			return "Northeast"
+		if(67.5)
+			return "East-Northeast"
+		if(90)
+			return "East"
+		if(112.5)
+			return "East-Southeast"
+		if(135)
+			return "Southeast"
+		if(157.5)
+			return "South-Southeast"
+		if(180)
+			return "South"
+		if(202.5)
+			return "South-Southwest"
+		if(225)
+			return "Southwest"
+		if(247.5)
+			return "West-Southwest"
+		if(270)
+			return "West"
+		if(292.5)
+			return "West-Northwest"
+		if(315)
+			return "Northwest"
+		if(337.5)
+			return "North-Northwest"
+
+
+
+
+
+
+
+
+
--- a/code/_onclick/hud/human.dm
+++ b/code/_onclick/hud/human.dm
@@ -75,7 +75,7 @@
 		ico = new(ui_style, "black")
 		ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
 		ico.DrawBox(rgb(255,255,255,1),1,ico.Height()/2,ico.Width()/2,ico.Height())
-		using = new /obj/screen( src )
+		using = new /obj/screen()
 		using.name = I_HELP
 		using.icon = ico
 		using.screen_loc = ui_acti
@@ -87,7 +87,7 @@
 		ico = new(ui_style, "black")
 		ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
 		ico.DrawBox(rgb(255,255,255,1),ico.Width()/2,ico.Height()/2,ico.Width(),ico.Height())
-		using = new /obj/screen( src )
+		using = new /obj/screen()
 		using.name = I_DISARM
 		using.icon = ico
 		using.screen_loc = ui_acti
@@ -99,7 +99,7 @@
 		ico = new(ui_style, "black")
 		ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
 		ico.DrawBox(rgb(255,255,255,1),ico.Width()/2,1,ico.Width(),ico.Height()/2)
-		using = new /obj/screen( src )
+		using = new /obj/screen()
 		using.name = I_GRAB
 		using.icon = ico
 		using.screen_loc = ui_acti
@@ -111,7 +111,7 @@
 		ico = new(ui_style, "black")
 		ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
 		ico.DrawBox(rgb(255,255,255,1),1,1,ico.Width()/2,ico.Height()/2)
-		using = new /obj/screen( src )
+		using = new /obj/screen()
 		using.name = I_HURT
 		using.icon = ico
 		using.screen_loc = ui_acti
--- a/code/datums/ghost_query.dm
+++ b/code/datums/ghost_query.dm
@@ -126,3 +126,9 @@
 	question = "A person suspended in cryosleep has been discovered by a crewmember \
 	and they are attempting to open the cryopod.  Would you like to play as the occupant?"
 	cutoff_number = 1
+
+/datum/ghost_query/corgi_rune
+	role_name = "Dark Creature"
+	question = "A curious explorer has touched a mysterious rune. \
+	Would you like to play as the creature it summons?"
+	cutoff_number = 1
--- a/code/datums/outfits/jobs/cargo.dm
+++ b/code/datums/outfits/jobs/cargo.dm
@@ -20,6 +20,7 @@
 /decl/hierarchy/outfit/job/cargo/mining
 	name = OUTFIT_JOB_NAME("Shaft miner")
 	uniform = /obj/item/clothing/under/rank/miner
+	l_ear = /obj/item/device/radio/headset/headset_mine
 	backpack = /obj/item/weapon/storage/backpack/industrial
 	satchel_one  = /obj/item/weapon/storage/backpack/satchel/eng
 	id_type = /obj/item/weapon/card/id/cargo/mining
--- a/code/datums/supplypacks/materials.dm
+++ b/code/datums/supplypacks/materials.dm
@@ -49,7 +49,7 @@
 	cost = 15
 	contains = list(
 					/obj/fiftyspawner/carpet,
-					/obj/fiftyspawner/bluecarpet
+					/obj/fiftyspawner/tealcarpet
 					)


--- a/code/datums/supplypacks/security.dm
+++ b/code/datums/supplypacks/security.dm
@@ -282,7 +282,7 @@
 			/obj/item/clothing/suit/storage/vest/hos,
 			/obj/item/clothing/under/rank/head_of_security/corp,
 			/obj/item/clothing/suit/storage/vest/hoscoat,
-			/obj/item/clothing/head/helmet/HoS/dermal,
+			/obj/item/clothing/head/helmet/dermal,
 			/obj/item/weapon/cartridge/hos,
 			/obj/item/device/radio/headset/heads/hos,
 			/obj/item/clothing/glasses/sunglasses/sechud,
--- a/code/game/gamemodes/changeling/powers/bioelectrogenesis.dm
+++ b/code/game/gamemodes/changeling/powers/bioelectrogenesis.dm
@@ -102,6 +102,8 @@
 	desc = "You could probably shock someone badly if you touched them, or recharge something."
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "electric_hand"
+	show_examine = FALSE
+
 	var/shock_cost = 10
 	var/agony_amount = 60
 	var/electrocute_amount = 10
--- a/code/game/gamemodes/changeling/powers/electric_lockpick.dm
+++ b/code/game/gamemodes/changeling/powers/electric_lockpick.dm
@@ -30,6 +30,7 @@
 	desc = "This finger appears to be an organic datajack."
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "electric_hand"
+	show_examine = FALSE

 /obj/item/weapon/finger_lockpick/New()
 	if(ismob(loc))
--- a/code/game/gamemodes/technomancer/assistance/golem.dm
+++ b/code/game/gamemodes/technomancer/assistance/golem.dm
@@ -30,7 +30,7 @@
 	melee_damage_lower = 30 // It has a built in esword.
 	melee_damage_upper = 30
 	attack_sound = 'sound/weapons/blade1.ogg'
-	attacktext = "slashed"
+	attacktext = list("slashed")
 	friendly = "hugs"
 	resistance = 0
 	melee_miss_chance = 0
--- a/code/game/gamemodes/technomancer/spell_objs.dm
+++ b/code/game/gamemodes/technomancer/spell_objs.dm
@@ -31,6 +31,7 @@
 		)
 	throwforce = 0
 	force = 0
+	show_examine = FALSE
 //	var/mob/living/carbon/human/owner = null
 	var/mob/living/owner = null
 	var/obj/item/weapon/technomancer_core/core = null
--- a/code/game/jobs/job_controller.dm
+++ b/code/game/jobs/job_controller.dm
@@ -621,32 +621,30 @@ var/global/datum/controller/occupations/job_master
 			tmp_str += "HIGH=[level1]|MEDIUM=[level2]|LOW=[level3]|NEVER=[level4]|BANNED=[level5]|YOUNG=[level6]|-"
 			feedback_add_details("job_preferences",tmp_str)

-/datum/controller/occupations/proc/LateSpawn(var/mob/living/carbon/human/H, var/rank)
-	//spawn at one of the latespawn locations
+/datum/controller/occupations/proc/LateSpawn(var/client/C, var/rank)

 	var/datum/spawnpoint/spawnpos

-//	if(H.client.prefs.spawnpoint)
-//		spawnpos = spawntypes[H.client.prefs.spawnpoint]
-
-	if(H.client.prefs.spawnpoint)
-		if(!(H.client.prefs.spawnpoint in using_map.allowed_spawns))
-			if(H) // This seems redundant...
-				to_chat(H, "<span class='warning'>Your chosen spawnpoint ([H.client.prefs.spawnpoint]) is unavailable for the current map. Spawning you at one of the enabled spawn points instead.</span>")
+	//Spawn them at their preferred one
+	if(C.prefs.spawnpoint)
+		if(!(C.prefs.spawnpoint in using_map.allowed_spawns))
+			to_chat(C, "<span class='warning'>Your chosen spawnpoint ([C.prefs.spawnpoint]) is unavailable for the current map. Spawning you at one of the enabled spawn points instead.</span>")
 			spawnpos = null
 		else
-			spawnpos = spawntypes[H.client.prefs.spawnpoint]
+			spawnpos = spawntypes[C.prefs.spawnpoint]

+	//We will return a list key'd by "turf" and "msg"
+	. = list("turf","msg")
 	if(spawnpos && istype(spawnpos) && spawnpos.turfs.len)
 		if(spawnpos.check_job_spawning(rank))
-			H.forceMove(spawnpos.get_spawn_position())
-			. = spawnpos.msg
+			.["turf"] = spawnpos.get_spawn_position()
+			.["msg"] = spawnpos.msg
 		else
-			H << "Your chosen spawnpoint ([spawnpos.display_name]) is unavailable for your chosen job. Spawning you at the default arrivals location instead." //VOREStation Edit - Generic, not shuttle.
+			to_chat(C,"Your chosen spawnpoint ([spawnpos.display_name]) is unavailable for your chosen job. Spawning you at the Arrivals shuttle instead.")
 			var/spawning = pick(latejoin)
-			H.forceMove(get_turf(spawning))
-			. = "will arrive at the station shortly" //VOREStation Edit - Grammar but mostly 'shuttle' reference removal, and this also applies to notified spawn-character verb use
+			.["turf"] = get_turf(spawning)
+			.["msg"] = "will arrive at the station shortly"  //VOREStation Edit - Grammar but mostly 'shuttle' reference removal, and this also applies to notified spawn-character verb use
 	else
 		var/spawning = pick(latejoin)
-		H.forceMove(get_turf(spawning))
-		. = "has arrived on the station"
+		.["turf"] = get_turf(spawning)
+		.["msg"] = "has arrived on the station"
--- a/code/game/machinery/oxygen_pump.dm
+++ b/code/game/machinery/oxygen_pump.dm
@@ -32,14 +32,12 @@
 		breather.internal = null
 		if(breather.internals)
 			breather.internals.icon_state = "internal0"
-	if(tank)
-		qdel(tank)
-	if(breather)
 		breather.remove_from_mob(contained)
-		src.visible_message("<span class='notice'>The mask rapidly retracts just before /the [src] is destroyed!</span>")
-	qdel(contained)
-	contained = null
-	breather = null
+		visible_message("<span class='notice'>The mask rapidly retracts just before /the [src] is destroyed!</span>")
+		breather = null
+
+	qdel_null(tank)
+	qdel_null(contained)
 	return ..()

 /obj/machinery/oxygen_pump/MouseDrop(var/mob/living/carbon/human/target, src_location, over_location)
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -861,7 +861,8 @@
 					/obj/item/weapon/reagent_containers/glass/bottle/stoxin = 4,/obj/item/weapon/reagent_containers/glass/bottle/toxin = 4,
 					/obj/item/weapon/reagent_containers/syringe/antiviral = 4,/obj/item/weapon/reagent_containers/syringe = 12,
 					/obj/item/device/healthanalyzer = 5,/obj/item/weapon/reagent_containers/glass/beaker = 4, /obj/item/weapon/reagent_containers/dropper = 2,
-					/obj/item/stack/medical/advanced/bruise_pack = 3, /obj/item/stack/medical/advanced/ointment = 3, /obj/item/stack/medical/splint = 2)
+					/obj/item/stack/medical/advanced/bruise_pack = 3, /obj/item/stack/medical/advanced/ointment = 3, /obj/item/stack/medical/splint = 2,
+					/obj/item/weapon/storage/pill_bottle/carbon = 2)
 	contraband = list(/obj/item/weapon/reagent_containers/pill/tox = 3,/obj/item/weapon/reagent_containers/pill/stox = 4,/obj/item/weapon/reagent_containers/pill/antitox = 6)
 	idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
 	req_log_access = access_cmo
--- a/code/game/objects/effects/decals/posters/polarisposters.dm
+++ b/code/game/objects/effects/decals/posters/polarisposters.dm
@@ -26,12 +26,12 @@
 /datum/poster/pol_6
 	icon_state="polposter6"
 	name = "Walk!"
-	desc = "This poster depicts a man walking, presumably to encourage you to not run in the halls."
+	desc = "This poster depicts a man walking, presumably to encourage you not to run in the halls."

 /datum/poster/pol_7
 	icon_state="polposter7"
 	name = "Place your signs!"
-	desc = "A safety poster reminding custodial stuff to place wet floor signs where needed.  This reminder's rarely heeded."
+	desc = "A safety poster reminding custodial staff to place wet floor signs where needed.  This reminder's rarely heeded."

 /datum/poster/pol_8
 	icon_state="polposter8"
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -382,14 +382,14 @@ var/list/global/slot_flags_enumeration = list(
 			if(!allow)
 				return 0
 		if(slot_tie)
-			if(!H.w_uniform && (slot_w_uniform in mob_equip))
+			var/allow = 0
+			for(var/obj/item/clothing/C in H.worn_clothing)	//Runs through everything you're wearing, returns if you can't attach the thing
+				if(C.can_attach_accessory(src))
+					allow = 1
+					break
+			if(!allow)
 				if(!disable_warning)
-					H << "<span class='warning'>You need a jumpsuit before you can attach this [name].</span>"
-				return 0
-			var/obj/item/clothing/under/uniform = H.w_uniform
-			if(uniform.accessories.len && !uniform.can_attach_accessory(src))
-				if (!disable_warning)
-					H << "<span class='warning'>You already have an accessory of this type attached to your [uniform].</span>"
+					H << "<span class='warning'>You're not wearing anything you can attach this [name] to.</span>"
 				return 0
 	return 1

--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -145,7 +145,7 @@
 	var/obj/item/weapon/reagent_containers/syringe/syringe

 /obj/structure/closet/body_bag/cryobag/New()
-	tank = new /obj/item/weapon/tank/emergency/oxygen(null) //It's in nullspace to prevent ejection when the bag is opened.
+	tank = new /obj/item/weapon/tank/emergency/oxygen/double(null) //It's in nullspace to prevent ejection when the bag is opened.
 	..()

 /obj/structure/closet/body_bag/cryobag/Destroy()
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -1379,14 +1379,12 @@ var/global/list/obj/item/device/pda/PDAs = list()
 							to_chat(user, "<span class='notice'>Blood type: [C:blood_DNA[blood]]\nDNA: [blood]</span>")

 			if(4)
-				for (var/mob/O in viewers(C, null))
-					O.show_message("<span class='warning'>\The [user] has analyzed [C]'s radiation levels!</span>", 1)
-
-				user.show_message("<span class='notice'>Analyzing Results for [C]:</span>")
+				user.visible_message("<span class='warning'>\The [user] has analyzed [C]'s radiation levels!</span>", 1)
+				to_chat(user, "<span class='notice'>Analyzing Results for [C]:</span>")
 				if(C.radiation)
-					user.show_message("<span class='notice'>Radiation Level: [C.radiation]</span>")
+					to_chat(user, "<span class='notice'>Radiation Level: [C.radiation]</span>")
 				else
-					user.show_message("<span class='notice'>No radiation detected.</span>")
+					to_chat(user, "<span class='notice'>No radiation detected.</span>")

 /obj/item/device/pda/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity)
 	if(!proximity) return
--- a/code/game/objects/items/devices/gps.dm
+++ b/code/game/objects/items/devices/gps.dm
@@ -104,16 +104,16 @@ var/list/GPS_list = list()
 		if(istype(their_area, /area/submap))
 			area_name = "Unknown Area" // Avoid spoilers.
 		var/Z_name = using_map.get_zlevel_name(T.z)
-		var/direction = uppertext(dir2text(get_dir(curr, T)))
+		var/direction = get_adir(curr, T)
+		var/distX = T.x - curr.x
+		var/distY = T.y - curr.y
 		var/distance = get_dist(curr, T)
 		var/local = curr.z == T.z ? TRUE : FALSE
-		if(!direction)
-			direction = "CENTER"

-		if(istype(T, /obj/item/device/gps/internal/poi))
-			signals += "	[G.gps_tag]: [area_name] [local ? "Dist: [round(distance, 10)]m [direction])" : "in \the [Z_name]"]"
+		if(istype(gps, /obj/item/device/gps/internal/poi))
+			signals += "    [G.gps_tag]: [area_name] - [local ? "[direction] Dist: [round(distance, 10)]m" : "in \the [Z_name]"]"
 		else
-			signals += "     [G.gps_tag]: [area_name] [local ? "Dist: [round(distance, 10)]m [direction])" : "in \the [Z_name]"]"
+			signals += "    [G.gps_tag]: [area_name], ([T.x], [T.y]) - [local ? "[direction] Dist: [distX ? "[abs(round(distX, 1))]m [(distX > 0) ? "E" : "W"], " : ""][distY ? "[abs(round(distY, 1))]m [(distY > 0) ? "N" : "S"]" : ""]" : "in \the [Z_name]"]"

 	if(signals.len)
 		dat += "Detected signals;"
@@ -250,12 +250,9 @@ var/list/GPS_list = list()
 		var/Z_name = using_map.get_zlevel_name(T.z)
 		var/coord = "[T.x], [T.y], [Z_name]"
 		var/degrees = round(Get_Angle(curr, T))
-		var/direction = uppertext(dir2text(get_dir(curr, T)))
+		var/direction = get_adir(curr, T)
 		var/distance = get_dist(curr, T)
 		var/local = curr.z == T.z ? TRUE : FALSE
-		if(!direction)
-			direction = "CENTER"
-			degrees = "N/A"

 		signals += "     [G.gps_tag]: [area_name] ([coord]) [local ? "Dist: [distance]m Dir: [degrees]° ([direction])":""]"

--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -92,77 +92,66 @@
 	name = "security radio headset"
 	desc = "This is used by your elite security force."
 	icon_state = "sec_headset"
-	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/headset_sec

 /obj/item/device/radio/headset/headset_sec/alt
 	name = "security bowman headset"
 	desc = "This is used by your elite security force."
 	icon_state = "sec_headset_alt"
-	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/headset_sec

 /obj/item/device/radio/headset/headset_eng
 	name = "engineering radio headset"
 	desc = "When the engineers wish to chat like girls."
 	icon_state = "eng_headset"
-	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/headset_eng

 /obj/item/device/radio/headset/headset_eng/alt
 	name = "engineering bowman headset"
 	desc = "When the engineers wish to chat like girls."
 	icon_state = "eng_headset_alt"
-	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/headset_eng

 /obj/item/device/radio/headset/headset_rob
 	name = "robotics radio headset"
 	desc = "Made specifically for the roboticists who cannot decide between departments."
 	icon_state = "rob_headset"
-	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/headset_rob

 /obj/item/device/radio/headset/headset_med
 	name = "medical radio headset"
 	desc = "A headset for the trained staff of the medbay."
 	icon_state = "med_headset"
-	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/headset_med

 /obj/item/device/radio/headset/headset_med/alt
 	name = "medical bowman headset"
 	desc = "A headset for the trained staff of the medbay."
 	icon_state = "med_headset_alt"
-	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/headset_med

 /obj/item/device/radio/headset/headset_sci
 	name = "science radio headset"
 	desc = "A sciency headset. Like usual."
 	icon_state = "com_headset"
-	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/headset_sci

 /obj/item/device/radio/headset/headset_medsci
 	name = "medical research radio headset"
 	desc = "A headset that is a result of the mating between medical and science."
 	icon_state = "med_headset"
-	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/headset_medsci

 /obj/item/device/radio/headset/headset_com
 	name = "command radio headset"
 	desc = "A headset with a commanding channel."
 	icon_state = "com_headset"
-	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/headset_com

 /obj/item/device/radio/headset/headset_com/alt
 	name = "command bowman headset"
 	desc = "A headset with a commanding channel."
 	icon_state = "com_headset_alt"
-	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/headset_com


@@ -170,21 +159,18 @@
 	name = "colony director's headset"
 	desc = "The headset of the boss."
 	icon_state = "com_headset"
-	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/heads/captain

 /obj/item/device/radio/headset/heads/captain/alt
 	name = "colony director's bowman headset"
 	desc = "The headset of the boss."
 	icon_state = "com_headset_alt"
-	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/heads/captain

 /obj/item/device/radio/headset/heads/captain/sfr
 	name = "SFR headset"
 	desc = "A headset belonging to a Sif Free Radio DJ. SFR, best tunes in the wilderness."
 	icon_state = "com_headset_alt"
-	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/heads/captain

 /obj/item/device/radio/headset/heads/ai_integrated //No need to care about icons, it should be hidden inside the AI anyway.
@@ -206,105 +192,91 @@
 	name = "research director's headset"
 	desc = "Headset of the researching God."
 	icon_state = "com_headset"
-	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/heads/rd

 /obj/item/device/radio/headset/heads/rd/alt
 	name = "research director's bowman headset"
 	desc = "Headset of the researching God."
 	icon_state = "com_headset_alt"
-	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/heads/rd

 /obj/item/device/radio/headset/heads/hos
 	name = "head of security's headset"
 	desc = "The headset of the man who protects your worthless lifes."
 	icon_state = "com_headset"
-	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/heads/hos

 /obj/item/device/radio/headset/heads/hos/alt
 	name = "head of security's bowman headset"
 	desc = "The headset of the man who protects your worthless lifes."
 	icon_state = "com_headset_alt"
-	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/heads/hos

 /obj/item/device/radio/headset/heads/ce
 	name = "chief engineer's headset"
 	desc = "The headset of the guy who is in charge of morons"
 	icon_state = "com_headset"
-	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/heads/ce

 /obj/item/device/radio/headset/heads/ce/alt
 	name = "chief engineer's bowman headset"
 	desc = "The headset of the guy who is in charge of morons"
 	icon_state = "com_headset_alt"
-	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/heads/ce

 /obj/item/device/radio/headset/heads/cmo
 	name = "chief medical officer's headset"
 	desc = "The headset of the highly trained medical chief."
 	icon_state = "com_headset"
-	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/heads/cmo

 /obj/item/device/radio/headset/heads/cmo/alt
 	name = "chief medical officer's bowman headset"
 	desc = "The headset of the highly trained medical chief."
 	icon_state = "com_headset_alt"
-	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/heads/cmo

 /obj/item/device/radio/headset/heads/hop
 	name = "head of personnel's headset"
 	desc = "The headset of the guy who will one day be Colony Director."
 	icon_state = "com_headset"
-	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/heads/hop

 /obj/item/device/radio/headset/heads/hop/alt
 	name = "head of personnel's bowman headset"
 	desc = "The headset of the guy who will one day be Colony Director."
 	icon_state = "com_headset_alt"
-	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/heads/hop
-/*
+
 /obj/item/device/radio/headset/headset_mine
 	name = "mining radio headset"
-	desc = "Headset used by miners. How useless. To access the mining channel, use :d."
+	desc = "Headset used by miners. Has inbuilt short-band radio for when comms are down."
 	icon_state = "mine_headset"
-	item_state = "headset"
-	keyslot2 = new /obj/item/device/encryptionkey/headset_mine
-*/
+	adhoc_fallback = TRUE
+	ks2type = /obj/item/device/encryptionkey/headset_cargo
+
 /obj/item/device/radio/headset/headset_cargo
 	name = "supply radio headset"
 	desc = "A headset used by the QM and his slaves."
 	icon_state = "cargo_headset"
-	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/headset_cargo

 /obj/item/device/radio/headset/headset_cargo/alt
 	name = "supply bowman headset"
 	desc = "A bowman headset used by the QM and his slaves."
 	icon_state = "cargo_headset_alt"
-	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/headset_cargo

 /obj/item/device/radio/headset/headset_service
 	name = "service radio headset"
 	desc = "Headset used by the service staff, tasked with keeping the station full, happy and clean."
 	icon_state = "srv_headset"
-	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/headset_service

 /obj/item/device/radio/headset/ert
 	name = "emergency response team radio headset"
 	desc = "The headset of the boss's boss."
 	icon_state = "com_headset"
-	item_state = "headset"
 	centComm = 1
 //	freerange = 1
 	ks2type = /obj/item/device/encryptionkey/ert
@@ -313,7 +285,6 @@
 	name = "emergency response team bowman headset"
 	desc = "The headset of the boss's boss."
 	icon_state = "com_headset_alt"
-	item_state = "headset"
 //	freerange = 1
 	ks2type = /obj/item/device/encryptionkey/ert

@@ -324,7 +295,6 @@
 	name = "internal affair's headset"
 	desc = "The headset of your worst enemy."
 	icon_state = "com_headset"
-	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/heads/hos

 /obj/item/device/radio/headset/mmi_radio
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -3,9 +3,10 @@ CONTAINS:
 T-RAY
 DETECTIVE SCANNER
 HEALTH ANALYZER
-GAS ANALYZER
+GAS ANALYZER	- Analyzes atmosphere, container
 MASS SPECTROMETER
 REAGENT SCANNER
+HALOGEN COUNTER	- Radcount on mobs
 */


@@ -41,29 +42,30 @@ REAGENT SCANNER
 	scan_mob(M, user)

 /obj/item/device/healthanalyzer/proc/scan_mob(mob/living/M, mob/living/user)
+	var/dat = ""
 	if ((CLUMSY in user.mutations) && prob(50))
-		user << text("<span class='warning'>You try to analyze the floor's vitals!</span>")
-		for(var/mob/O in viewers(M, null))
-			O.show_message("<span class='warning'>\The [user] has analyzed the floor's vitals!</span>", 1)
-		user.show_message("<span class='notice'>Analyzing Results for The floor:</span>", 1)
-		user.show_message("<span class='notice'>Overall Status: Healthy</span>", 1)
-		user.show_message("<span class='notice'>    Damage Specifics: 0-0-0-0</span>", 1)
-		user.show_message("<span class='notice'>Key: Suffocation/Toxin/Burns/Brute</span>", 1)
-		user.show_message("<span class='notice'>Body Temperature: ???</span>", 1)
+		user.visible_message("<span class='warning'>\The [user] has analyzed the floor's vitals!</span>", "<span class='warning'>You try to analyze the floor's vitals!</span>")
+		dat += "Analyzing Results for the floor:<br>"
+		dat += "Overall Status: Healthy<br>"
+		dat += "\tDamage Specifics: 0-0-0-0<br>"
+		dat += "Key: Suffocation/Toxin/Burns/Brute<br>"
+		dat += "Body Temperature: ???"
+		user.show_message("<span class='notice'>[dat]</span>", 1)
 		return
-	if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
-		usr << "<span class='warning'>You don't have the dexterity to do this!</span>"
+	if (!(ishuman(user) || ticker) && ticker.mode.name != "monkey")
+		to_chat(user, "<span class='warning'>You don't have the dexterity to do this!</span>")
 		return
 	user.visible_message("<span class='notice'>[user] has analyzed [M]'s vitals.</span>","<span class='notice'>You have analyzed [M]'s vitals.</span>")

-	if (!istype(M,/mob/living/carbon/human) || M.isSynthetic())
+	if (!ishuman(M) || M.isSynthetic())
 		//these sensors are designed for organic life
-		user.show_message("<span class='notice'>Analyzing Results for ERROR:\n\t Overall Status: ERROR</span>")
-		user.show_message("<span class='notice'>    Key: <font color='cyan'>Suffocation</font>/<font color='green'>Toxin</font>/<font color='#FFA500'>Burns</font>/<font color='red'>Brute</font></span>", 1)
-		user.show_message("<span class='notice'>    Damage Specifics: <font color='cyan'>?</font> - <font color='green'>?</font> - <font color='#FFA500'>?</font> - <font color='red'>?</font></span>")
-		user.show_message("<span class='notice'>Body Temperature: [M.bodytemperature-T0C]&deg;C ([M.bodytemperature*1.8-459.67]&deg;F)</span>", 1)
-		user.show_message("<span class='warning'>Warning: Blood Level ERROR: --% --cl.</span> <span class='notice'>Type: ERROR</span>")
-		user.show_message("<span class='notice'>Subject's pulse: <font color='red'>-- bpm.</font></span>")
+		dat += "<span class='notice'>Analyzing Results for ERROR:\n\tOverall Status: ERROR<br>"
+		dat += "\tKey: <font color='cyan'>Suffocation</font>/<font color='green'>Toxin</font>/<font color='#FFA500'>Burns</font>/<font color='red'>Brute</font><br>"
+		dat += "\tDamage Specifics: <font color='cyan'>?</font> - <font color='green'>?</font> - <font color='#FFA500'>?</font> - <font color='red'>?</font><br>"
+		dat += "Body Temperature: [M.bodytemperature-T0C]&deg;C ([M.bodytemperature*1.8-459.67]&deg;F)</span><br>"
+		dat += "<span class='warning'>Warning: Blood Level ERROR: --% --cl.</span> <span class='notice'>Type: ERROR</span><br>"
+		dat += "<span class='notice'>Subject's pulse: <font color='red'>-- bpm.</font></span>"
+		user.show_message(dat, 1)
 		return

 	var/fake_oxy = max(rand(1,40), M.getOxyLoss(), (300 - (M.getToxLoss() + M.getFireLoss() + M.getBruteLoss())))
@@ -73,52 +75,52 @@ REAGENT SCANNER
 	var/BR = M.getBruteLoss() > 50 	? 	"<b>[M.getBruteLoss()]</b>" 	: M.getBruteLoss()
 	if(M.status_flags & FAKEDEATH)
 		OX = fake_oxy > 50 			? 	"<b>[fake_oxy]</b>" 			: fake_oxy
-		user.show_message("<span class='notice'>Analyzing Results for [M]:</span>")
-		user.show_message("<span class='notice'>Overall Status: dead</span>")
+		dat += "<span class='notice'>Analyzing Results for [M]:</span><br>"
+		dat += "<span class='notice'>Overall Status: dead</span><br>"
 	else
-		user.show_message("<span class='notice'>Analyzing Results for [M]:\n\t Overall Status: [M.stat > 1 ? "dead" : "[round((M.health/M.getMaxHealth())*100) ]% healthy"]</span>")
-	user.show_message("<span class='notice'>    Key: <font color='cyan'>Suffocation</font>/<font color='green'>Toxin</font>/<font color='#FFA500'>Burns</font>/<font color='red'>Brute</font></span>", 1)
-	user.show_message("<span class='notice'>    Damage Specifics: <font color='cyan'>[OX]</font> - <font color='green'>[TX]</font> - <font color='#FFA500'>[BU]</font> - <font color='red'>[BR]</font></span>")
-	user.show_message("<span class='notice'>Body Temperature: [M.bodytemperature-T0C]&deg;C ([M.bodytemperature*1.8-459.67]&deg;F)</span>", 1)
+		dat += 	"<span class='notice'>Analyzing Results for [M]:\n\t Overall Status: [M.stat > 1 ? "dead" : "[round((M.health/M.getMaxHealth())*100) ]% healthy"]<br>"
+	dat += 		"\tKey: <font color='cyan'>Suffocation</font>/<font color='green'>Toxin</font>/<font color='#FFA500'>Burns</font>/<font color='red'>Brute</font><br>"
+	dat += 		"\tDamage Specifics: <font color='cyan'>[OX]</font> - <font color='green'>[TX]</font> - <font color='#FFA500'>[BU]</font> - <font color='red'>[BR]</font><br>"
+	dat +=		"Body Temperature: [M.bodytemperature-T0C]&deg;C ([M.bodytemperature*1.8-459.67]&deg;F)</span><br>"
 	if(M.tod && (M.stat == DEAD || (M.status_flags & FAKEDEATH)))
-		user.show_message("<span class='notice'>Time of Death: [M.tod]</span>")
+		dat += 	"<span class='notice'>Time of Death: [M.tod]</span><br>"
 	if(istype(M, /mob/living/carbon/human) && mode == 1)
 		var/mob/living/carbon/human/H = M
 		var/list/damaged = H.get_damaged_organs(1,1)
-		user.show_message("<span class='notice'>Localized Damage, Brute/Burn:</span>",1)
+		dat += 	"<span class='notice'>Localized Damage, Brute/Burn:</span><br>"
 		if(length(damaged)>0)
 			for(var/obj/item/organ/external/org in damaged)
 				if(org.robotic >= ORGAN_ROBOT)
 					continue
 				else
-					user.show_message(text("<span class='notice'>     []: [][] - []</span>",
-					capitalize(org.name),
-					(org.brute_dam > 0) ? "<span class='warning'>[org.brute_dam]</span>" : 0,
-					(org.status & ORGAN_BLEEDING)?"<span class='danger'>\[Bleeding\]</span>":"",
-					(org.burn_dam > 0) ? "<font color='#FFA500'>[org.burn_dam]</font>" : 0),1)
+					dat += "<span class='notice'>     [capitalize(org.name)]: [(org.brute_dam > 0) ? "<span class='warning'>[org.brute_dam]</span>" : 0]"
+					dat += "[(org.status & ORGAN_BLEEDING)?"<span class='danger'>\[Bleeding\]</span>":""] - "
+					dat += "[(org.burn_dam > 0) ? "<font color='#FFA500'>[org.burn_dam]</font>" : 0]</span><brr>"
 		else
-			user.show_message("<span class='notice'>    Limbs are OK.</span>",1)
+			dat += "<span class='notice'>    Limbs are OK.</span><br>"

-	OX = M.getOxyLoss() > 50 ? 	"<font color='cyan'><b>Severe oxygen deprivation detected</b></font>" 		: 	"Subject bloodstream oxygen level normal"
-	TX = M.getToxLoss() > 50 ? 	"<font color='green'><b>Dangerous amount of toxins detected</b></font>" 	: 	"Subject bloodstream toxin level minimal"
-	BU = M.getFireLoss() > 50 ? 	"<font color='#FFA500'><b>Severe burn damage detected</b></font>" 			:	"Subject burn injury status O.K"
+	OX = M.getOxyLoss() > 50 ? 	 "<font color='cyan'><b>Severe oxygen deprivation detected</b></font>" 		: 	"Subject bloodstream oxygen level normal"
+	TX = M.getToxLoss() > 50 ? 	 "<font color='green'><b>Dangerous amount of toxins detected</b></font>" 	: 	"Subject bloodstream toxin level minimal"
+	BU = M.getFireLoss() > 50 ?  "<font color='#FFA500'><b>Severe burn damage detected</b></font>" 			:	"Subject burn injury status O.K"
 	BR = M.getBruteLoss() > 50 ? "<font color='red'><b>Severe anatomical damage detected</b></font>" 		: 	"Subject brute-force injury status O.K"
 	if(M.status_flags & FAKEDEATH)
 		OX = fake_oxy > 50 ? 		"<span class='warning'>Severe oxygen deprivation detected</span>" 	: 	"Subject bloodstream oxygen level normal"
-	user.show_message("[OX] | [TX] | [BU] | [BR]")
+	dat += "[OX] | [TX] | [BU] | [BR]"
 	if(M.radiation)
 		if(advscan >= 2 && showadvscan == 1)
+			var/severity = ""
 			if(M.radiation >= 75)
-				user.show_message("<span class='warning'>Critical levels of radiation detected. Immediate treatment advised.</span>")
+				severity = "Critical"
 			else if(M.radiation >= 50)
-				user.show_message("<span class='warning'>Severe levels of radiation detected.</span>")
+				severity = "Severe"
 			else if(M.radiation >= 25)
-				user.show_message("<span class='warning'>Moderate levels of radiation detected.</span>")
+				severity = "Moderate"
 			else if(M.radiation >= 1)
-				user.show_message("<span_class='warning'>Low levels of radiation detected.</span>")
+				severity = "Low"
+			dat += "<span class='warning'>[severity] levels of radiation detected. [(severity == "Critical") ? " Immediate treatment advised." : ""]</span><br>"
 		else
-			user.show_message("<span class='warning'>Radiation detected.</span>")
-	if(istype(M, /mob/living/carbon))
+			dat += "<span class='warning'>Radiation detected.</span><br>"
+	if(iscarbon(M))
 		var/mob/living/carbon/C = M
 		if(C.reagents.total_volume)
 			var/unknown = 0
@@ -127,21 +129,21 @@ REAGENT SCANNER
 			for(var/A in C.reagents.reagent_list)
 				var/datum/reagent/R = A
 				if(R.scannable)
-					reagentdata["[R.id]"] = "<span class='notice'>    [round(C.reagents.get_reagent_amount(R.id), 1)]u [R.name]</span>"
+					reagentdata["[R.id]"] = "<span class='notice'>\t[round(C.reagents.get_reagent_amount(R.id), 1)]u [R.name]</span><br>"
 				else
 					unknown++
-					unknownreagents["[R.id]"] = "<span class='notice'>    [round(C.reagents.get_reagent_amount(R.id), 1)]u [R.name]</span>"
+					unknownreagents["[R.id]"] = "<span class='notice'>\t[round(C.reagents.get_reagent_amount(R.id), 1)]u [R.name]</span><br>"
 			if(reagentdata.len)
-				user.show_message("<span class='notice'>Beneficial reagents detected in subject's blood:</span>")
+				dat += "<span class='notice'>Beneficial reagents detected in subject's blood:</span><br>"
 				for(var/d in reagentdata)
-					user.show_message(reagentdata[d])
+					dat += reagentdata[d]
 			if(unknown)
 				if(advscan >= 3 && showadvscan == 1)
-					user.show_message("<span class='warning'>Warning: Non-medical reagent[(unknown>1)?"s":""] detected in subject's blood:</span>")
+					dat += "<span class='warning'>Warning: Non-medical reagent[(unknown>1)?"s":""] detected in subject's blood:</span><br>"
 					for(var/d in unknownreagents)
-						user.show_message(unknownreagents[d])
+						dat += unknownreagents[d]
 				else
-					user.show_message("<span class='warning'>Warning: Unknown substance[(unknown>1)?"s":""] detected in subject's blood.</span>")
+					dat += "<span class='warning'>Warning: Unknown substance[(unknown>1)?"s":""] detected in subject's blood.</span><br>"
 		if(C.ingested && C.ingested.total_volume)
 			var/unknown = 0
 			var/stomachreagentdata[0]
@@ -149,100 +151,104 @@ REAGENT SCANNER
 			for(var/B in C.ingested.reagent_list)
 				var/datum/reagent/T = B
 				if(T.scannable)
-					stomachreagentdata["[T.id]"] = "<span class='notice'>    [round(C.ingested.get_reagent_amount(T.id), 1)]u [T.name]</span>"
+					stomachreagentdata["[T.id]"] = "<span class='notice'>\t[round(C.ingested.get_reagent_amount(T.id), 1)]u [T.name]</span><br>"
 					if (advscan == 0 || showadvscan == 0)
-						user.show_message("<span class='notice'>[T.name] found in subject's stomach.</span>")
+						dat += "<span class='notice'>[T.name] found in subject's stomach.</span><br>"
 				else
 					++unknown
-					stomachunknownreagents["[T.id]"] = "<span class='notice'>    [round(C.ingested.get_reagent_amount(T.id), 1)]u [T.name]</span>"
+					stomachunknownreagents["[T.id]"] = "<span class='notice'>\t[round(C.ingested.get_reagent_amount(T.id), 1)]u [T.name]</span><br>"
 			if(advscan >= 1 && showadvscan == 1)
-				user.show_message("<span class='notice'>Beneficial reagents detected in subject's stomach:</span>")
+				dat += "<span class='notice'>Beneficial reagents detected in subject's stomach:</span><br>"
 				for(var/d in stomachreagentdata)
-					user.show_message(stomachreagentdata[d])
+					dat += stomachreagentdata[d]
 			if(unknown)
 				if(advscan >= 3 && showadvscan == 1)
-					user.show_message("<span class='warning'>Warning: Non-medical reagent[(unknown > 1)?"s":""] found in subject's stomach:</span>")
+					dat += "<span class='warning'>Warning: Non-medical reagent[(unknown > 1)?"s":""] found in subject's stomach:</span><br>"
 					for(var/d in stomachunknownreagents)
-						user.show_message(stomachunknownreagents[d])
+						dat += stomachunknownreagents[d]
 				else
-					user.show_message("<span class='warning'>Unknown substance[(unknown > 1)?"s":""] found in subject's stomach.</span>")
+					dat += "<span class='warning'>Unknown substance[(unknown > 1)?"s":""] found in subject's stomach.</span><br>"
 		if(C.virus2.len)
 			for (var/ID in C.virus2)
 				if (ID in virusDB)
 					var/datum/data/record/V = virusDB[ID]
-					user.show_message("<span class='warning'>Warning: Pathogen [V.fields["name"]] detected in subject's blood. Known antigen : [V.fields["antigen"]]</span>")
+					dat += "<span class='warning'>Warning: Pathogen [V.fields["name"]] detected in subject's blood. Known antigen : [V.fields["antigen"]]</span><br>"
 				else
-					user.show_message("<span class='warning'>Warning: Unknown pathogen detected in subject's blood.</span>")
+					dat += "<span class='warning'>Warning: Unknown pathogen detected in subject's blood.</span><br>"
 	if (M.getCloneLoss())
-		user.show_message("<span class='warning'>Subject appears to have been imperfectly cloned.</span>")
+		dat += "<span class='warning'>Subject appears to have been imperfectly cloned.</span><br>"
 //	if (M.reagents && M.reagents.get_reagent_amount("inaprovaline"))
 //		user.show_message("<span class='notice'>Bloodstream Analysis located [M.reagents:get_reagent_amount("inaprovaline")] units of rejuvenation chemicals.</span>")
 	if (M.has_brain_worms())
-		user.show_message("<span class='warning'>Subject suffering from aberrant brain activity. Recommend further scanning.</span>")
+		dat += "<span class='warning'>Subject suffering from aberrant brain activity. Recommend further scanning.</span><br>"
 	else if (M.getBrainLoss() >= 60 || !M.has_brain())
-		user.show_message("<span class='warning'>Subject is brain dead.</span>")
+		dat += "<span class='warning'>Subject is brain dead.</span><br>"
 	else if (M.getBrainLoss() >= 25)
-		user.show_message("<span class='warning'>Severe brain damage detected. Subject likely to have a traumatic brain injury.</span>")
+		dat += "<span class='warning'>Severe brain damage detected. Subject likely to have a traumatic brain injury.</span><br>"
 	else if (M.getBrainLoss() >= 10)
-		user.show_message("<span class='warning'>Significant brain damage detected. Subject may have had a concussion.</span>")
+		dat += "<span class='warning'>Significant brain damage detected. Subject may have had a concussion.</span><br>"
 	else if (M.getBrainLoss() >= 1 && advscan >= 2 && showadvscan == 1)
-		user.show_message("<span class='warning'>Minor brain damage detected.</span>")
+		dat += "<span class='warning'>Minor brain damage detected.</span><br>"
 	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
-		for(var/name_i in H.internal_organs_by_name)
-			var/obj/item/organ/internal/i = H.internal_organs_by_name[name_i]
-			if(istype(i, /obj/item/organ/internal/appendix))
-				var/obj/item/organ/internal/appendix/a = H.internal_organs_by_name[name_i]
-				if(a.inflamed > 3)
-					user.show_message(text("<span class='warning'>Severe inflammation detected in subject [a.name].</span>"), 1)
-				else if(a.inflamed > 2)
-					user.show_message(text("<span class='warning'>Moderate inflammation detected in subject [a.name].</span>"), 1)
-				else if(a.inflamed >= 1)
-					user.show_message(text("<span class='warning'>Mild inflammation detected in subject [a.name].</span>"), 1)
-
-
-		for(var/name in H.organs_by_name)
-			var/obj/item/organ/external/e = H.organs_by_name[name]
-			if(!e)
-				continue
-			var/limb = e.name
-			if(e.status & ORGAN_BROKEN)
-				if(((e.name == "l_arm") || (e.name == "r_arm") || (e.name == "l_leg") || (e.name == "r_leg")) && (!e.splinted))
-					to_chat(user, "<span class='warning'>Unsecured fracture in subject [limb]. Splinting recommended for transport.</span>")
-			if(e.has_infected_wound())
-				to_chat(user, "<span class='warning'>Infected wound detected in subject [limb]. Disinfection recommended.</span>")
-
-		for(var/name in H.organs_by_name)
-			var/obj/item/organ/external/e = H.organs_by_name[name]
-			if(e && e.status & ORGAN_BROKEN)
-				if(advscan >= 1 && showadvscan == 1)
-					user.show_message(text("<span class='warning'>Bone fractures detected in subject [e.name].</span>"), 1)
-				else
-					user.show_message(text("<span class='warning'>Bone fractures detected. Advanced scanner required for location.</span>"), 1)
-					break
+		for(var/obj/item/organ/internal/appendix/a in H.internal_organs)
+			var/severity = ""
+			if(a.inflamed > 3)
+				severity = "Severe"
+			else if(a.inflamed > 2)
+				severity = "Moderate"
+			else if(a.inflamed >= 1)
+				severity = "Mild"
+			if(severity)
+				dat += "<span class='warning'>[severity] inflammation detected in subject [a.name].</span><br>"
+		// Infections, fractures, and IB
+		var/basic_fracture = 0	// If it's a basic scanner
+		var/basic_ib = 0		// If it's a basic scanner
+		var/fracture_dat = ""	// All the fractures
+		var/infection_dat = ""	// All the infections
+		var/ib_dat = ""			// All the IB
 		for(var/obj/item/organ/external/e in H.organs)
 			if(!e)
 				continue
-			for(var/datum/wound/W in e.wounds) if(W.internal)
-				if(advscan >= 1 && showadvscan == 1)
-					user.show_message(text("<span class='warning'>Internal bleeding detected in subject [e.name].</span>"), 1)
+			// Broken limbs
+			if(e.status & ORGAN_BROKEN)
+				if((e.name in list("l_arm", "r_arm", "l_leg", "r_leg")) && (!e.splinted))
+					fracture_dat += "<span class='warning'>Unsecured fracture in subject [e.name]. Splinting recommended for transport.</span><br>"
+				else if(advscan >= 1 && showadvscan == 1)
+					fracture_dat += "<span class='warning'>Bone fractures detected in subject [e.name].</span><br>"
 				else
-					user.show_message(text("<span class='warning'>Internal bleeding detected. Advanced scanner required for location.</span>"), 1)
-					break
-			break
+					basic_fracture = 1
+			// Infections
+			if(e.has_infected_wound())
+				dat += "<span class='warning'>Infected wound detected in subject [e.name]. Disinfection recommended.</span><br>"
+			// IB
+			for(var/datum/wound/W in e.wounds)
+				if(W.internal)
+					if(advscan >= 1 && showadvscan == 1)
+						ib_dat += "<span class='warning'>Internal bleeding detected in subject [e.name].</span><br>"
+					else
+						basic_ib = 1
+		if(basic_fracture)
+			fracture_dat += "<span class='warning'>Bone fractures detected. Advanced scanner required for location.</span><br>"
+		if(basic_ib)
+			ib_dat += "<span class='warning'>Internal bleeding detected. Advanced scanner required for location.</span><br>"
+		dat += fracture_dat
+		dat += infection_dat
+		dat += ib_dat

+		// Blood level
 		if(M:vessel)
 			var/blood_volume = H.vessel.get_reagent_amount("blood")
 			var/blood_percent =  round((blood_volume / H.species.blood_volume)*100)
 			var/blood_type = H.dna.b_type
-			if((blood_percent <= BLOOD_VOLUME_SAFE) && (blood_percent > BLOOD_VOLUME_BAD))
-				user.show_message("<span class='danger'>Warning: Blood Level LOW: [blood_percent]% [blood_volume]cl.</span> <span class='notice'>Type: [blood_type]</span>")
-			else if(blood_percent <= BLOOD_VOLUME_BAD)
-				user.show_message("<span class='danger'><i>Warning: Blood Level CRITICAL: [blood_percent]% [blood_volume]cl.</i></span> <span class='notice'>Type: [blood_type]</span>")
+			if(blood_percent <= BLOOD_VOLUME_BAD)
+				dat += "<span class='danger'><i>Warning: Blood Level CRITICAL: [blood_percent]% [blood_volume]cl. Type: [blood_type]</i></span><br>"
+			else if(blood_percent <= BLOOD_VOLUME_SAFE)
+				dat += "<span class='danger'>Warning: Blood Level LOW: [blood_percent]% [blood_volume]cl. Type: [blood_type]</span><br>"
 			else
-				user.show_message("<span class='notice'>Blood Level Normal: [blood_percent]% [blood_volume]cl. Type: [blood_type]</span>")
-		user.show_message("<span class='notice'>Subject's pulse: <font color='[H.pulse == PULSE_THREADY || H.pulse == PULSE_NONE ? "red" : "blue"]'>[H.get_pulse(GETPULSE_TOOL)] bpm.</font></span>")
-
+				dat += "<span class='notice'>Blood Level Normal: [blood_percent]% [blood_volume]cl. Type: [blood_type]</span><br>"
+		dat += "<span class='notice'>Subject's pulse: <font color='[H.pulse == PULSE_THREADY || H.pulse == PULSE_NONE ? "red" : "blue"]'>[H.get_pulse(GETPULSE_TOOL)] bpm.</font></span>"
+	user.show_message(dat, 1)

 /obj/item/device/healthanalyzer/verb/toggle_mode()
 	set name = "Switch Verbosity"
@@ -266,15 +272,15 @@ REAGENT SCANNER
 		if(0)
 			to_chat(usr, "The scanner will now perform a basic analysis.")

-/obj/item/device/healthanalyzer/advanced //reports bone fractures, IB, quantity of beneficial reagents in stomach; also regular health analyzer stuff
-	name = "advanced health analyzer"
+/obj/item/device/healthanalyzer/improved //reports bone fractures, IB, quantity of beneficial reagents in stomach; also regular health analyzer stuff
+	name = "improved health analyzer"
 	desc = "A miracle of medical technology, this handheld scanner can produce an accurate and specific report of a patient's biosigns."
 	advscan = 1
 	origin_tech = list(TECH_MAGNET = 5, TECH_BIO = 6)
 	icon_state = "health1"

-/obj/item/device/healthanalyzer/enhanced //reports all of the above, as well as radiation severity and minor brain damage
-	name = "enhanced health analyzer"
+/obj/item/device/healthanalyzer/advanced //reports all of the above, as well as radiation severity and minor brain damage
+	name = "advanced health analyzer"
 	desc = "An even more advanced handheld health scanner, complete with a full biosign monitor and on-board radiation and neurological analysis suites."
 	advscan = 2
 	origin_tech = list(TECH_MAGNET = 6, TECH_BIO = 7)
@@ -311,16 +317,21 @@ REAGENT SCANNER
 	return atmosanalyzer_scan(src, air, user)

 /obj/item/device/analyzer/attack_self(mob/user as mob)
-
 	if (user.stat)
 		return
-	if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
+	if (!(ishuman(user) || ticker) && ticker.mode.name != "monkey")
 		to_chat(usr, "<span class='warning'>You don't have the dexterity to do this!</span>")
 		return

 	analyze_gases(src, user)
 	return

+/obj/item/device/analyzer/afterattack(var/obj/O, var/mob/user, var/proximity)
+	if(proximity)
+		analyze_gases(O, user)
+	return
+
+
 /obj/item/device/mass_spectrometer
 	name = "mass spectrometer"
 	desc = "A hand-held mass spectrometer which identifies trace chemicals in a blood sample."
@@ -353,7 +364,7 @@ REAGENT SCANNER
 /obj/item/device/mass_spectrometer/attack_self(mob/user as mob)
 	if (user.stat)
 		return
-	if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
+	if (!(ishuman(user) || ticker) && ticker.mode.name != "monkey")
 		to_chat(user, "<span class='warning'>You don't have the dexterity to do this!</span>")
 		return
 	if(reagents.total_volume)
@@ -400,15 +411,11 @@ REAGENT SCANNER
 	var/recent_fail = 0

 /obj/item/device/reagent_scanner/afterattack(obj/O, mob/user as mob, proximity)
-	if(!proximity)
-		return
-	if (user.stat)
+	if(!proximity || user.stat || !istype(O))
 		return
 	if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
 		to_chat(user, "<span class='warning'>You don't have the dexterity to do this!</span>")
 		return
-	if(!istype(O))
-		return

 	if(!isnull(O.reagents))
 		var/dat = ""
@@ -419,9 +426,9 @@ REAGENT SCANNER
 		if(dat)
 			to_chat(user, "<span class='notice'>Chemicals found: [dat]</span>")
 		else
-			user << "<span class='notice'>No active chemical agents found in [O].</span>"
+			to_chat(user, "<span class='notice'>No active chemical agents found in [O].</span>")
 	else
-		user << "<span class='notice'>No significant chemical agents found in [O].</span>"
+		to_chat(user, "<span class='notice'>No significant chemical agents found in [O].</span>")

 	return

@@ -445,24 +452,17 @@ REAGENT SCANNER

 /obj/item/device/slime_scanner/attack(mob/living/M as mob, mob/living/user as mob)
 	if(!isslime(M))
-		user << "<B>This device can only scan slimes!</B>"
+		to_chat(user, "<B>This device can only scan slimes!</B>")
 		return
 	var/mob/living/simple_animal/slime/S = M
-	user.show_message("Slime scan results:")
-	user.show_message(text("[S.slime_color] [] slime", S.is_adult ? "adult" : "baby"))
-
-	user.show_message("Health: [S.health]")
-	user.show_message("Mutation Probability: [S.mutation_chance]")
+	user.show_message("Slime scan results:<br>[S.slime_color] [S.is_adult ? "adult" : "baby"] slime<br>Health: [S.health]<br>Mutation Probability: [S.mutation_chance]")

 	var/list/mutations = list()
 	for(var/potential_color in S.slime_mutation)
 		var/mob/living/simple_animal/slime/slime = potential_color
 		mutations.Add(initial(slime.slime_color))
+	user.show_message("Potental to mutate into [english_list(mutations)] colors.<br>Extract potential: [S.cores]<br>Nutrition: [S.nutrition]/[S.get_max_nutrition()]")

-	user.show_message("Potental to mutate into [english_list(mutations)] colors.")
-	user.show_message("Extract potential: [S.cores]")
-
-	user.show_message(text("Nutrition: [S.nutrition]/[]", S.get_max_nutrition()))
 	if (S.nutrition < S.get_starve_nutrition())
 		user.show_message("<span class='alert'>Warning: Subject is starving!</span>")
 	else if (S.nutrition < S.get_hunger_nutrition())
@@ -479,3 +479,25 @@ REAGENT SCANNER
 		user.show_message("Subject is friendly to other slime colors.")

 	user.show_message("Growth progress: [S.amount_grown]/10")
+
+/obj/item/device/halogen_counter
+	name = "halogen counter"
+	icon_state = "eftpos"
+	desc = "A hand-held halogen counter, used to detect the level of irradiation of living beings."
+	w_class = ITEMSIZE_SMALL
+	flags = CONDUCT
+	origin_tech = list(TECH_MAGNET = 1, TECH_BIO = 2)
+	throwforce = 0
+	throw_speed = 3
+	throw_range = 7
+
+/obj/item/device/halogen_counter/attack(mob/living/M as mob, mob/living/user as mob)
+	if(!iscarbon(M))
+		to_chat(user, "<span class='warning'>This device can only scan organic beings!</span>")
+		return
+	user.visible_message("<span class='warning'>\The [user] has analyzed [M]'s radiation levels!</span>", "<span class='notice'>Analyzing Results for [M]:</span>")
+	if(M.radiation)
+		to_chat(user, "<span class='notice'>Radiation Level: [M.radiation]</span>")
+	else
+		to_chat(user, "<span class='notice'>No radiation detected.</span>")
+	return
--- a/code/game/objects/items/devices/spy_bug.dm
+++ b/code/game/objects/items/devices/spy_bug.dm
@@ -16,11 +16,12 @@

 //	var/obj/item/device/radio/bug/radio
 	var/obj/machinery/camera/bug/camera
+	var/camtype = /obj/machinery/camera/bug

 /obj/item/device/camerabug/New()
 	..()
 //	radio = new(src)
-	camera = new(src)
+	camera = new camtype(src)

 /obj/item/device/camerabug/attack_self(mob/user)
 	if(user.a_intent == I_HURT)
@@ -40,7 +41,7 @@
 		linkedmonitor.unpair(src)
 	linkedmonitor = null
 	qdel(camera)
-	camera = new(src)
+	camera = new camtype(src)
 	to_chat(usr, "<span class='notice'>You turn the [src] off and on again, delinking it from any monitors.")

 /obj/item/brokenbug
@@ -83,6 +84,7 @@
 	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_EARS
 	origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1, TECH_ILLEGAL = 3)
+	camtype = /obj/machinery/camera/bug/spy

 /obj/item/device/camerabug/examine(mob/user)
 	. = ..(user, 0)
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -136,7 +136,7 @@
 	return 1

 /obj/item/borg/upgrade/jetpack
-	name = "mining robot jetpack"
+	name = "robot jetpack"
 	desc = "A carbon dioxide jetpack suitable for low-gravity operations."
 	icon_state = "cyborg_upgrade3"
 	item_state = "cyborg_upgrade"
@@ -151,7 +151,7 @@
 	if(!T)
 		T = locate() in R.module.modules
 	if(!T)
-		R.module.modules += new/obj/item/weapon/tank/jetpack/carbondioxide
+		R.module.modules += new/obj/item/weapon/tank/jetpack/carbondioxide(R.module)
 		for(var/obj/item/weapon/tank/jetpack/carbondioxide in R.module.modules)
 			R.internals = src
 		return 1
@@ -176,7 +176,7 @@
 	if(!T)
 		T = locate() in R.module.modules
 	if(!T)
-		R.module.modules += new/obj/item/device/healthanalyzer/advanced
+		R.module.modules += new/obj/item/device/healthanalyzer/advanced(R.module)
 		return 1
 	if(T)
 		to_chat(R, "Upgrade mounting error!  No suitable hardpoint detected!")
@@ -217,4 +217,4 @@
 	R.add_language(LANGUAGE_SCHECHI, 1)
 	R.add_language(LANGUAGE_ROOTLOCAL, 1)

-	return 1
+	return 1
--- a/code/game/objects/items/stacks/rods.dm
+++ b/code/game/objects/items/stacks/rods.dm
@@ -61,8 +61,7 @@ var/global/list/datum/stack_recipe/rods_recipes = list( \
 		return

 	if (istype(W, /obj/item/weapon/tape_roll))
-		var/obj/item/stack/medical/splint/ghetto/new_splint = new(user.loc)
-		new_splint.loc = src.loc
+		var/obj/item/stack/medical/splint/ghetto/new_splint = new(get_turf(user))
 		new_splint.add_fingerprint(user)

 		user.visible_message("<span class='notice'>\The [user] constructs \a [new_splint] out of a [singular_name].</span>", \
--- a/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm
+++ b/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm
@@ -8,13 +8,17 @@
 	name = "stack of wood"
 	type_to_spawn = /obj/item/stack/tile/wood

+/obj/fiftyspawner/wood/sif
+	name = "stack of alien wood"
+	type_to_spawn = /obj/item/stack/tile/sifwood
+
 /obj/fiftyspawner/carpet
 	name = "stack of carpet"
 	type_to_spawn = /obj/item/stack/tile/carpet

-/obj/fiftyspawner/bluecarpet
-	name = "stack of blue carpet"
-	type_to_spawn = /obj/item/stack/tile/carpet/blue
+/obj/fiftyspawner/tealcarpet
+	name = "stack of teal carpet"
+	type_to_spawn = /obj/item/stack/tile/carpet/teal

 /obj/fiftyspawner/floor
 	name = "stack of floor tiles"
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -55,9 +55,24 @@
 	flags = 0
 	no_variants = FALSE

+/obj/item/stack/tile/sifwood
+	name = "alien wood tile"
+	singular_name = "alien wood tile"
+	desc = "An easy to fit wooden floor tile. It's blue!"
+	icon_state = "tile-sifwood"
+	force = 1.0
+	throwforce = 1.0
+	throw_speed = 5
+	throw_range = 20
+	flags = 0
+	no_variants = FALSE
+
 /obj/item/stack/tile/wood/fifty
 	amount = 50

+/obj/item/stack/tile/sifwood/fifty
+	amount = 50
+
 /obj/item/stack/tile/wood/cyborg
 	name = "wood floor tile synthesizer"
 	desc = "A device that makes wood floor tiles."
@@ -81,11 +96,11 @@
 	flags = 0
 	no_variants = FALSE

-/obj/item/stack/tile/carpet/blue
-	name = "blue carpet"
-	singular_name = "blue carpet"
-	desc = "A piece of blue carpet. It is the same size as a normal floor tile!"
-	icon_state = "tile-bluecarpet"
+/obj/item/stack/tile/carpet/teal
+	name = "teal carpet"
+	singular_name = "teal carpet"
+	desc = "A piece of teal carpet. It is the same size as a normal floor tile!"
+	icon_state = "tile-tealcarpet"
 	no_variants = FALSE

 /obj/item/stack/tile/carpet/bcarpet
@@ -106,7 +121,7 @@
 /obj/item/stack/tile/floor
 	name = "floor tile"
 	singular_name = "floor tile"
-	desc = "Those could work as a pretty decent throwing weapon" //why?
+	desc = "A metal tile fit for covering a section of floor."
 	icon_state = "tile"
 	force = 6.0
 	matter = list(DEFAULT_WALL_MATERIAL = SHEET_MATERIAL_AMOUNT / 4)
--- a/code/game/objects/items/weapons/grenades/flashbang.dm
+++ b/code/game/objects/items/weapons/grenades/flashbang.dm
@@ -5,92 +5,89 @@
 	origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 1)
 	var/banglet = 0

-	prime()
-		..()
-		for(var/obj/structure/closet/L in hear(7, get_turf(src)))
-			if(locate(/mob/living/carbon/, L))
-				for(var/mob/living/carbon/M in L)
-					bang(get_turf(src), M)
+/obj/item/weapon/grenade/flashbang/prime()
+	..()
+	for(var/obj/structure/closet/L in hear(7, get_turf(src)))
+		if(locate(/mob/living/carbon/, L))
+			for(var/mob/living/carbon/M in L)
+				bang(get_turf(src), M)

+	for(var/mob/living/carbon/M in hear(7, get_turf(src)))
+		bang(get_turf(src), M)

-		for(var/mob/living/carbon/M in hear(7, get_turf(src)))
-			bang(get_turf(src), M)
+	for(var/obj/structure/blob/B in hear(8,get_turf(src)))       		//Blob damage here
+		var/damage = round(30/(get_dist(B,get_turf(src))+1))
+		if(B.overmind)
+			damage *= B.overmind.blob_type.burn_multiplier
+		B.adjust_integrity(-damage)

-		for(var/obj/structure/blob/B in hear(8,get_turf(src)))       		//Blob damage here
-			var/damage = round(30/(get_dist(B,get_turf(src))+1))
-			if(B.overmind)
-				damage *= B.overmind.blob_type.burn_multiplier
-			B.adjust_integrity(-damage)
+	new/obj/effect/effect/sparks(src.loc)
+	new/obj/effect/effect/smoke/illumination(src.loc, 5, range=30, power=30, color="#FFFFFF")
+	qdel(src)
+	return

-		new/obj/effect/effect/sparks(src.loc)
-		new/obj/effect/effect/smoke/illumination(src.loc, 5, range=30, power=30, color="#FFFFFF")
-		qdel(src)
-		return
-
-	proc/bang(var/turf/T , var/mob/living/carbon/M)					// Added a new proc called 'bang' that takes a location and a person to be banged.
-		M << "<span class='danger'>BANG</span>"						// Called during the loop that bangs people in lockers/containers and when banging
-		playsound(src.loc, 'sound/effects/bang.ogg', 50, 1, 30)		// people in normal view.  Could theroetically be called during other explosions.
+/obj/item/weapon/grenade/flashbang/proc/bang(var/turf/T , var/mob/living/carbon/M)					// Added a new proc called 'bang' that takes a location and a person to be banged.
+	to_chat(M, "<span class='danger'>BANG</span>")						// Called during the loop that bangs people in lockers/containers and when banging
+	playsound(src.loc, 'sound/effects/bang.ogg', 50, 1, 30)		// people in normal view.  Could theroetically be called during other explosions.
 																	// -- Polymorph

-//Checking for protections
-		var/eye_safety = 0
-		var/ear_safety = 0
-		if(iscarbon(M))
-			eye_safety = M.eyecheck()
-			ear_safety = M.get_ear_protection()
+	//Checking for protections
+	var/eye_safety = 0
+	var/ear_safety = 0
+	if(iscarbon(M))
+		eye_safety = M.eyecheck()
+		ear_safety = M.get_ear_protection()

-//Flashing everyone
-		if(eye_safety < 1)
-			M.flash_eyes()
-			M.Stun(2)
-			M.Weaken(10)
+	//Flashing everyone
+	if(eye_safety < 1)
+		M.flash_eyes()
+		M.Confuse(2)
+		M.Weaken(5)

-
-
-//Now applying sound
-		if((get_dist(M, T) <= 2 || src.loc == M.loc || src.loc == M))
-			if(ear_safety > 0)
-				M.Stun(2)
-				M.Weaken(1)
-			else
-				M.Stun(10)
-				M.Weaken(3)
-				if ((prob(14) || (M == src.loc && prob(70))))
-					M.ear_damage += rand(1, 10)
-				else
-					M.ear_damage += rand(0, 5)
-					M.ear_deaf = max(M.ear_deaf,15)
-
-		else if(get_dist(M, T) <= 5)
-			if(!ear_safety)
-				M.Stun(8)
-				M.ear_damage += rand(0, 3)
-				M.ear_deaf = max(M.ear_deaf,10)
-
-		else if(!ear_safety)
-			M.Stun(4)
-			M.ear_damage += rand(0, 1)
-			M.ear_deaf = max(M.ear_deaf,5)
-
-//This really should be in mob not every check
-		if(ishuman(M))
-			var/mob/living/carbon/human/H = M
-			var/obj/item/organ/internal/eyes/E = H.internal_organs_by_name[O_EYES]
-			if (E && E.damage >= E.min_bruised_damage)
-				M << "<span class='danger'>Your eyes start to burn badly!</span>"
-				if(!banglet && !(istype(src , /obj/item/weapon/grenade/flashbang/clusterbang)))
-					if (E.damage >= E.min_broken_damage)
-						M << "<span class='danger'>You can't see anything!</span>"
-		if (M.ear_damage >= 15)
-			M << "<span class='danger'>Your ears start to ring badly!</span>"
-			if(!banglet && !(istype(src , /obj/item/weapon/grenade/flashbang/clusterbang)))
-				if (prob(M.ear_damage - 10 + 5))
-					M << "<span class='danger'>You can't hear anything!</span>"
-					M.sdisabilities |= DEAF
+	//Now applying sound
+	if((get_dist(M, T) <= 2 || src.loc == M.loc || src.loc == M))
+		if(ear_safety > 0)
+			M.Confuse(2)
+			M.Weaken(1)
 		else
-			if (M.ear_damage >= 5)
-				M << "<span class='danger'>Your ears start to ring!</span>"
-		M.update_icons() //Forces matrix transform to proc if they are now laying, I guess?
+			M.Confuse(10)
+			M.Weaken(3)
+			if ((prob(14) || (M == src.loc && prob(70))))
+				M.ear_damage += rand(1, 10)
+			else
+				M.ear_damage += rand(0, 5)
+				M.ear_deaf = max(M.ear_deaf,15)
+
+	else if(get_dist(M, T) <= 5)
+		if(!ear_safety)
+			M.Confuse(8)
+			M.ear_damage += rand(0, 3)
+			M.ear_deaf = max(M.ear_deaf,10)
+
+	else if(!ear_safety)
+		M.Confuse(4)
+		M.ear_damage += rand(0, 1)
+		M.ear_deaf = max(M.ear_deaf,5)
+
+	//This really should be in mob not every check
+	if(ishuman(M))
+		var/mob/living/carbon/human/H = M
+		var/obj/item/organ/internal/eyes/E = H.internal_organs_by_name[O_EYES]
+		if (E && E.damage >= E.min_bruised_damage)
+			M << "<span class='danger'>Your eyes start to burn badly!</span>"
+			if(!banglet && !(istype(src , /obj/item/weapon/grenade/flashbang/clusterbang)))
+				if (E.damage >= E.min_broken_damage)
+					M << "<span class='danger'>You can't see anything!</span>"
+	if (M.ear_damage >= 15)
+		to_chat(M, "<span class='danger'>Your ears start to ring badly!</span>")
+		if(!banglet && !(istype(src , /obj/item/weapon/grenade/flashbang/clusterbang)))
+			if (prob(M.ear_damage - 10 + 5))
+				to_chat(M, "<span class='danger'>You can't hear anything!</span>")
+				M.sdisabilities |= DEAF
+	else if(M.ear_damage >= 5)
+		to_chat(M, "<span class='danger'>Your ears start to ring!</span>")
+
+	M.update_icons() //Forces matrix transform to proc if they are now laying, I guess?

 /obj/item/weapon/grenade/flashbang/Destroy()
 	walk(src, 0) // Because we might have called walk_away, we must stop the walk loop or BYOND keeps an internal reference to us forever.
--- a/code/game/objects/items/weapons/melee/misc.dm
+++ b/code/game/objects/items/weapons/melee/misc.dm
@@ -14,3 +14,34 @@
 		var/datum/gender/T = gender_datums[user.get_visible_gender()]
 		user.visible_message(span("danger", "\The [user] [T.is] strangling [T.himself] with \the [src]! It looks like [T.he] [T.is] trying to commit suicide."), span("danger", "You start to strangle yourself with \the [src]!"), span("danger", "You hear the sound of someone choking!"))
 		return (OXYLOSS)
+
+/obj/item/weapon/melee/umbrella
+	name = "umbrella"
+	desc = "To keep the rain off you. Use with caution on windy days."
+	icon = 'icons/obj/items.dmi'
+	icon_state = "umbrella_closed"
+	flags = CONDUCT
+	slot_flags = SLOT_BELT
+	force = 5
+	throwforce = 5
+	w_class = ITEMSIZE_NORMAL
+	var/open = FALSE
+
+/obj/item/weapon/melee/umbrella/New()
+	..()
+	color = "#"+get_random_colour()
+	update_icon()
+
+/obj/item/weapon/melee/umbrella/attack_self()
+	src.toggle_umbrella()
+
+/obj/item/weapon/melee/umbrella/proc/toggle_umbrella()
+	open = !open
+	icon_state = "umbrella_[open ? "open" : "closed"]"
+	item_state = icon_state
+	update_icon()
+	if(ishuman(src.loc))
+		var/mob/living/carbon/human/H = src.loc
+		H.update_inv_l_hand(0)
+		H.update_inv_r_hand()
+	..()
--- a/code/game/objects/items/weapons/storage/bags.dm
+++ b/code/game/objects/items/weapons/storage/bags.dm
@@ -68,6 +68,9 @@
 // -----------------------------
 //        Mining Satchel
 // -----------------------------
+/*
+ * Mechoid - Orebags are the most common quick-gathering thing, and also have tons of lag associated with it. Their checks are going to be hyper-simplified due to this, and their INCREDIBLY singular target contents.
+ */

 /obj/item/weapon/storage/bag/ore
 	name = "mining satchel"
@@ -79,7 +82,80 @@
 	max_storage_space = ITEMSIZE_COST_NORMAL * 25
 	max_w_class = ITEMSIZE_NORMAL
 	can_hold = list(/obj/item/weapon/ore)
+	var/stored_ore = list()
+	var/last_update = 0

+/obj/item/weapon/storage/bag/ore/remove_from_storage(obj/item/W as obj, atom/new_location)
+	if(!istype(W)) return 0
+
+	if(new_location)
+		if(ismob(loc))
+			W.dropped(usr)
+		if(ismob(new_location))
+			W.hud_layerise()
+		else
+			W.reset_plane_and_layer()
+		W.forceMove(new_location)
+	else
+		W.forceMove(get_turf(src))
+
+	W.on_exit_storage(src)
+	update_icon()
+	return 1
+
+/obj/item/weapon/storage/bag/ore/gather_all(turf/T as turf, mob/user as mob, var/silent = 0)
+	var/success = 0
+	var/failure = 0
+	for(var/obj/item/weapon/ore/I in T) //Only ever grabs ores. Doesn't do any extraneous checks, as all ore is the same size. Tons of checks means it causes hanging for up to three seconds.
+		if(contents.len >= max_storage_space)
+			failure = 1
+			break
+		I.forceMove(src)
+		success = 1
+	if(success && !failure && !silent)
+		to_chat(user, "<span class='notice'>You put everything in [src].</span>")
+	else if(success && (!silent || (silent && contents.len >= max_storage_space)))
+		to_chat(user, "<span class='notice'>You fill the [src].</span>")
+	else if(!silent)
+		to_chat(user, "<span class='notice'>You fail to pick anything up with \the [src].</span>")
+
+/obj/item/weapon/storage/bag/ore/examine(mob/user)
+	..()
+
+	if(!Adjacent(user)) //Can only check the contents of ore bags if you can physically reach them.
+		return
+
+	if(istype(user, /mob/living))
+		add_fingerprint(user)
+
+	if(!contents.len)
+		to_chat(user, "It is empty.")
+		return
+
+	if(world.time > last_update + 10)
+		update_ore_count()
+		last_update = world.time
+
+	to_chat(user, "<span class='notice'>It holds:</span>")
+	for(var/ore in stored_ore)
+		to_chat(user, "<span class='notice'>- [stored_ore[ore]] [ore]</span>")
+	return
+
+/obj/item/weapon/storage/bag/ore/open(mob/user as mob) //No opening it for the weird UI of having shit-tons of ore inside it.
+	if(world.time > last_update + 10)
+		update_ore_count()
+		last_update = world.time
+		examine(user)
+
+/obj/item/weapon/storage/bag/ore/proc/update_ore_count() //Stolen from ore boxes.
+
+	stored_ore = list()
+
+	for(var/obj/item/weapon/ore/O in contents)
+		if(stored_ore[O.name])
+			stored_ore[O.name]++
+		else
+			stored_ore[O.name] = 1

 // -----------------------------
 //          Plant bag
--- a/code/game/objects/items/weapons/storage/firstaid.dm
+++ b/code/game/objects/items/weapons/storage/firstaid.dm
@@ -132,7 +132,7 @@
 		/obj/item/weapon/surgical/FixOVein,
 		/obj/item/stack/medical/advanced/bruise_pack,
 		/obj/item/stack/nanopaste
-		///obj/item/device/healthanalyzer/enhanced //VOREStation Removal
+		// /obj/item/device/healthanalyzer/advanced //VOREStation Removal
 		)

 	starts_with = list(
@@ -145,8 +145,8 @@
 		/obj/item/weapon/surgical/surgicaldrill,
 		/obj/item/weapon/surgical/bonegel,
 		/obj/item/weapon/surgical/FixOVein,
-		/obj/item/stack/medical/advanced/bruise_pack
-		///obj/item/device/healthanalyzer/enhanced //VOREStation Removal
+		/obj/item/stack/medical/advanced/bruise_pack,
+		///obj/item/device/healthanalyzer/advanced //VOREStation Removal
 		)

 /obj/item/weapon/storage/firstaid/clotting
--- a/code/game/objects/items/weapons/syndie.dm
+++ b/code/game/objects/items/weapons/syndie.dm
@@ -13,20 +13,29 @@
 	desc = "A small wrapped package."
 	w_class = ITEMSIZE_NORMAL

-	var/power = 1  /*Size of the explosion.*/
+	var/devastate = 0
+	var/heavy_impact = 1
+	var/light_impact = 2
+	var/flash_range = 5
 	var/size = "small"  /*Used for the icon, this one will make c-4small_0 for the off state.*/

 /obj/item/weapon/syndie/c4explosive/heavy
 	icon_state = "c-4large_0"
 	item_state = "radio"
 	desc = "A mysterious package, it's quite heavy."
-	power = 2
+	devastate = 1
+	heavy_impact = 2
+	light_impact = 5
+	flash_range = 7
 	size = "large"

 /obj/item/weapon/syndie/c4explosive/heavy/super_heavy
 	name = "large-sized package"
 	desc = "A mysterious package, it's quite exceptionally heavy."
-	power = 3
+	devastate = 2
+	heavy_impact = 5
+	light_impact = 7
+	flash_range = 7

 /obj/item/weapon/syndie/c4explosive/New()
 	var/K = rand(1,2000)
@@ -43,7 +52,7 @@
 	for(var/mob/O in hearers(src, null))
 		O.show_message("\icon[src] <span class = 'warning'> The [src.name] beeps! </span>")
 	sleep(50)
-	explosion(get_turf(src), power, power*2, power*3, power*4, power*5)
+	explosion(get_turf(src), devastate, heavy_impact, light_impact, flash_range)
 	for(var/dirn in cardinal)		//This is to guarantee that C4 at least breaks down all immediately adjacent walls and doors.
 		var/turf/simulated/wall/T = get_step(src,dirn)
 		if(locate(/obj/machinery/door/airlock) in T)
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -14,6 +14,8 @@
 	var/show_messages
 	var/preserve_item = 0 //whether this object is preserved when its owner goes into cryo-storage, gateway, etc

+	var/show_examine = TRUE	// Does this pop up on a mob when the mob is examined?
+
 /obj/Destroy()
 	processing_objects -= src
 	return ..()
--- a/code/game/objects/random/random.dm
+++ b/code/game/objects/random/random.dm
@@ -912,6 +912,21 @@ something, make sure it's not in one of the other lists.*/
 				prob(25);/obj/item/device/radio/headset/headset_com/alt,
 				prob(25);/obj/item/device/radio/headset)

+/obj/random/coin
+	name = "random coin"
+	desc = "This is a coin spawn."
+	icon = 'icons/misc/mark.dmi'
+	icon_state = "rup"
+
+/obj/random/coin/item_to_spawn()
+	return pick(prob(5);/obj/item/weapon/coin/silver,
+				prob(3);/obj/item/weapon/coin/iron,
+				prob(4);/obj/item/weapon/coin/gold,
+				prob(3);/obj/item/weapon/coin/phoron,
+				prob(1);/obj/item/weapon/coin/uranium,
+				prob(2);/obj/item/weapon/coin/platinum,
+				prob(1);/obj/item/weapon/coin/diamond)
+
 /obj/random/rigsuit
 	name = "Random rigsuit"
 	desc = "This is a random rigsuit."
@@ -926,6 +941,20 @@ something, make sure it's not in one of the other lists.*/
 				prob(3);/obj/item/weapon/rig/hazard,
 				prob(1);/obj/item/weapon/rig/merc/empty)

+/obj/random/landmine
+	name = "Random Land Mine"
+	desc = "This is a random land mine."
+	icon = 'icons/obj/weapons.dmi'
+	icon_state = "uglymine"
+	spawn_nothing_percentage = 25
+
+/obj/random/landmine/item_to_spawn()
+	return pick(prob(30);/obj/effect/mine,
+				prob(25);/obj/effect/mine/frag,
+				prob(25);/obj/effect/mine/emp,
+				prob(10);/obj/effect/mine/stun,
+				prob(10);/obj/effect/mine/incendiary,)
+
 var/list/random_junk_
 var/list/random_useful_
 /proc/get_random_useful_type()
@@ -1133,16 +1162,423 @@ var/list/multi_point_spawns
 			)
 		)

-/obj/random/landmine
-	name = "Random Land Mine"
-	desc = "This is a random land mine."
-	icon = 'icons/obj/weapons.dmi'
-	icon_state = "uglymine"
-	spawn_nothing_percentage = 25
+/obj/random/multiple/minevault
+	name = "random vault loot"
+	desc = "Loot for mine vaults."
+	icon = 'icons/misc/mark.dmi'
+	icon_state = "rup"

-/obj/random/landmine/item_to_spawn()
-	return pick(prob(30);/obj/effect/mine,
-				prob(25);/obj/effect/mine/frag,
-				prob(25);/obj/effect/mine/emp,
-				prob(10);/obj/effect/mine/stun,
-				prob(10);/obj/effect/mine/incendiary,)
+/obj/random/multiple/minevault/item_to_spawn()
+	return pick(
+			prob(5);list(
+				/obj/item/clothing/mask/smokable/pipe,
+				/obj/item/weapon/reagent_containers/food/drinks/bottle/rum,
+				/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey,
+				/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus,
+				/obj/item/weapon/flame/lighter/zippo,
+				/obj/structure/closet/crate/hydroponics
+			),
+			prob(5);list(
+				/obj/item/weapon/pickaxe/drill,
+				/obj/item/clothing/suit/space/void/mining,
+				/obj/item/clothing/head/helmet/space/void/mining,
+				/obj/structure/closet/crate/engineering
+			),
+			prob(5);list(
+				/obj/item/weapon/pickaxe/drill,
+				/obj/item/clothing/suit/space/void/mining/alt,
+				/obj/item/clothing/head/helmet/space/void/mining/alt,
+				/obj/structure/closet/crate/engineering
+			),
+			prob(5);list(
+				/obj/item/weapon/reagent_containers/glass/beaker/bluespace,
+				/obj/item/weapon/reagent_containers/glass/beaker/bluespace,
+				/obj/item/weapon/reagent_containers/glass/beaker/bluespace,
+				/obj/structure/closet/crate/science
+			),
+			prob(5);list(
+				/obj/item/weapon/ore/diamond,
+				/obj/item/weapon/ore/diamond,
+				/obj/item/weapon/ore/diamond,
+				/obj/item/weapon/ore/diamond,
+				/obj/item/weapon/ore/diamond,
+				/obj/item/weapon/ore/diamond,
+				/obj/item/weapon/ore/diamond,
+				/obj/item/weapon/ore/diamond,
+				/obj/item/weapon/ore/diamond,
+				/obj/item/weapon/ore/diamond,
+				/obj/item/weapon/ore/gold,
+				/obj/item/weapon/ore/gold,
+				/obj/item/weapon/ore/gold,
+				/obj/item/weapon/ore/gold,
+				/obj/item/weapon/ore/gold,
+				/obj/item/weapon/ore/gold,
+				/obj/item/weapon/ore/gold,
+				/obj/item/weapon/ore/gold,
+				/obj/item/weapon/ore/gold,
+				/obj/item/weapon/ore/gold,
+				/obj/structure/closet/crate/engineering
+			),
+			prob(5);list(
+				/obj/item/weapon/pickaxe/drill,
+				/obj/item/clothing/glasses/material,
+				/obj/structure/ore_box,
+				/obj/structure/closet/crate
+			),
+			prob(5);list(
+				/obj/item/weapon/reagent_containers/glass/beaker/noreact,
+				/obj/item/weapon/reagent_containers/glass/beaker/noreact,
+				/obj/item/weapon/reagent_containers/glass/beaker/noreact,
+				/obj/structure/closet/crate/science
+			),
+			prob(5);list(
+				/obj/item/weapon/storage/secure/briefcase/money,
+				/obj/structure/closet/crate/freezer/rations
+			),
+			prob(5);list(
+				/obj/item/clothing/accessory/tie/horrible,
+				/obj/item/clothing/accessory/tie/horrible,
+				/obj/item/clothing/accessory/tie/horrible,
+				/obj/item/clothing/accessory/tie/horrible,
+				/obj/item/clothing/accessory/tie/horrible,
+				/obj/item/clothing/accessory/tie/horrible,
+				/obj/structure/closet/crate
+			),
+			prob(5);list(
+				/obj/item/weapon/melee/baton,
+				/obj/item/weapon/melee/baton,
+				/obj/item/weapon/melee/baton,
+				/obj/item/weapon/melee/baton,
+				/obj/structure/closet/crate
+			),
+			prob(5);list(
+				/obj/item/clothing/under/shorts/red,
+				/obj/item/clothing/under/shorts/blue,
+				/obj/structure/closet/crate
+			),
+			prob(2);list(
+				/obj/item/weapon/melee/baton/cattleprod,
+				/obj/item/weapon/melee/baton/cattleprod,
+				/obj/item/weapon/cell/high,
+				/obj/item/weapon/cell/high,
+				/obj/structure/closet/crate
+			),
+			prob(2);list(
+				/obj/item/latexballon,
+				/obj/item/latexballon,
+				/obj/structure/closet/crate
+			),
+			prob(2);list(
+				/obj/item/toy/syndicateballoon,
+				/obj/item/toy/syndicateballoon,
+				/obj/structure/closet/crate
+			),
+			prob(2);list(
+				/obj/item/weapon/rig/industrial/equipped,
+				/obj/item/weapon/storage/bag/ore,
+				/obj/structure/closet/crate/engineering
+			),
+			prob(2);list(
+				/obj/item/clothing/head/kitty,
+				/obj/item/clothing/head/kitty,
+				/obj/item/clothing/head/kitty,
+				/obj/item/clothing/head/kitty,
+				/obj/structure/closet/crate
+			),
+			prob(2);list(
+				/obj/random/coin,
+				/obj/random/coin,
+				/obj/random/coin,
+				/obj/random/coin,
+				/obj/random/coin,
+				/obj/structure/closet/crate/plastic
+			),
+			prob(2);list(
+				/obj/random/multiple/voidsuit,
+				/obj/random/multiple/voidsuit,
+				/obj/structure/closet/crate/engineering
+			),
+			prob(2);list(
+				/obj/item/clothing/suit/space/syndicate/black/red,
+				/obj/item/clothing/head/helmet/space/syndicate/black/red,
+				/obj/item/clothing/suit/space/syndicate/black/red,
+				/obj/item/clothing/head/helmet/space/syndicate/black/red,
+				/obj/item/weapon/gun/projectile/automatic/mini_uzi,
+				/obj/item/weapon/gun/projectile/automatic/mini_uzi,
+				/obj/item/ammo_magazine/m45uzi,
+				/obj/item/ammo_magazine/m45uzi,
+				/obj/item/ammo_magazine/m45uzi/empty,
+				/obj/item/ammo_magazine/m45uzi/empty,
+				/obj/structure/closet/crate/plastic
+			),
+			prob(2);list(
+				/obj/item/clothing/suit/ianshirt,
+				/obj/item/clothing/suit/ianshirt,
+				/obj/item/weapon/bedsheet/ian,
+				/obj/structure/closet/crate/plastic
+			),
+			prob(2);list(
+				/obj/item/clothing/suit/armor/vest,
+				/obj/item/clothing/suit/armor/vest,
+				/obj/item/weapon/gun/projectile/garand,
+				/obj/item/weapon/gun/projectile/garand,
+				/obj/item/ammo_magazine/m762garand,
+				/obj/item/ammo_magazine/m762garand,
+				/obj/structure/closet/crate/plastic
+			),
+			prob(2);list(
+				/obj/mecha/working/ripley/mining
+			),
+			prob(2);list(
+				/obj/mecha/working/hoverpod/combatpod
+			),
+			prob(2);list(
+				/obj/item/weapon/pickaxe/silver,
+				/obj/item/weapon/storage/bag/ore,
+				/obj/item/clothing/glasses/material,
+				/obj/structure/closet/crate/engineering
+			),
+			prob(2);list(
+				/obj/item/weapon/pickaxe/drill,
+				/obj/item/weapon/storage/bag/ore,
+				/obj/item/clothing/glasses/material,
+				/obj/structure/closet/crate/engineering
+			),
+			prob(2);list(
+				/obj/item/weapon/pickaxe/jackhammer,
+				/obj/item/weapon/storage/bag/ore,
+				/obj/item/clothing/glasses/material,
+				/obj/structure/closet/crate/engineering
+			),
+			prob(2);list(
+				/obj/item/weapon/pickaxe/diamond,
+				/obj/item/weapon/storage/bag/ore,
+				/obj/item/clothing/glasses/material,
+				/obj/structure/closet/crate/engineering
+			),
+			prob(2);list(
+				/obj/item/weapon/pickaxe/diamonddrill,
+				/obj/item/weapon/storage/bag/ore,
+				/obj/item/clothing/glasses/material,
+				/obj/structure/closet/crate/engineering
+			),
+			prob(2);list(
+				/obj/item/weapon/pickaxe/gold,
+				/obj/item/weapon/storage/bag/ore,
+				/obj/item/clothing/glasses/material,
+				/obj/structure/closet/crate/engineering
+			),
+			prob(2);list(
+				/obj/item/weapon/pickaxe/plasmacutter,
+				/obj/item/weapon/storage/bag/ore,
+				/obj/item/clothing/glasses/material,
+				/obj/structure/closet/crate/engineering
+			),
+			prob(2);list(
+				/obj/item/weapon/material/sword/katana,
+				/obj/item/weapon/material/sword/katana,
+				/obj/structure/closet/crate
+			),
+			prob(2);list(
+				/obj/item/weapon/material/sword,
+				/obj/item/weapon/material/sword,
+				/obj/structure/closet/crate
+			),
+			prob(1);list(
+				/obj/item/clothing/mask/balaclava,
+				/obj/item/weapon/material/star,
+				/obj/item/weapon/material/star,
+				/obj/item/weapon/material/star,
+				/obj/item/weapon/material/star,
+				/obj/structure/closet/crate
+			),
+			prob(1);list(
+				/obj/item/weed_extract,
+				/obj/item/xenos_claw,
+				/obj/structure/closet/crate/science
+			),
+			prob(1);list(
+				/obj/item/clothing/head/bearpelt,
+				/obj/item/clothing/under/soviet,
+				/obj/item/clothing/under/soviet,
+				/obj/item/weapon/gun/projectile/shotgun/pump/rifle/ceremonial,
+				/obj/item/weapon/gun/projectile/shotgun/pump/rifle/ceremonial,
+				/obj/structure/closet/crate
+			),
+			prob(1);list(
+				/obj/item/weapon/gun/projectile/revolver/detective,
+				/obj/item/weapon/gun/projectile/contender,
+				/obj/item/weapon/gun/projectile/p92x,
+				/obj/item/weapon/gun/projectile/derringer,
+				/obj/structure/closet/crate
+			),
+			prob(1);list(
+				/obj/item/weapon/melee/cultblade,
+				/obj/item/clothing/suit/cultrobes,
+				/obj/item/clothing/head/culthood,
+				/obj/item/device/soulstone,
+				/obj/structure/closet/crate
+			),
+			prob(1);list(
+				/obj/item/weapon/vampiric,
+				/obj/item/weapon/vampiric,
+				/obj/structure/closet/crate/science
+			),
+			prob(1);list(
+				/obj/item/weapon/archaeological_find
+			),
+			prob(1);list(
+				/obj/item/weapon/melee/energy/sword,
+				/obj/item/weapon/melee/energy/sword,
+				/obj/item/weapon/melee/energy/sword,
+				/obj/item/weapon/shield/energy,
+				/obj/item/weapon/shield/energy,
+				/obj/structure/closet/crate/science
+			),
+			prob(1);list(
+				/obj/item/weapon/storage/backpack/clown,
+				/obj/item/clothing/under/rank/clown,
+				/obj/item/clothing/shoes/clown_shoes,
+				/obj/item/device/pda/clown,
+				/obj/item/clothing/mask/gas/clown_hat,
+				/obj/item/weapon/bikehorn,
+				/obj/item/toy/waterflower,
+				/obj/item/weapon/pen/crayon/rainbow,
+				/obj/structure/closet/crate
+			),
+			prob(1);list(
+				/obj/item/clothing/under/mime,
+				/obj/item/clothing/shoes/black,
+				/obj/item/device/pda/mime,
+				/obj/item/clothing/gloves/white,
+				/obj/item/clothing/mask/gas/mime,
+				/obj/item/clothing/head/beret,
+				/obj/item/clothing/suit/suspenders,
+				/obj/item/weapon/pen/crayon/mime,
+				/obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing,
+				/obj/structure/closet/crate
+			),
+			prob(1);list(
+				/obj/item/weapon/storage/belt/champion,
+				/obj/item/clothing/mask/luchador,
+				/obj/item/clothing/mask/luchador/rudos,
+				/obj/item/clothing/mask/luchador/tecnicos,
+				/obj/structure/closet/crate
+			)
+		)
+
+/*
+ * Random Mobs
+ */
+
+/obj/random/mob
+	name = "Random Animal"
+	desc = "This is a random animal."
+	icon = 'icons/mob/animal.dmi'
+	icon_state = "chicken_white"
+
+/obj/random/mob/item_to_spawn()
+	return pick(prob(10);/mob/living/simple_animal/lizard,
+				prob(6);/mob/living/simple_animal/retaliate/diyaab,
+				prob(10);/mob/living/simple_animal/cat/fluff,
+				prob(6);/mob/living/simple_animal/cat/kitten,
+				prob(10);/mob/living/simple_animal/corgi,
+				prob(6);/mob/living/simple_animal/corgi/puppy,
+				prob(10);/mob/living/simple_animal/crab,
+				prob(10);/mob/living/simple_animal/chicken,
+				prob(6);/mob/living/simple_animal/chick,
+				prob(10);/mob/living/simple_animal/cow,
+				prob(6);/mob/living/simple_animal/retaliate/goat,
+				prob(10);/mob/living/simple_animal/penguin,
+				prob(10);/mob/living/simple_animal/mouse,
+				prob(10);/mob/living/simple_animal/yithian,
+				prob(10);/mob/living/simple_animal/tindalos,
+				prob(10);/mob/living/simple_animal/corgi/tamaskan,
+				prob(3);/mob/living/simple_animal/parrot,
+				prob(1);/mob/living/simple_animal/giant_crab)
+
+/obj/random/mob/sif
+	name = "Random Sif Animal"
+	desc = "This is a random cold weather animal."
+	icon_state = "penguin"
+
+/obj/random/mob/sif/item_to_spawn()
+	return pick(prob(30);/mob/living/simple_animal/retaliate/diyaab,
+				prob(15);/mob/living/simple_animal/crab,
+				prob(15);/mob/living/simple_animal/penguin,
+				prob(15);/mob/living/simple_animal/mouse,
+				prob(15);/mob/living/simple_animal/corgi/tamaskan,
+				prob(2);/mob/living/simple_animal/hostile/giant_spider/frost,
+				prob(1);/mob/living/simple_animal/hostile/goose,
+				prob(20);/mob/living/simple_animal/giant_crab)
+
+/obj/random/mob/sif/hostile
+	name = "Random Hostile Sif Animal"
+	desc = "This is a random hostile cold weather animal."
+	icon_state = "frost"
+
+/obj/random/mob/sif/hostile/item_to_spawn()
+	return pick(prob(22);/mob/living/simple_animal/hostile/savik,
+				prob(33);/mob/living/simple_animal/hostile/giant_spider/frost,
+				prob(45);/mob/living/simple_animal/hostile/shantak)
+
+/obj/random/mob/spider
+	name = "Random Spider"
+	desc = "This is a random boring spider."
+	icon_state = "guard"
+
+/obj/random/mob/spider/item_to_spawn()
+	return pick(prob(22);/mob/living/simple_animal/hostile/giant_spider/nurse,
+				prob(33);/mob/living/simple_animal/hostile/giant_spider/hunter,
+				prob(45);/mob/living/simple_animal/hostile/giant_spider)
+
+/obj/random/mob/spider/mutant
+	name = "Random Mutant Spider"
+	desc = "This is a random mutated spider."
+	icon_state = "phoron"
+
+/obj/random/mob/spider/mutant/item_to_spawn()
+	return pick(prob(1);/obj/random/mob/spider,
+				prob(5);/mob/living/simple_animal/hostile/giant_spider/nurse/medical,
+				prob(10);/mob/living/simple_animal/hostile/giant_spider/webslinger,
+				prob(10);/mob/living/simple_animal/hostile/giant_spider/carrier,
+				prob(33);/mob/living/simple_animal/hostile/giant_spider/lurker,
+				prob(33);/mob/living/simple_animal/hostile/giant_spider/tunneler,
+				prob(40);/mob/living/simple_animal/hostile/giant_spider/pepper,
+				prob(20);/mob/living/simple_animal/hostile/giant_spider/thermic,
+				prob(40);/mob/living/simple_animal/hostile/giant_spider/electric,
+				prob(1);/mob/living/simple_animal/hostile/giant_spider/phorogenic,
+				prob(40);/mob/living/simple_animal/hostile/giant_spider/frost)
+
+/obj/random/mob/robotic
+	name = "Random Robot Mob"
+	desc = "This is a random robot."
+	icon_state = "drone_dead"
+
+/obj/random/mob/robotic/item_to_spawn() //Hivebots have a total number of 'lots' equal to the lesser drone, at 60.
+	return pick(prob(60);/mob/living/simple_animal/hostile/malf_drone/lesser,
+				prob(50);/mob/living/simple_animal/hostile/malf_drone,
+				prob(15);/mob/living/simple_animal/hostile/mecha/malf_drone,
+				prob(10);/mob/living/simple_animal/hostile/hivebot,
+				prob(15);/mob/living/simple_animal/hostile/hivebot/swarm,
+				prob(10);/mob/living/simple_animal/hostile/hivebot/range,
+				prob(5);/mob/living/simple_animal/hostile/hivebot/range/rapid,
+				prob(5);/mob/living/simple_animal/hostile/hivebot/range/ion,
+				prob(5);/mob/living/simple_animal/hostile/hivebot/range/laser,
+				prob(5);/mob/living/simple_animal/hostile/hivebot/range/strong,
+				prob(5);/mob/living/simple_animal/hostile/hivebot/range/guard)
+
+/obj/random/mob/robotic/hivebot
+	name = "Random Hivebot"
+	desc = "This is a random hivebot."
+	icon_state = "drone3"
+
+/obj/random/mob/robotic/hivebot/item_to_spawn()
+	return pick(prob(10);/mob/living/simple_animal/hostile/hivebot,
+				prob(15);/mob/living/simple_animal/hostile/hivebot/swarm,
+				prob(10);/mob/living/simple_animal/hostile/hivebot/range,
+				prob(5);/mob/living/simple_animal/hostile/hivebot/range/rapid,
+				prob(5);/mob/living/simple_animal/hostile/hivebot/range/ion,
+				prob(5);/mob/living/simple_animal/hostile/hivebot/range/laser,
+				prob(5);/mob/living/simple_animal/hostile/hivebot/range/strong,
+				prob(5);/mob/living/simple_animal/hostile/hivebot/range/guard)
--- a/code/game/objects/structures/bonfire.dm
+++ b/code/game/objects/structures/bonfire.dm
@@ -10,6 +10,8 @@
 	var/next_fuel_consumption = 0 // world.time of when next item in fuel list gets eatten to sustain the fire.
 	var/grill = FALSE
 	var/material/material
+	var/set_temperature = T0C + 30	//K
+	var/heating_power = 80000

 /obj/structure/bonfire/New(newloc, material_name)
 	..(newloc)
@@ -186,9 +188,9 @@
 	if(burning)
 		var/state
 		switch(get_fuel_amount())
-			if(0 to 4)
+			if(0 to 4.5)
 				state = "bonfire_warm"
-			if(5 to 10)
+			if(4.6 to 10)
 				state = "bonfire_hot"
 		var/image/I = image(icon, state)
 		I.appearance_flags = RESET_COLOR
@@ -223,6 +225,23 @@
 	if(!grill)
 		burn()

+	if(burning)
+		var/W = get_fuel_amount()
+		if(W >= 5)
+			var/datum/gas_mixture/env = loc.return_air()
+			if(env && abs(env.temperature - set_temperature) > 0.1)
+				var/transfer_moles = 0.25 * env.total_moles
+				var/datum/gas_mixture/removed = env.remove(transfer_moles)
+
+				if(removed)
+					var/heat_transfer = removed.get_thermal_energy_change(set_temperature)
+					if(heat_transfer > 0)
+						heat_transfer = min(heat_transfer , heating_power)
+
+						removed.add_thermal_energy(heat_transfer)
+
+				env.merge(removed)
+
 /obj/structure/bonfire/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
 	ignite()

@@ -235,4 +254,163 @@
 		M.pixel_y += 13
 	else // Just unbuckled someone
 		M.pixel_y -= 13
-	update_icon()
+	update_icon()
+
+/obj/structure/fireplace //more like a space heater than a bonfire. A cozier alternative to both.
+	name = "fireplace"
+	desc = "The sound of the crackling hearth reminds you of home."
+	icon = 'icons/obj/structures.dmi'
+	icon_state = "fireplace"
+	density = TRUE
+	anchored = TRUE
+	var/burning = FALSE
+	var/next_fuel_consumption = 0
+	var/set_temperature = T0C + 20	//K
+	var/heating_power = 40000
+
+/obj/structure/fireplace/attackby(obj/item/W, mob/user)
+	if(istype(W, /obj/item/stack/material/wood) || istype(W, /obj/item/stack/material/log) )
+		add_fuel(W, user)
+
+	else if(W.is_hot())
+		ignite()
+	else
+		return ..()
+
+/obj/structure/fireplace/attack_hand(mob/user)
+	if(get_fuel_amount())
+		remove_fuel(user)
+
+/obj/structure/fireplace/proc/get_fuel_amount()
+	var/F = 0
+	for(var/A in contents)
+		if(istype(A, /obj/item/stack/material/wood))
+			F += 0.5
+		if(istype(A, /obj/item/stack/material/log))
+			F += 1.0
+	return F
+
+/obj/structure/fireplace/proc/remove_fuel(mob/user)
+	if(get_fuel_amount())
+		var/atom/movable/AM = pop(contents)
+		AM.forceMove(get_turf(src))
+		to_chat(user, "<span class='notice'>You take \the [AM] out of \the [src] before it has a chance to burn away.</span>")
+		update_icon()
+
+/obj/structure/fireplace/proc/add_fuel(atom/movable/new_fuel, mob/user)
+	if(get_fuel_amount() >= 10)
+		to_chat(user, "<span class='warning'>\The [src] already has enough fuel!</span>")
+		return FALSE
+	if(istype(new_fuel, /obj/item/stack/material/wood) || istype(new_fuel, /obj/item/stack/material/log) )
+		var/obj/item/stack/F = new_fuel
+		var/obj/item/stack/S = F.split(1)
+		if(S)
+			S.forceMove(src)
+			to_chat(user, "<span class='warning'>You add \the [new_fuel] to \the [src].</span>")
+			update_icon()
+			return TRUE
+		return FALSE
+	else
+		to_chat(user, "<span class='warning'>\The [src] needs raw wood to burn, \a [new_fuel] won't work.</span>")
+		return FALSE
+
+/obj/structure/fireplace/proc/consume_fuel(var/obj/item/stack/consumed_fuel)
+	if(!istype(consumed_fuel))
+		qdel(consumed_fuel) // Don't know, don't care.
+		return FALSE
+
+	if(istype(consumed_fuel, /obj/item/stack/material/log))
+		next_fuel_consumption = world.time + 2 MINUTES
+		qdel(consumed_fuel)
+		update_icon()
+		return TRUE
+
+	else if(istype(consumed_fuel, /obj/item/stack/material/wood)) // One log makes two planks of wood.
+		next_fuel_consumption = world.time + 1 MINUTE
+		qdel(consumed_fuel)
+		update_icon()
+		return TRUE
+	return FALSE
+
+/obj/structure/fireplace/proc/check_oxygen()
+	var/datum/gas_mixture/G = loc.return_air()
+	if(G.gas["oxygen"] < 1)
+		return FALSE
+	return TRUE
+
+/obj/structure/fireplace/proc/extinguish()
+	if(burning)
+		burning = FALSE
+		update_icon()
+		processing_objects -= src
+		visible_message("<span class='notice'>\The [src] stops burning.</span>")
+
+/obj/structure/fireplace/proc/ignite()
+	if(!burning && get_fuel_amount())
+		burning = TRUE
+		update_icon()
+		processing_objects += src
+		visible_message("<span class='warning'>\The [src] starts burning!</span>")
+
+/obj/structure/fireplace/proc/burn()
+	var/turf/current_location = get_turf(src)
+	current_location.hotspot_expose(1000, 500)
+	for(var/A in current_location)
+		if(A == src)
+			continue
+		if(isobj(A))
+			var/obj/O = A
+			O.fire_act(null, 1000, 500)
+
+/obj/structure/fireplace/update_icon()
+	overlays.Cut()
+	if(burning)
+		var/state
+		switch(get_fuel_amount())
+			if(0 to 3.5)
+				state = "fireplace_warm"
+			if(3.6 to 6.5)
+				state = "fireplace_hot"
+			if(6.6 to 10)
+				state = "fireplace_intense" //don't need to throw a corpse inside to make it burn hotter.
+		var/image/I = image(icon, state)
+		I.appearance_flags = RESET_COLOR
+		overlays += I
+
+		var/light_strength = max(get_fuel_amount() / 2, 2)
+		set_light(light_strength, light_strength, "#FF9933")
+	else
+		set_light(0)
+
+/obj/structure/fireplace/process()
+	if(!check_oxygen())
+		extinguish()
+		return
+	if(world.time >= next_fuel_consumption)
+		if(!consume_fuel(pop(contents)))
+			extinguish()
+			return
+
+	if(burning)
+		var/W = get_fuel_amount()
+		if(W >= 5)
+			var/datum/gas_mixture/env = loc.return_air()
+			if(env && abs(env.temperature - set_temperature) > 0.1)
+				var/transfer_moles = 0.25 * env.total_moles
+				var/datum/gas_mixture/removed = env.remove(transfer_moles)
+
+				if(removed)
+					var/heat_transfer = removed.get_thermal_energy_change(set_temperature)
+					if(heat_transfer > 0)
+						heat_transfer = min(heat_transfer , heating_power)
+
+						removed.add_thermal_energy(heat_transfer)
+
+				env.merge(removed)
+
+/obj/structure/fireplace/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+	ignite()
+
+/obj/structure/fireplace/water_act(amount)
+	if(prob(amount * 10))
+		extinguish()
--- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
@@ -85,7 +85,7 @@
 		new /obj/item/weapon/storage/backpack/industrial(src)
 	else
 		new /obj/item/weapon/storage/backpack/satchel/eng(src)
-	new /obj/item/device/radio/headset/headset_cargo(src)
+	new /obj/item/device/radio/headset/headset_mine(src)
 	new /obj/item/clothing/under/rank/miner(src)
 	new /obj/item/clothing/gloves/black(src)
 	new /obj/item/clothing/shoes/black(src)
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -103,12 +103,13 @@
 		if(prob(50))
 			new /obj/item/weapon/storage/backpack/dufflebag/sec(src)
 		new /obj/item/clothing/head/helmet/HoS(src)
+		new /obj/item/clothing/head/helmet/HoS/hat(src)
 		new /obj/item/clothing/suit/storage/vest/hos(src)
 		new /obj/item/clothing/under/rank/head_of_security/jensen(src)
 		new /obj/item/clothing/under/rank/head_of_security/corp(src)
 		new /obj/item/clothing/suit/storage/vest/hoscoat/jensen(src)
 		new /obj/item/clothing/suit/storage/vest/hoscoat(src)
-		new /obj/item/clothing/head/helmet/HoS/dermal(src)
+		new /obj/item/clothing/head/helmet/dermal(src)
 		new /obj/item/device/radio/headset/heads/hos(src)
 		new /obj/item/device/radio/headset/heads/hos/alt(src)
 		new /obj/item/clothing/glasses/sunglasses/sechud(src)
@@ -182,7 +183,9 @@
 		new /obj/item/clothing/under/rank/warden/corp(src)
 		new /obj/item/clothing/suit/storage/vest/wardencoat(src)
 		new /obj/item/clothing/suit/storage/vest/wardencoat/alt(src)
+		new /obj/item/clothing/head/helmet/dermal(src)
 		new /obj/item/clothing/head/helmet/warden(src)
+		new /obj/item/clothing/head/helmet/warden/hat(src)
 		new /obj/item/weapon/cartridge/security(src)
 		new /obj/item/device/radio/headset/headset_sec(src)
 		new /obj/item/device/radio/headset/headset_sec/alt(src)
--- a/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm
@@ -82,7 +82,7 @@
 		new /obj/item/clothing/under/rank/head_of_security/jensen(src)
 		new /obj/item/clothing/suit/storage/vest/hoscoat/jensen(src)
 		new /obj/item/clothing/suit/storage/vest/hoscoat(src)
-		new /obj/item/clothing/head/helmet/HoS/dermal(src)
+		new /obj/item/clothing/head/helmet/dermal(src)
 		new /obj/item/weapon/cartridge/hos(src)
 		new /obj/item/device/radio/headset/heads/hos(src)
 		new /obj/item/device/radio/headset/heads/hos/alt(src)
--- a/code/game/objects/structures/flora/trees.dm
+++ b/code/game/objects/structures/flora/trees.dm
@@ -18,6 +18,10 @@
 		return ..()

 	if(is_stump)
+		if(istype(W,/obj/item/weapon/shovel))
+			if(do_after(user, 5 SECONDS))
+				visible_message("<span class='notice'>\The [user] digs up \the [src] stump with \the [W].</span>")
+				qdel(src)
 		return

 	visible_message("<span class='danger'>\The [user] hits \the [src] with \the [W]!</span>")
--- a/code/game/objects/structures/ghost_pods/ghost_pods.dm
+++ b/code/game/objects/structures/ghost_pods/ghost_pods.dm
@@ -7,6 +7,7 @@
 	var/icon_state_opened = null	// Icon to switch to when 'used'.
 	var/used = FALSE
 	var/busy = FALSE // Don't spam ghosts by spamclicking.
+	var/needscharger //For drone pods that want their pod to turn into a charger.

 // Call this to get a ghost volunteer.
 /obj/structure/ghost_pod/proc/trigger()
@@ -22,8 +23,10 @@
 	if(winner.len)
 		var/mob/observer/dead/D = winner[1]
 		create_occupant(D)
-		new /obj/machinery/recharge_station/ghost_pod_recharger(src.loc)
-		del(src)
+		icon_state = icon_state_opened
+		if(needscharger)
+			new /obj/machinery/recharge_station/ghost_pod_recharger(src.loc)
+			del(src)
 		return TRUE
 	else
 		return FALSE
--- a/code/game/objects/structures/ghost_pods/silicon.dm
+++ b/code/game/objects/structures/ghost_pods/silicon.dm
@@ -10,6 +10,7 @@
 	density = TRUE
 	ghost_query_type = /datum/ghost_query/lost_drone
 	confirm_before_open = TRUE
+	needscharger = TRUE

 /obj/structure/ghost_pod/manual/lost_drone/trigger()
 	..()
@@ -45,6 +46,7 @@
 	icon_state_opened = "borg_pod_opened"
 	density = TRUE
 	ghost_query_type = /datum/ghost_query/gravekeeper_drone
+	needscharger = TRUE

 /obj/structure/ghost_pod/automatic/gravekeeper_drone/create_occupant(var/mob/M)
 	density = FALSE
@@ -58,4 +60,30 @@
 	R.ckey = M.ckey
 	visible_message("<span class='warning'>As \the [src] opens, the eyes of the robot flicker as it is activated.</span>")
 	R.Namepick()
+	..()
+
+/obj/structure/ghost_pod/manual/corgi
+	name = "glowing rune"
+	desc = "This rune slowly lights up and goes dim in a repeating pattern, like a slow heartbeat. It's almost as if it's calling out to you to touch it..."
+	description_info = "This will summon some manner of creature through quite dubious means. The creature will be controlled by a player."
+	icon_state = "corgirune"
+	icon_state_opened = "corgirune-inert"
+	density = TRUE
+	ghost_query_type = /datum/ghost_query/corgi_rune
+	confirm_before_open = TRUE
+
+/obj/structure/ghost_pod/manual/corgi/trigger()
+	..()
+	visible_message("<span class='warning'>\The [usr] places their hand on the rune!</span>")
+	log_and_message_admins("is attempting to summon a corgi.")
+
+/obj/structure/ghost_pod/manual/corgi/create_occupant(var/mob/M)
+	density = FALSE
+	var/mob/living/simple_animal/corgi/R = new(get_turf(src))
+	if(M.mind)
+		M.mind.transfer_to(R)
+	to_chat(M, "<span class='notice'>You are a <b>Corgi</b>! Woof!</span>")
+	R.ckey = M.ckey
+	visible_message("<span class='warning'>With a bright flash of light, \the [src] disappears, and in its place stands a small corgi.</span>")
+	log_and_message_admins("successfully touched \a [src] and summoned a corgi.")
 	..()
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -294,6 +294,21 @@
 			if(is_fulltile())
 				mats.amount = 4
 			qdel(src)
+	else if(iscoil(W) && reinf && state == 0 && !istype(src, /obj/structure/window/reinforced/polarized))
+		var/obj/item/stack/cable_coil/C = W
+		if (C.use(1))
+			playsound(src.loc, 'sound/effects/sparks1.ogg', 75, 1)
+			user.visible_message( \
+				"<span class='notice'>\The [user] begins to wire \the [src] for electrochromic tinting.</span>", \
+				"<span class='notice'>You begin to wire \the [src] for electrochromic tinting.</span>", \
+				"You hear sparks.")
+			if(do_after(user, 20 * C.toolspeed, src) && state == 0)
+				playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
+				var/obj/structure/window/reinforced/polarized/P = new(loc, dir)
+				P.health = health
+				P.state = state
+				P.anchored = anchored
+				qdel(src)
 	else if(istype(W,/obj/item/frame) && anchored)
 		var/obj/item/frame/F = W
 		F.try_build(src)
@@ -551,6 +566,28 @@
 	desc = "Adjusts its tint with voltage. Might take a few good hits to shatter it."
 	var/id

+/obj/structure/window/reinforced/polarized/full
+	dir = SOUTHWEST
+	icon_state = "fwindow"
+	maxhealth = 80
+
+/obj/structure/window/reinforced/polarized/attackby(obj/item/W as obj, mob/user as mob)
+	if(ismultitool(W) && !anchored) // Only allow programming if unanchored!
+		var/obj/item/device/multitool/MT = W
+		// First check if they have a windowtint button buffered
+		if(istype(MT.connectable, /obj/machinery/button/windowtint))
+			var/obj/machinery/button/windowtint/buffered_button = MT.connectable
+			src.id = buffered_button.id
+			to_chat(user, "<span class='notice'>\The [src] is linked to \the [buffered_button].</span>")
+			return TRUE
+		// Otherwise fall back to asking them
+		var/t = sanitizeSafe(input(user, "Enter the ID for the window.", src.name, null), MAX_NAME_LEN)
+		if (!t && user.get_active_hand() != W && in_range(src, user))
+			src.id = t
+			to_chat(user, "<span class='notice'>The new ID of \the [src] is [id]</span>")
+			return TRUE
+	. = ..()
+
 /obj/structure/window/reinforced/polarized/proc/toggle()
 	if(opacity)
 		animate(src, color="#FFFFFF", time=5)
@@ -593,3 +630,20 @@

 /obj/machinery/button/windowtint/update_icon()
 	icon_state = "light[active]"
+
+/obj/machinery/button/windowtint/attackby(obj/item/W as obj, mob/user as mob)
+	if(ismultitool(W))
+		var/obj/item/device/multitool/MT = W
+		if(!id)
+			// If no ID is set yet (newly built button?) let them select an ID for first-time use!
+			var/t = sanitizeSafe(input(user, "Enter an ID for \the [src].", src.name, null), MAX_NAME_LEN)
+			if (t && user.get_active_hand() != W && in_range(src, user))
+				src.id = t
+				to_chat(user, "<span class='notice'>The new ID of \the [src] is [id]</span>")
+		if(id)
+			// It already has an ID (or they just set one), buffer it for copying to windows.
+			to_chat(user, "<span class='notice'>You store \the [src] in \the [MT]'s buffer!</span>")
+			MT.connectable = src
+			MT.update_icon()
+		return TRUE
+	. = ..()
--- a/code/game/turfs/flooring/flooring.dm
+++ b/code/game/turfs/flooring/flooring.dm
@@ -133,6 +133,11 @@ var/list/flooring_types
 	icon_base = "oracarpet"
 	build_type = /obj/item/stack/tile/carpet/oracarpet

+/decl/flooring/carpet/tealcarpet
+	name = "teal carpet"
+	icon_base = "tealcarpet"
+	build_type = /obj/item/stack/tile/carpet/teal
+
 /decl/flooring/tiling
 	name = "floor"
 	desc = "Scuffed from the passage of countless greyshirts."
@@ -275,6 +280,23 @@ var/list/flooring_types
 		'sound/effects/footstep/wood4.ogg',
 		'sound/effects/footstep/wood5.ogg'))

+/decl/flooring/sifwood
+	name = "alien wooden floor"
+	desc = "Polished alien wood planks."
+	icon = 'icons/turf/flooring/wood.dmi'
+	icon_base = "sifwood"
+	has_damage_range = 6
+	damage_temperature = T0C+200
+	descriptor = "planks"
+	build_type = /obj/item/stack/tile/sifwood
+	flags = TURF_CAN_BREAK | TURF_IS_FRAGILE | TURF_REMOVE_SCREWDRIVER
+	footstep_sounds = list("human" = list(
+		'sound/effects/footstep/wood1.ogg',
+		'sound/effects/footstep/wood2.ogg',
+		'sound/effects/footstep/wood3.ogg',
+		'sound/effects/footstep/wood4.ogg',
+		'sound/effects/footstep/wood5.ogg'))
+
 /decl/flooring/reinforced
 	name = "reinforced floor"
 	desc = "Heavily reinforced with steel rods."
--- a/code/game/turfs/flooring/flooring_premade.dm
+++ b/code/game/turfs/flooring/flooring_premade.dm
@@ -14,6 +14,11 @@
 	icon_state = "blucarpet"
 	initial_flooring = /decl/flooring/carpet/blucarpet

+/turf/simulated/floor/carpet/tealcarpet
+	name = "teal carpet"
+	icon_state = "tealcarpet"
+	initial_flooring = /decl/flooring/carpet/tealcarpet
+
 // Legacy support for existing paths for blue carpet
 /turf/simulated/floor/carpet/blue
 	name = "blue carpet"
@@ -63,6 +68,12 @@
 	icon_state = "wood"
 	initial_flooring = /decl/flooring/wood

+/turf/simulated/floor/sifwood
+	name = "alien wooden floor"
+	icon = 'icons/turf/flooring/wood.dmi'
+	icon_state = "sifwood"
+	initial_flooring = /decl/flooring/sifwood
+
 /turf/simulated/floor/grass
 	name = "grass patch"
 	icon = 'icons/turf/flooring/grass.dmi'
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1228,7 +1228,7 @@
 		if(ismob(M))
 			var/take_msg = "<span class='notice'><b>ADMINHELP</b>: <b>[key_name(usr.client)]</b> is attending to <b>[key_name(M)]'s</b> adminhelp, please don't dogpile them.</span>"
 			for(var/client/X in admins)
-				if((R_ADMIN|R_MOD|R_EVENT) & X.holder.rights)
+				if((R_ADMIN|R_MOD|R_EVENT|R_SERVER) & X.holder.rights)
 					to_chat(X, take_msg)
 			to_chat(M, "<span class='notice'><b>Your adminhelp is being attended to by [usr.client]. Thanks for your patience!</b></span>")
 			// VoreStation Edit Start
--- a/code/modules/blob2/mobs/spore.dm
+++ b/code/modules/blob2/mobs/spore.dm
@@ -12,7 +12,7 @@
 	melee_damage_lower = 2
 	melee_damage_upper = 4
 	layer = MOB_LAYER + 0.2 // Over the blob.
-	attacktext = "slams into"
+	attacktext = list("slams into")
 	attack_sound = 'sound/effects/slime_squish.ogg'
 	emote_see = list("sways", "inflates briefly")
 	var/mob/living/carbon/human/infested = null // The human this thing is totally not making into a zombie.
@@ -97,7 +97,7 @@
 	melee_damage_lower += 8  // 10 total.
 	melee_damage_upper += 11 // 15 total.
 	emote_see = list("shambles around", "twitches", "stares")
-	attacktext = "claws"
+	attacktext = list("claws")

 	H.forceMove(src)
 	infested = H
--- a/code/modules/clothing/clothing_accessories.dm
+++ b/code/modules/clothing/clothing_accessories.dm
@@ -1,12 +1,17 @@
 /obj/item/clothing/proc/can_attach_accessory(obj/item/clothing/accessory/A)
 	if(valid_accessory_slots && istype(A) && (A.slot in valid_accessory_slots))
-		.=1
-	else
-		return 0
+		if(accessories.len && restricted_accessory_slots && (A.slot in restricted_accessory_slots))
+			for(var/obj/item/clothing/accessory/AC in accessories)
+				if (AC.slot == A.slot)
+					return 0
+		return 1
+	return 0
+
 	if(accessories.len && restricted_accessory_slots && (A.slot in restricted_accessory_slots))
 		for(var/obj/item/clothing/accessory/AC in accessories)
 			if (AC.slot == A.slot)
 				return 0
+	return 1

 /obj/item/clothing/attackby(var/obj/item/I, var/mob/user)
 	if(istype(I, /obj/item/clothing/accessory))
@@ -22,7 +27,7 @@
 			return
 		else
 			user << "<span class='warning'>You cannot attach more accessories of this type to [src].</span>"
-		return
+			return

 	if(accessories.len)
 		for(var/obj/item/clothing/accessory/A in accessories)
@@ -37,6 +42,10 @@
 		for(var/obj/item/clothing/accessory/A in accessories)
 			A.attack_hand(user)
 		return
+	if (ishuman(user) && src.loc == user)
+		var/mob/living/carbon/human/H = user
+		if(src != H.l_store && src != H.r_store && src != H.s_store)
+			return
 	return ..()

 /obj/item/clothing/MouseDrop(var/obj/over_object)
@@ -70,10 +79,16 @@
 *  user is the user doing the attaching. Can be null, such as when attaching
 *  items on spawn
 */
+/obj/item/clothing/proc/update_accessory_slowdown()
+	slowdown = initial(slowdown)
+	for(var/obj/item/clothing/accessory/A in accessories)
+		slowdown += A.slowdown
+
 /obj/item/clothing/proc/attach_accessory(mob/user, obj/item/clothing/accessory/A)
 	accessories += A
 	A.on_attached(src, user)
 	src.verbs |= /obj/item/clothing/proc/removetie_verb
+	update_accessory_slowdown()
 	update_clothing_icon()

 /obj/item/clothing/proc/remove_accessory(mob/user, obj/item/clothing/accessory/A)
@@ -82,6 +97,7 @@

 	A.on_removed(user)
 	accessories -= A
+	update_accessory_slowdown()
 	update_clothing_icon()

 /obj/item/clothing/proc/removetie_verb()
--- a/code/modules/clothing/gloves/arm_guards.dm
+++ b/code/modules/clothing/gloves/arm_guards.dm
@@ -28,7 +28,7 @@
 	icon_state = "arm_guards_bullet"
 	item_state_slots = list(slot_r_hand_str = "swat", slot_l_hand_str = "swat")
 	siemens_coefficient = 0.7
-	armor = list(melee = 10, bullet = 80, laser = 10, energy = 50, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 10, bullet = 80, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0)

 /obj/item/clothing/gloves/arm_guard/riot
 	name = "riot arm guards"
@@ -36,7 +36,7 @@
 	icon_state = "arm_guards_riot"
 	item_state_slots = list(slot_r_hand_str = "swat", slot_l_hand_str = "swat")
 	siemens_coefficient = 0.5
-	armor = list(melee = 80, bullet = 10, laser = 10, energy = 50, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 80, bullet = 10, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0)

 /obj/item/clothing/gloves/arm_guard/combat
 	name = "combat arm guards"
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -2,6 +2,8 @@
 	name = "helmet"
 	desc = "Standard Security gear. Protects the head from impacts."
 	icon_state = "helmet"
+	valid_accessory_slots = list(ACCESSORY_SLOT_HELM_C)
+	restricted_accessory_slots = list(ACCESSORY_SLOT_HELM_C)
 	flags = THICKMATERIAL
 	armor = list(melee = 40, bullet = 30, laser = 30, energy = 10, bomb = 10, bio = 0, rad = 0)
 	flags_inv = HIDEEARS|HIDEEYES
@@ -18,6 +20,7 @@
 	desc = "A helmet painted in Peacekeeper blue. Stands out like a sore thumb."
 	icon_state = "helmet_sol"
 	armor = list(melee = 50, bullet = 50, laser = 50,energy = 25, bomb = 30, bio = 0, rad = 0)
+	valid_accessory_slots = null

 /obj/item/clothing/head/helmet/solgov/command
 	name = "command helmet"
@@ -61,6 +64,7 @@
 	armor = list(melee = 80, bullet = 10, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0)
 	flags_inv = HIDEEARS
 	siemens_coefficient = 0.7
+	valid_accessory_slots = null
 	action_button_name = "Toggle Visor"

 /obj/item/clothing/head/helmet/riot/attack_self(mob/user as mob)
@@ -80,6 +84,7 @@
 	armor = list(melee = 10, bullet = 10, laser = 80 ,energy = 50, bomb = 0, bio = 0, rad = 0)
 	flags_inv = HIDEEARS
 	siemens_coefficient = 0.1
+	valid_accessory_slots = null

 /obj/item/clothing/head/helmet/bulletproof
 	name = "bullet-resistant helmet"
@@ -89,6 +94,7 @@
 	armor = list(melee = 10, bullet = 80, laser = 10 ,energy = 10, bomb = 0, bio = 0, rad = 0)
 	flags_inv = HIDEEARS
 	siemens_coefficient = 0.7
+	valid_accessory_slots = null

 /obj/item/clothing/head/helmet/combat
 	name = "combat helmet"
@@ -98,6 +104,7 @@
 	armor = list(melee = 50, bullet = 50, laser = 50 ,energy = 30, bomb = 30, bio = 0, rad = 0)
 	flags_inv = HIDEEARS
 	siemens_coefficient = 0.6
+	valid_accessory_slots = null

 /obj/item/clothing/head/helmet/swat
 	name = "\improper SWAT helmet"
@@ -115,6 +122,7 @@
 	icon_state = "alienhelmet"
 	siemens_coefficient = 0.4
 	armor = list(melee = 50, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 0, rad = 40)
+	valid_accessory_slots = null

 /obj/item/clothing/head/helmet/alien/tank
 	name = "alien warhelm"
@@ -137,6 +145,7 @@
 	flags = BLOCKHAIR
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
 	siemens_coefficient = 1
+	valid_accessory_slots = null

 /obj/item/clothing/head/helmet/tactical
 	name = "tactical helmet"
@@ -151,6 +160,7 @@
 	armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0)
 	flags_inv = HIDEEARS
 	siemens_coefficient = 0.7
+	valid_accessory_slots = null

 /obj/item/clothing/head/helmet/augment
 	name = "Augment Array"
@@ -162,6 +172,7 @@
 	cold_protection = HEAD
 	min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE
 	siemens_coefficient = 0.5
+	valid_accessory_slots = null

 //Non-hardsuit ERT helmets.
 /obj/item/clothing/head/helmet/ert
@@ -170,6 +181,7 @@
 	icon_state = "erthelmet_cmd"
 	item_state_slots = list(slot_r_hand_str = "syndicate-helm-green", slot_l_hand_str = "syndicate-helm-green")
 	armor = list(melee = 62, bullet = 50, laser = 50,energy = 35, bomb = 10, bio = 2, rad = 0)
+	valid_accessory_slots = null

 //Commander
 /obj/item/clothing/head/helmet/ert/command
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -103,23 +103,33 @@
 	icon_state = "beret_corporate_warden"
 	item_state_slots = list(slot_r_hand_str = "beret_black", slot_l_hand_str = "beret_black")

-/obj/item/clothing/head/helmet/warden //should these be helmets?
+/obj/item/clothing/head/helmet/warden
+	name = "warden's helmet"
+	desc = "Standard Warden gear. Protects the head from impacts."
+
+/obj/item/clothing/head/helmet/warden/hat
 	name = "warden's hat"
-	desc = "It's a special helmet issued to the Warden of a securiy force."
+	desc = "It's a special hat issued to the Warden of a securiy force."
 	icon_state = "policehelm"
-	body_parts_covered = 0
+	valid_accessory_slots = null

 /obj/item/clothing/head/helmet/HoS
+	name = "Head of Security helmet"
+	desc = "Standard Head of Security gear. Protects the head from impacts."
+
+/obj/item/clothing/head/helmet/HoS/hat
 	name = "Head of Security Hat"
 	desc = "The hat of the Head of Security. For showing the officers who's in charge."
 	icon_state = "hoscap"
-	body_parts_covered = 0
+	valid_accessory_slots = null

-/obj/item/clothing/head/helmet/HoS/dermal
+/obj/item/clothing/head/helmet/dermal
 	name = "Dermal Armour Patch"
 	desc = "You're not quite sure how you manage to take it on and off, but it implants nicely in your head."
 	icon_state = "dermal"
 	item_state_slots = list(slot_r_hand_str = "", slot_l_hand_str = "")
+	valid_accessory_slots = null
+	show_examine = FALSE

 /obj/item/clothing/head/det
 	name = "fedora"
@@ -128,14 +138,14 @@
 	allowed = list(/obj/item/weapon/reagent_containers/food/snacks/candy_corn, /obj/item/weapon/pen)
 	armor = list(melee = 10, bullet = 10, laser = 15, energy = 10, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.9
-	body_parts_covered = 0
+	valid_accessory_slots = null
+	show_examine = FALSE

 /obj/item/clothing/head/det/grey
 	icon_state = "detective2"
 	item_state_slots = list(slot_r_hand_str = "detective", slot_l_hand_str = "detective")
 	desc = "A grey fedora - either the cornerstone of a detective's style or a poor attempt at looking cool, depending on the person wearing it."

-
 /obj/item/clothing/head/beret/engineering
 	name = "engineering beret"
 	desc = "A beret with the engineering insignia emblazoned on it. For engineers that are more inclined towards style than safety."
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -74,7 +74,6 @@
 	icon_state = "explorer"
 	item_state_slots = list(slot_r_hand_str = "gas", slot_l_hand_str = "gas")
 	armor = list(melee = 10, bullet = 5, laser = 5,energy = 5, bomb = 0, bio = 50, rad = 0)
-	body_parts_covered = HEAD|FACE|EYES
 	siemens_coefficient = 0.9

 /obj/item/clothing/mask/gas/clown_hat
--- a/code/modules/clothing/spacesuits/spacesuits.dm
+++ b/code/modules/clothing/spacesuits/spacesuits.dm
@@ -18,6 +18,7 @@
 	preserve_item = 1
 	phoronproof = 1
 	flash_protection = FLASH_PROTECTION_MAJOR
+	valid_accessory_slots = null

 	var/obj/machinery/camera/camera
 	var/list/camera_networks
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -498,28 +498,28 @@
 	blood_overlay_type = "armor"

 /obj/item/clothing/suit/armor/pcarrier/light
-	starting_accessories = list(/obj/item/clothing/accessory/armorplate)
+	starting_accessories = list(/obj/item/clothing/accessory/armor/armorplate)

 /obj/item/clothing/suit/armor/pcarrier/light/sol
-	starting_accessories = list(/obj/item/clothing/accessory/armorplate, /obj/item/clothing/accessory/armor/tag)
+	starting_accessories = list(/obj/item/clothing/accessory/armor/armorplate, /obj/item/clothing/accessory/armor/tag)

 /obj/item/clothing/suit/armor/pcarrier/light/nt
-	starting_accessories = list(/obj/item/clothing/accessory/armorplate, /obj/item/clothing/accessory/armor/tag/nt)
+	starting_accessories = list(/obj/item/clothing/accessory/armor/armorplate, /obj/item/clothing/accessory/armor/tag/nt)

 /obj/item/clothing/suit/armor/pcarrier/medium
-	starting_accessories = list(/obj/item/clothing/accessory/armorplate/medium, /obj/item/clothing/accessory/storage/pouches)
+	starting_accessories = list(/obj/item/clothing/accessory/armor/armorplate/medium, /obj/item/clothing/accessory/storage/pouches)

 /obj/item/clothing/suit/armor/pcarrier/medium/sol
-	starting_accessories = list(/obj/item/clothing/accessory/armorplate/medium, /obj/item/clothing/accessory/storage/pouches, /obj/item/clothing/accessory/armor/tag)
+	starting_accessories = list(/obj/item/clothing/accessory/armor/armorplate/medium, /obj/item/clothing/accessory/storage/pouches, /obj/item/clothing/accessory/armor/tag)

 /obj/item/clothing/suit/armor/pcarrier/medium/security
-	starting_accessories = list(/obj/item/clothing/accessory/armorplate/medium, /obj/item/clothing/accessory/storage/pouches, /obj/item/clothing/accessory/armor/tag/sec)
+	starting_accessories = list(/obj/item/clothing/accessory/armor/armorplate/medium, /obj/item/clothing/accessory/storage/pouches, /obj/item/clothing/accessory/armor/tag/sec)

 /obj/item/clothing/suit/armor/pcarrier/medium/command
-	starting_accessories = list(/obj/item/clothing/accessory/armorplate/medium, /obj/item/clothing/accessory/storage/pouches, /obj/item/clothing/accessory/armor/tag/com)
+	starting_accessories = list(/obj/item/clothing/accessory/armor/armorplate/medium, /obj/item/clothing/accessory/storage/pouches, /obj/item/clothing/accessory/armor/tag/com)

 /obj/item/clothing/suit/armor/pcarrier/medium/nt
-	starting_accessories = list(/obj/item/clothing/accessory/armorplate/medium, /obj/item/clothing/accessory/storage/pouches, /obj/item/clothing/accessory/armor/tag/nt)
+	starting_accessories = list(/obj/item/clothing/accessory/armor/armorplate/medium, /obj/item/clothing/accessory/storage/pouches, /obj/item/clothing/accessory/armor/tag/nt)

 /obj/item/clothing/suit/armor/pcarrier/blue
 	name = "blue plate carrier"
@@ -529,7 +529,7 @@
 /obj/item/clothing/suit/armor/pcarrier/blue/sol
 	name = "peacekeeper plate carrier"
 	desc = "A lightweight plate carrier vest in SCG Peacekeeper colors. It can be equipped with armor plates, but provides no protection of its own."
-	starting_accessories = list(/obj/item/clothing/accessory/armorplate/medium, /obj/item/clothing/accessory/storage/pouches/blue, /obj/item/clothing/accessory/armguards/blue, /obj/item/clothing/accessory/armor/tag)
+	starting_accessories = list(/obj/item/clothing/accessory/armor/armorplate/medium, /obj/item/clothing/accessory/storage/pouches/blue, /obj/item/clothing/accessory/armor/armguards/blue, /obj/item/clothing/accessory/armor/tag)

 /obj/item/clothing/suit/armor/pcarrier/green
 	name = "green plate carrier"
@@ -548,8 +548,8 @@

 /obj/item/clothing/suit/armor/pcarrier/tan/tactical
 	name = "tactical plate carrier"
-	starting_accessories = list(/obj/item/clothing/accessory/armorplate/tactical, /obj/item/clothing/accessory/storage/pouches/large/tan)
+	starting_accessories = list(/obj/item/clothing/accessory/armor/armorplate/tactical, /obj/item/clothing/accessory/storage/pouches/large/tan)

 /obj/item/clothing/suit/armor/pcarrier/merc
-	starting_accessories = list(/obj/item/clothing/accessory/armorplate/merc, /obj/item/clothing/accessory/armguards/merc, /obj/item/clothing/accessory/legguards/merc, /obj/item/clothing/accessory/storage/pouches/large)
+	starting_accessories = list(/obj/item/clothing/accessory/armor/armorplate/merc, /obj/item/clothing/accessory/armor/armguards/merc, /obj/item/clothing/accessory/armor/legguards/merc, /obj/item/clothing/accessory/storage/pouches/large)

--- a/code/modules/clothing/under/accessories/armor.dm
+++ b/code/modules/clothing/under/accessories/armor.dm
@@ -1,11 +1,25 @@
+/*
+// This file holds all of the accessories used as part of the modular armor system. At some point it might be wise to split this into multiple files.
+*/
+
+/obj/item/clothing/accessory/armor
+	name = "armor accessory"
+	desc = "You should never see this description. Ahelp this, please."
+	icon_override = 'icons/mob/modular_armor.dmi'
+	icon = 'icons/obj/clothing/modular_armor.dmi'
+	icon_state = "pouches"
+	w_class = ITEMSIZE_NORMAL
+
+///////////
 //Pouches
+///////////
 /obj/item/clothing/accessory/storage/pouches
 	name = "storage pouches"
 	desc = "A collection of black pouches that can be attached to a plate carrier. Carries up to two items."
 	icon_override = 'icons/mob/modular_armor.dmi'
 	icon = 'icons/obj/clothing/modular_armor.dmi'
-//	accessory_icons = list(slot_tie_str = 'icons/mob/modular_armor.dmi', slot_wear_suit_str = 'icons/mob/modular_armor.dmi')
 	icon_state = "pouches"
+	w_class = ITEMSIZE_NORMAL
 	gender = PLURAL
 	slot = ACCESSORY_SLOT_ARMOR_S
 	slots = 2
@@ -31,6 +45,7 @@
 	desc = "A collection of black pouches that can be attached to a plate carrier. Carries up to four items."
 	icon_state = "lpouches"
 	slots = 4
+	slowdown = 0.25

 /obj/item/clothing/accessory/storage/pouches/large/blue
 	desc = "A collection of blue pouches that can be attached to a plate carrier. Carries up to four items."
@@ -48,40 +63,41 @@
 	desc = "A collection of tan pouches that can be attached to a plate carrier. Carries up to four items."
 	icon_state = "lpouches_tan"

+////////////////
 //Armor plates
-/obj/item/clothing/accessory/armorplate
+////////////////
+/obj/item/clothing/accessory/armor/armorplate
 	name = "light armor plate"
 	desc = "A basic armor plate made of steel-reinforced synthetic fibers. Attaches to a plate carrier."
-	icon = 'icons/obj/clothing/modular_armor.dmi'
 	icon_state = "armor_light"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 	armor = list(melee = 30, bullet = 15, laser = 40, energy = 10, bomb = 25, bio = 0, rad = 0)
 	slot = ACCESSORY_SLOT_ARMOR_C

-/obj/item/clothing/accessory/armorplate/medium
+/obj/item/clothing/accessory/armor/armorplate/medium
 	name = "medium armor plate"
 	desc = "A plasteel-reinforced synthetic armor plate, providing good protection. Attaches to a plate carrier."
 	icon_state = "armor_medium"
 	armor = list(melee = 40, bullet = 40, laser = 40, energy = 25, bomb = 30, bio = 0, rad = 0)

-/obj/item/clothing/accessory/armorplate/tactical
+/obj/item/clothing/accessory/armor/armorplate/tactical
 	name = "tactical armor plate"
 	desc = "A medium armor plate with additional ablative coating. Attaches to a plate carrier."
 	icon_state = "armor_tactical"
 	armor = list(melee = 40, bullet = 40, laser = 60, energy = 35, bomb = 30, bio = 0, rad = 0)

-/obj/item/clothing/accessory/armorplate/merc
+/obj/item/clothing/accessory/armor/armorplate/merc
 	name = "heavy armor plate"
 	desc = "A ceramics-reinforced synthetic armor plate, providing state of of the art protection. Attaches to a plate carrier."
 	icon_state = "armor_heavy"
 	armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0)

+//////////////
 //Arm guards
-/obj/item/clothing/accessory/armguards
+//////////////
+/obj/item/clothing/accessory/armor/armguards
 	name = "arm guards"
 	desc = "A pair of black arm pads reinforced with armor plating. Attaches to a plate carrier."
-	icon_override = 'icons/mob/modular_armor.dmi'
-	icon = 'icons/obj/clothing/modular_armor.dmi'
 //	accessory_icons = list(slot_tie_str = 'icons/mob/modular_armor.dmi', slot_wear_suit_str = 'icons/mob/modular_armor.dmi')
 	icon_state = "armguards"
 	gender = PLURAL
@@ -89,34 +105,58 @@
 	armor = list(melee = 40, bullet = 40, laser = 40, energy = 25, bomb = 30, bio = 0, rad = 0)
 	slot = ACCESSORY_SLOT_ARMOR_A

-/obj/item/clothing/accessory/armguards/blue
+/obj/item/clothing/accessory/armor/armguards/blue
 	desc = "A pair of blue arm pads reinforced with armor plating. Attaches to a plate carrier."
 	icon_state = "armguards_blue"

-/obj/item/clothing/accessory/armguards/navy
+/obj/item/clothing/accessory/armor/armguards/navy
 	desc = "A pair of navy blue arm pads reinforced with armor plating. Attaches to a plate carrier."
 	icon_state = "armguards_navy"

-/obj/item/clothing/accessory/armguards/green
+/obj/item/clothing/accessory/armor/armguards/green
 	desc = "A pair of green arm pads reinforced with armor plating. Attaches to a plate carrier."
 	icon_state = "armguards_green"

-/obj/item/clothing/accessory/armguards/tan
+/obj/item/clothing/accessory/armor/armguards/tan
 	desc = "A pair of tan arm pads reinforced with armor plating. Attaches to a plate carrier."
 	icon_state = "armguards_tan"

-/obj/item/clothing/accessory/armguards/merc
+/obj/item/clothing/accessory/armor/armguards/merc
 	name = "heavy arm guards"
 	desc = "A pair of red-trimmed black arm pads reinforced with heavy armor plating. Attaches to a plate carrier."
 	icon_state = "armguards_merc"
 	armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0)

+/obj/item/clothing/accessory/armor/armguards/laserproof
+	name = "ablative arm guards"
+	desc = "These arm guards will protect your arms from energy weapons."
+	icon_state = "armguards_laser"
+	item_state_slots = list(slot_r_hand_str = "swat", slot_l_hand_str = "swat")
+	siemens_coefficient = 0.4 //This is worse than the other ablative pieces, to avoid this from becoming the poor warden's insulated gloves.
+	armor = list(melee = 10, bullet = 10, laser = 80, energy = 50, bomb = 0, bio = 0, rad = 0)
+
+/obj/item/clothing/accessory/armor/armguards/bulletproof
+	name = "bullet resistant arm guards"
+	desc = "These arm guards will protect your arms from ballistic weapons."
+	icon_state = "armguards_bullet"
+	item_state_slots = list(slot_r_hand_str = "swat", slot_l_hand_str = "swat")
+	siemens_coefficient = 0.7
+	armor = list(melee = 10, bullet = 80, laser = 10, energy = 50, bomb = 0, bio = 0, rad = 0)
+
+/obj/item/clothing/accessory/armor/armguards/riot
+	name = "riot arm guards"
+	desc = "These arm guards will protect your arms from close combat weapons."
+	icon_state = "armguards_riot"
+	item_state_slots = list(slot_r_hand_str = "swat", slot_l_hand_str = "swat")
+	siemens_coefficient = 0.5
+	armor = list(melee = 80, bullet = 10, laser = 10, energy = 50, bomb = 0, bio = 0, rad = 0)
+
+//////////////
 //Leg guards
-/obj/item/clothing/accessory/legguards
+//////////////
+/obj/item/clothing/accessory/armor/legguards
 	name = "leg guards"
 	desc = "A pair of armored leg pads in black. Attaches to a plate carrier."
-	icon_override = 'icons/mob/modular_armor.dmi'
-	icon = 'icons/obj/clothing/modular_armor.dmi'
 //	accessory_icons = list(slot_tie_str = 'icons/mob/modular_armor.dmi', slot_wear_suit_str = 'icons/mob/modular_armor.dmi')
 	icon_state = "legguards"
 	gender = PLURAL
@@ -124,38 +164,62 @@
 	armor = list(melee = 40, bullet = 40, laser = 40, energy = 25, bomb = 30, bio = 0, rad = 0)
 	slot = ACCESSORY_SLOT_ARMOR_L

-/obj/item/clothing/accessory/legguards/blue
+/obj/item/clothing/accessory/armor/legguards/blue
 	desc = "A pair of armored leg pads in blue. Attaches to a plate carrier."
 	icon_state = "legguards_blue"

-/obj/item/clothing/accessory/legguards/navy
+/obj/item/clothing/accessory/armor/legguards/navy
 	desc = "A pair of armored leg pads in navy blue. Attaches to a plate carrier."
 	icon_state = "legguards_navy"

-/obj/item/clothing/accessory/legguards/green
+/obj/item/clothing/accessory/armor/legguards/green
 	desc = "A pair of armored leg pads in green. Attaches to a plate carrier."
 	icon_state = "legguards_green"

-/obj/item/clothing/accessory/legguards/tan
+/obj/item/clothing/accessory/armor/legguards/tan
 	desc = "A pair of armored leg pads in tan. Attaches to a plate carrier."
 	icon_state = "legguards_tan"

-/obj/item/clothing/accessory/legguards/merc
+/obj/item/clothing/accessory/armor/legguards/merc
 	name = "heavy leg guards"
 	desc = "A pair of heavily armored leg pads in red-trimmed black. Attaches to a plate carrier."
 	icon_state = "legguards_merc"
 	armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0)

+/obj/item/clothing/accessory/armor/legguards/laserproof
+	name = "ablative leg guards"
+	desc = "These will protect your legs from energy weapons."
+	icon_state = "legguards_laser"
+	item_state_slots = list(slot_r_hand_str = "jackboots", slot_l_hand_str = "jackboots")
+	siemens_coefficient = 0.1
+	armor = list(melee = 10, bullet = 10, laser = 80, energy = 50, bomb = 0, bio = 0, rad = 0)

+/obj/item/clothing/accessory/armor/legguards/bulletproof
+	name = "bullet resistant leg guards"
+	desc = "These will protect your legs from ballistic weapons."
+	icon_state = "legguards_bullet"
+	item_state_slots = list(slot_r_hand_str = "jackboots", slot_l_hand_str = "jackboots")
+	siemens_coefficient = 0.7
+	armor = list(melee = 10, bullet = 80, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0)
+
+/obj/item/clothing/accessory/armor/legguards/riot
+	name = "riot leg guards"
+	desc = "These will protect your legs from close combat weapons."
+	icon_state = "legguards_riot"
+	item_state_slots = list(slot_r_hand_str = "jackboots", slot_l_hand_str = "jackboots")
+	siemens_coefficient = 0.5
+	armor = list(melee = 80, bullet = 10, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0)
+
+//////////////////////////
 //Decorative attachments
+//////////////////////////
 /obj/item/clothing/accessory/armor/tag
 	name = "\improper SCG Flag"
 	desc = "An emblem depicting the Solar Confederate Government's flag."
-	icon_override = 'icons/mob/modular_armor.dmi'
-	icon = 'icons/obj/clothing/modular_armor.dmi'
 //	accessory_icons = list(slot_tie_str = 'icons/mob/modular_armor.dmi', slot_wear_suit_str = 'icons/mob/modular_armor.dmi')
 	icon_state = "solflag"
 	slot = ACCESSORY_SLOT_ARMOR_M
+	w_class = ITEMSIZE_SMALL

 /obj/item/clothing/accessory/armor/tag/sifguard
 	name = "\improper Sif Defense Force crest"
@@ -226,3 +290,50 @@
 	name = "\improper AB- blood patch"
 	desc = "An embroidered patch indicating the wearer's blood type as AB NEGATIVE."
 	icon_state = "abnegtag"
+
+/////////////////
+// Helmet Covers
+/////////////////
+
+obj/item/clothing/accessory/armor/helmcover
+	name = "helmet cover"
+	desc = "A fabric cover for armored helmets."
+	icon_override = 'icons/mob/ties.dmi'
+	icon = 'icons/obj/clothing/modular_armor.dmi'
+	icon_state = "helmcover_blue"
+	slot = ACCESSORY_SLOT_HELM_C
+
+/obj/item/clothing/accessory/armor/helmcover/blue
+	name = "blue helmet cover"
+	desc = "A fabric cover for armored helmets in a bright blue color."
+	icon_state = "helmcover_blue"
+
+/obj/item/clothing/accessory/armor/helmcover/navy
+	name = "navy blue helmet cover"
+	desc = "A fabric cover for armored helmets. This one is colored navy blue."
+	icon_state = "helmcover_navy"
+
+/obj/item/clothing/accessory/armor/helmcover/green
+	name = "green helmet cover"
+	desc = "A fabric cover for armored helmets. This one has a woodland camouflage pattern."
+	icon_state = "helmcover_green"
+
+/obj/item/clothing/accessory/armor/helmcover/tan
+	name = "tan helmet cover"
+	desc = "A fabric cover for armored helmets. This one has a desert camouflage pattern."
+	icon_state = "helmcover_tan"
+
+/obj/item/clothing/accessory/armor/helmcover/nt
+	name = "\improper NanoTrasen helmet cover"
+	desc = "A fabric cover for armored helmets. This one has NanoTrasen's colors."
+	icon_state = "helmcover_nt"
+
+/obj/item/clothing/accessory/armor/helmcover/pcrc
+	name = "\improper PCRC helmet cover"
+	desc = "A fabric cover for armored helmets. This one is colored navy blue and has a tag in the back with the words PROXIMA CENTAURI RISK CONTROL printed in cyan lettering on it."
+	icon_state = "helmcover_pcrc"
+
+/obj/item/clothing/accessory/armor/helmcover/saare
+	name = "\improper SAARE helmet cover"
+	desc = "A fabric cover for armored helmets. This one has SAARE's colors."
+	icon_state = "helmcover_saare"
--- a/code/modules/clothing/under/accessories/permits.dm
+++ b/code/modules/clothing/under/accessories/permits.dm
@@ -34,6 +34,10 @@
 	name = "bar shotgun permit"
 	desc = "A card indicating that the owner is allowed to carry a shotgun in the bar."

+/obj/item/clothing/accessory/permit/gun/planetside
+	name = "planetside gun permit"
+	desc = "A card indicating that the owner is allowed to carry a firearm while on the surface."
+
 /obj/item/clothing/accessory/permit/drone
 	name = "drone identification card"
 	desc = "A card issued by the EIO, indicating that the owner is a Drone Intelligence. Drones are mandated to carry this card within SolGov space, by law."
--- a/code/modules/materials/material_recipes.dm
+++ b/code/modules/materials/material_recipes.dm
@@ -182,4 +182,10 @@
 	recipes += new/datum/stack_recipe("[display_name] bed", /obj/structure/bed, 2, one_per_turf = 1, on_floor = 1, supplied_material = "[name]")
 	recipes += new/datum/stack_recipe("[display_name] double bed", /obj/structure/bed/double, 4, one_per_turf = 1, on_floor = 1, supplied_material = "[name]")
 	recipes += new/datum/stack_recipe("[display_name] wall girders", /obj/structure/girder, 2, time = 50, one_per_turf = 1, on_floor = 1, supplied_material = "[name]")
-	recipes += new/datum/stack_recipe("[display_name] ashtray", /obj/item/weapon/material/ashtray, 2, one_per_turf = 1, on_floor = 1, supplied_material = "[name]")
+	recipes += new/datum/stack_recipe("[display_name] ashtray", /obj/item/weapon/material/ashtray, 2, one_per_turf = 1, on_floor = 1, supplied_material = "[name]")
+
+/material/wood/sif/generate_recipes()
+	..()
+	recipes += new/datum/stack_recipe("alien wood floor tile", /obj/item/stack/tile/sifwood, 1, 4, 20)
+	recipes -= new/datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20)
+	recipes -= new/datum/stack_recipe("wooden chair", /obj/structure/bed/chair/wood, 3, time = 10, one_per_turf = 1, on_floor = 1)
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -488,7 +488,7 @@ var/list/mining_overlay_cache = list()
 				M.flash_eyes()
 				if(prob(50))
 					M.Stun(5)
-			radiation_repository.flat_radiate(src, 25, 200)
+			radiation_repository.flat_radiate(src, 25, 100)
 			if(prob(25))
 				excavate_find(prob(5), finds[1])
 	else if(rand(1,500) == 1)
--- a/code/modules/mining/satchel_ore_boxdm.dm
+++ b/code/modules/mining/satchel_ore_boxdm.dm
@@ -14,12 +14,15 @@
 	if (istype(W, /obj/item/weapon/ore))
 		user.remove_from_mob(W)
 		src.contents += W
-	if (istype(W, /obj/item/weapon/storage))
+
+	else if (istype(W, /obj/item/weapon/storage))
 		var/obj/item/weapon/storage/S = W
+		if(!S.contents.len)
+			return
 		S.hide_from(usr)
 		for(var/obj/item/weapon/ore/O in S.contents)
 			S.remove_from_storage(O, src) //This will move the item to this item's contents
-		user << "<font color='blue'>You empty the satchel into the box.</font>"
+		to_chat(user,"<span class='notice'>You empty the satchel into the box.</span>")

 	update_ore_count()

@@ -62,13 +65,12 @@
 		user << "- [stored_ore[ore]] [ore]"
 	return

-
 /obj/structure/ore_box/verb/empty_box()
 	set name = "Empty Ore Box"
 	set category = "Object"
 	set src in view(1)

-	if(!istype(usr, /mob/living/carbon/human)) //Only living, intelligent creatures with hands can empty ore boxes.
+	if(!istype(usr, /mob/living/carbon/human) && !istype(usr, /mob/living/silicon/robot)) //Only living, intelligent creatures with gripping aparatti can empty ore boxes.
 		usr << "<font color='red'>You are physically incapable of emptying the ore box.</font>"
 		return

--- a/code/modules/mob/_modifiers/modifiers.dm
+++ b/code/modules/mob/_modifiers/modifiers.dm
@@ -39,7 +39,7 @@
 	var/haste							// If set to 1, the mob will be 'hasted', which makes it ignore slowdown and go really fast.
 	var/evasion							// Positive numbers reduce the odds of being hit. Negative numbers increase the odds.
 	var/bleeding_rate_percent			// Adjusts amount of blood lost when bleeding.
-	var/accuracy						// Positive numbers makes hitting things with guns easier, negatives make it harder. Every 15% is equal to one tile easier or harder, just like evasion.
+	var/accuracy						// Positive numbers makes hitting things with guns easier, negatives make it harder.
 	var/accuracy_dispersion				// Positive numbers make gun firing cover a wider tile range, and therefore more inaccurate.  Negatives help negate dispersion penalties.
 	var/metabolism_percent				// Adjusts the mob's metabolic rate, which affects reagent processing.  Won't affect mobs without reagent processing.
 	var/icon_scale_percent				// Makes the holder's icon get scaled up or down.
@@ -208,13 +208,13 @@
 		effects += "You move at maximum speed, and cannot be slowed by any means."

 	if(!isnull(evasion))
-		effects += "You are [abs(evasion * 15)]% [evasion > 0 ? "harder" : "easier"] to hit with weapons."
+		effects += "You are [abs(evasion)]% [evasion > 0 ? "harder" : "easier"] to hit with weapons."

 	if(!isnull(bleeding_rate_percent))
 		effects += "You bleed [multipler_to_percentage(bleeding_rate_percent, TRUE)] [bleeding_rate_percent > 1.0 ? "faster" : "slower"]."

 	if(!isnull(accuracy))
-		effects += "It is [abs(accuracy * 15)]% [accuracy > 0 ? "easier" : "harder"] for you to hit someone with a ranged weapon."
+		effects += "It is [abs(accuracy)]% [accuracy > 0 ? "easier" : "harder"] for you to hit someone with a ranged weapon."

 	if(!isnull(accuracy_dispersion))
 		effects += "Projectiles you fire are [accuracy_dispersion > 0 ? "more" : "less"] likely to stray from your intended target."
--- a/code/modules/mob/_modifiers/modifiers_misc.dm
+++ b/code/modules/mob/_modifiers/modifiers_misc.dm
@@ -60,9 +60,9 @@ the artifact triggers the rage.
 	pain_immunity = TRUE					// Avoid falling over from shock (at least until it expires).

 	// The less good stuff.
-	accuracy = -5							// Aiming requires focus.
+	accuracy = -75							// Aiming requires focus.
 	accuracy_dispersion = 3					// Ditto.
-	evasion = -3							// Too angry to dodge.
+	evasion = -45							// Too angry to dodge.

 	var/nutrition_cost = 150
 	var/exhaustion_duration = 2 MINUTES 	// How long the exhaustion modifier lasts after it expires. Set to 0 to not apply one.
@@ -157,7 +157,7 @@ the artifact triggers the rage.
 	attack_speed_percent = 1.5
 	outgoing_melee_damage_percent = 0.6
 	disable_duration_percent = 1.5
-	evasion = -2
+	evasion = -30

 /datum/modifier/berserk_exhaustion/on_applied()
 	holder.visible_message("<span class='warning'>\The [holder] looks exhausted.</span>")
@@ -177,6 +177,6 @@ the artifact triggers the rage.
 	stacks = MODIFIER_STACK_EXTEND

 	// Just being mad isn't gonna overclock your body when you're a beepboop.
-	accuracy = -5				// Aiming requires focus.
+	accuracy = -75				// Aiming requires focus.
 	accuracy_dispersion = 3		// Ditto.
-	evasion = -3				// Too angry to dodge.
+	evasion = -45				// Too angry to dodge.
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -135,7 +135,7 @@
 	msg += "<br>"

 	//uniform
-	if(w_uniform && !skipjumpsuit)
+	if(w_uniform && !skipjumpsuit && w_uniform.show_examine)
 		//Ties
 		var/tie_msg
 		if(istype(w_uniform,/obj/item/clothing/under) && !skiptie)
@@ -144,7 +144,7 @@
 				if(skipholster)
 					var/list/accessories_visible = new/list() //please let this fix the stupid fucking runtimes
 					for(var/obj/item/clothing/accessory/A in U.accessories)
-						if(A.concealed_holster == 0)
+						if(A.concealed_holster == 0 && A.show_examine)
 							accessories_visible.Add(A)
 					if(accessories_visible.len)
 						tie_msg += ". Attached to it is [lowertext(english_list(accessories_visible))]"
@@ -156,7 +156,7 @@
 			msg += "[T.He] [T.is] wearing \icon[w_uniform] \a [w_uniform][tie_msg].\n"

 	//head
-	if(head)
+	if(head && head.show_examine)
 		if(head.blood_DNA)
 			msg += "<span class='warning'>[T.He] [T.is] wearing \icon[head] [head.gender==PLURAL?"some":"a"] [(head.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [head.name] on [T.his] head!</span>\n"
 		else
@@ -176,35 +176,35 @@
 			msg += "[T.He] [T.is] wearing \icon[wear_suit] \a [wear_suit][tie_msg].\n"

 		//suit/armour storage
-		if(s_store && !skipsuitstorage)
+		if(s_store && !skipsuitstorage && s_store.show_examine)
 			if(s_store.blood_DNA)
 				msg += "<span class='warning'>[T.He] [T.is] carrying \icon[s_store] [s_store.gender==PLURAL?"some":"a"] [(s_store.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [s_store.name] on [T.his] [wear_suit.name]!</span>\n"
 			else
 				msg += "[T.He] [T.is] carrying \icon[s_store] \a [s_store] on [T.his] [wear_suit.name].\n"

 	//back
-	if(back)
+	if(back && back.show_examine)
 		if(back.blood_DNA)
 			msg += "<span class='warning'>[T.He] [T.has] \icon[back] [back.gender==PLURAL?"some":"a"] [(back.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [back] on [T.his] back.</span>\n"
 		else
 			msg += "[T.He] [T.has] \icon[back] \a [back] on [T.his] back.\n"

 	//left hand
-	if(l_hand)
+	if(l_hand && l_hand.show_examine)
 		if(l_hand.blood_DNA)
 			msg += "<span class='warning'>[T.He] [T.is] holding \icon[l_hand] [l_hand.gender==PLURAL?"some":"a"] [(l_hand.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [l_hand.name] in [T.his] left hand!</span>\n"
 		else
 			msg += "[T.He] [T.is] holding \icon[l_hand] \a [l_hand] in [T.his] left hand.\n"

 	//right hand
-	if(r_hand)
+	if(r_hand && r_hand.show_examine)
 		if(r_hand.blood_DNA)
 			msg += "<span class='warning'>[T.He] [T.is] holding \icon[r_hand] [r_hand.gender==PLURAL?"some":"a"] [(r_hand.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [r_hand.name] in [T.his] right hand!</span>\n"
 		else
 			msg += "[T.He] [T.is] holding \icon[r_hand] \a [r_hand] in [T.his] right hand.\n"

 	//gloves
-	if(gloves && !skipgloves)
+	if(gloves && !skipgloves && gloves.show_examine)
 		if(gloves.blood_DNA)
 			msg += "<span class='warning'>[T.He] [T.has] \icon[gloves] [gloves.gender==PLURAL?"some":"a"] [(gloves.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [gloves.name] on [T.his] hands!</span>\n"
 		else
@@ -213,7 +213,7 @@
 		msg += "<span class='warning'>[T.He] [T.has] [(hand_blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained hands!</span>\n"

 	//handcuffed?
-	if(handcuffed)
+	if(handcuffed && handcuffed.show_examine)
 		if(istype(handcuffed, /obj/item/weapon/handcuffs/cable))
 			msg += "<span class='warning'>[T.He] [T.is] \icon[handcuffed] restrained with cable!</span>\n"
 		else
@@ -224,14 +224,14 @@
 		msg += "<span class='warning'>[T.He] [T.is] \icon[buckled] buckled to [buckled]!</span>\n"

 	//belt
-	if(belt)
+	if(belt && belt.show_examine)
 		if(belt.blood_DNA)
 			msg += "<span class='warning'>[T.He] [T.has] \icon[belt] [belt.gender==PLURAL?"some":"a"] [(belt.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [belt.name] about [T.his] waist!</span>\n"
 		else
 			msg += "[T.He] [T.has] \icon[belt] \a [belt] about [T.his] waist.\n"

 	//shoes
-	if(shoes && !skipshoes)
+	if(shoes && !skipshoes && shoes.show_examine)
 		if(shoes.blood_DNA)
 			msg += "<span class='warning'>[T.He] [T.is] wearing \icon[shoes] [shoes.gender==PLURAL?"some":"a"] [(shoes.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [shoes.name] on [T.his] feet!</span>\n"
 		else
@@ -240,7 +240,7 @@
 		msg += "<span class='warning'>[T.He] [T.has] [(feet_blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained feet!</span>\n"

 	//mask
-	if(wear_mask && !skipmask)
+	if(wear_mask && !skipmask && wear_mask.show_examine)
 		var/descriptor = "on [T.his] face"
 		if(istype(wear_mask, /obj/item/weapon/grenade) && check_has_mouth())
 			descriptor = "in [T.his] mouth"
@@ -251,22 +251,22 @@
 			msg += "[T.He] [T.has] \icon[wear_mask] \a [wear_mask] [descriptor].\n"

 	//eyes
-	if(glasses && !skipeyes)
+	if(glasses && !skipeyes && glasses.show_examine)
 		if(glasses.blood_DNA)
 			msg += "<span class='warning'>[T.He] [T.has] \icon[glasses] [glasses.gender==PLURAL?"some":"a"] [(glasses.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [glasses] covering [T.his] eyes!</span>\n"
 		else
 			msg += "[T.He] [T.has] \icon[glasses] \a [glasses] covering [T.his] eyes.\n"

 	//left ear
-	if(l_ear && !skipears)
+	if(l_ear && !skipears && l_ear.show_examine)
 		msg += "[T.He] [T.has] \icon[l_ear] \a [l_ear] on [T.his] left ear.\n"

 	//right ear
-	if(r_ear && !skipears)
+	if(r_ear && !skipears && r_ear.show_examine)
 		msg += "[T.He] [T.has] \icon[r_ear] \a [r_ear] on [T.his] right ear.\n"

 	//ID
-	if(wear_id)
+	if(wear_id && wear_id.show_examine)
 		/*var/id
 		if(istype(wear_id, /obj/item/device/pda))
 			var/obj/item/device/pda/pda = wear_id
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1042,10 +1042,10 @@
 		return
 	return md5(dna.uni_identity)

-/mob/living/carbon/human/clean_blood(var/clean_feet)
+/mob/living/carbon/human/clean_blood(var/washshoes)
 	.=..()
 	gunshot_residue = null
-	if(clean_feet && !shoes && istype(feet_blood_DNA, /list) && feet_blood_DNA.len)
+	if(washshoes && !shoes && istype(feet_blood_DNA, /list) && feet_blood_DNA.len)
 		feet_blood_color = null
 		feet_blood_DNA.Cut()
 		feet_blood_DNA = null
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -261,12 +261,13 @@
 			var/real_damage = rand_damage
 			var/hit_dam_type = attack.damage_type
 			real_damage += attack.get_unarmed_damage(H)
-			if(H.gloves && istype(H.gloves, /obj/item/clothing/gloves))
-				var/obj/item/clothing/gloves/G = H.gloves
-				real_damage += G.punch_force
-				hit_dam_type = G.punch_damtype
-				if(H.pulling_punches)	//SO IT IS DECREED: PULLING PUNCHES WILL PREVENT THE ACTUAL DAMAGE FROM RINGS AND KNUCKLES, BUT NOT THE ADDED PAIN
-					hit_dam_type = AGONY
+			if(H.gloves)
+				if(istype(H.gloves, /obj/item/clothing/gloves))
+					var/obj/item/clothing/gloves/G = H.gloves
+					real_damage += G.punch_force
+					hit_dam_type = G.punch_damtype
+					if(H.pulling_punches)	//SO IT IS DECREED: PULLING PUNCHES WILL PREVENT THE ACTUAL DAMAGE FROM RINGS AND KNUCKLES, BUT NOT THE ADDED PAIN
+						hit_dam_type = AGONY
 			real_damage *= damage_multiplier
 			rand_damage *= damage_multiplier
 			if(HULK in H.mutations)
@@ -343,7 +344,7 @@
 /mob/living/carbon/human/proc/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, inrange, params)
 	return

-/mob/living/carbon/human/attack_generic(var/mob/user, var/damage, var/attack_message)
+/mob/living/carbon/human/attack_generic(var/mob/user, var/damage, var/attack_message, var/armor_type = "melee", var/armor_pen = 0, var/a_sharp = 0, var/a_edge = 0)

 	if(!damage)
 		return
@@ -355,9 +356,9 @@

 	var/dam_zone = pick(organs_by_name)
 	var/obj/item/organ/external/affecting = get_organ(ran_zone(dam_zone))
-	var/armor_block = run_armor_check(affecting, "melee")
-	var/armor_soak = get_armor_soak(affecting, "melee")
-	apply_damage(damage, BRUTE, affecting, armor_block, armor_soak)
+	var/armor_block = run_armor_check(affecting, armor_type, armor_pen)
+	var/armor_soak = get_armor_soak(affecting, armor_type, armor_pen)
+	apply_damage(damage, BRUTE, affecting, armor_block, armor_soak, sharp = a_sharp, edge = a_edge)
 	updatehealth()
 	return 1

--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -3,6 +3,9 @@ Add fingerprints to items when we put them in our hands.
 This saves us from having to call add_fingerprint() any time something is put in a human's hands programmatically.
 */

+/mob/living/carbon/human
+	var/list/worn_clothing = list()	//Contains all CLOTHING items worn
+
 /mob/living/carbon/human/verb/quick_equip()
 	set name = "quick-equip"
 	set hidden = 1
@@ -86,6 +89,7 @@ This saves us from having to call add_fingerprint() any time something is put in
 	if (W == wear_suit)
 		if(s_store)
 			drop_from_inventory(s_store)
+		worn_clothing -= wear_suit
 		wear_suit = null
 		update_inv_wear_suit()
 	else if (W == w_uniform)
@@ -96,16 +100,21 @@ This saves us from having to call add_fingerprint() any time something is put in
 		if (wear_id)
 			drop_from_inventory(wear_id)
 		if (belt)
+			worn_clothing -= belt
 			drop_from_inventory(belt)
+		worn_clothing -= w_uniform
 		w_uniform = null
 		update_inv_w_uniform()
 	else if (W == gloves)
+		worn_clothing -= gloves
 		gloves = null
 		update_inv_gloves()
 	else if (W == glasses)
+		worn_clothing -= glasses
 		glasses = null
 		update_inv_glasses()
 	else if (W == head)
+		worn_clothing -= head
 		head = null
 		if(istype(W, /obj/item))
 			var/obj/item/I = W
@@ -121,12 +130,15 @@ This saves us from having to call add_fingerprint() any time something is put in
 		r_ear = null
 		update_inv_ears()
 	else if (W == shoes)
+		worn_clothing -= shoes
 		shoes = null
 		update_inv_shoes()
 	else if (W == belt)
+		worn_clothing -= belt
 		belt = null
 		update_inv_belt()
 	else if (W == wear_mask)
+		worn_clothing -= wear_mask
 		wear_mask = null
 		if(istype(W, /obj/item))
 			var/obj/item/I = W
@@ -187,15 +199,21 @@ This saves us from having to call add_fingerprint() any time something is put in
 //set redraw_mob to 0 if you don't wish the hud to be updated - if you're doing it manually in your own proc.
 /mob/living/carbon/human/equip_to_slot(obj/item/W as obj, slot, redraw_mob = 1)

-	if(!slot) return
-	if(!istype(W)) return
-	if(!has_organ_for_slot(slot)) return
-	if(!species || !species.hud || !(slot in species.hud.equip_slots)) return
+	if(!slot)
+		return
+	if(!istype(W))
+		return
+	if(!has_organ_for_slot(slot))
+		return
+	if(!species || !species.hud || !(slot in species.hud.equip_slots))
+		return
+
 	W.loc = src
 	switch(slot)
 		if(slot_back)
 			src.back = W
 			W.equipped(src, slot)
+			worn_clothing += back
 			update_inv_back(redraw_mob)
 		if(slot_wear_mask)
 			src.wear_mask = W
@@ -203,6 +221,7 @@ This saves us from having to call add_fingerprint() any time something is put in
 				update_hair(redraw_mob)	//rebuild hair
 				update_inv_ears(0)
 			W.equipped(src, slot)
+			worn_clothing += wear_mask
 			update_inv_wear_mask(redraw_mob)
 		if(slot_handcuffed)
 			src.handcuffed = W
@@ -222,6 +241,7 @@ This saves us from having to call add_fingerprint() any time something is put in
 		if(slot_belt)
 			src.belt = W
 			W.equipped(src, slot)
+			worn_clothing += belt
 			update_inv_belt(redraw_mob)
 		if(slot_wear_id)
 			src.wear_id = W
@@ -252,6 +272,7 @@ This saves us from having to call add_fingerprint() any time something is put in
 		if(slot_gloves)
 			src.gloves = W
 			W.equipped(src, slot)
+			worn_clothing += glasses
 			update_inv_gloves(redraw_mob)
 		if(slot_head)
 			src.head = W
@@ -262,18 +283,22 @@ This saves us from having to call add_fingerprint() any time something is put in
 			if(istype(W,/obj/item/clothing/head/kitty))
 				W.update_icon(src)
 			W.equipped(src, slot)
+			worn_clothing += head
 			update_inv_head(redraw_mob)
 		if(slot_shoes)
 			src.shoes = W
 			W.equipped(src, slot)
+			worn_clothing += shoes
 			update_inv_shoes(redraw_mob)
 		if(slot_wear_suit)
 			src.wear_suit = W
 			W.equipped(src, slot)
+			worn_clothing += wear_suit
 			update_inv_wear_suit(redraw_mob)
 		if(slot_w_uniform)
 			src.w_uniform = W
 			W.equipped(src, slot)
+			worn_clothing += w_uniform
 			update_inv_w_uniform(redraw_mob)
 		if(slot_l_store)
 			src.l_store = W
@@ -292,8 +317,8 @@ This saves us from having to call add_fingerprint() any time something is put in
 				src.remove_from_mob(W)
 			W.loc = src.back
 		if(slot_tie)
-			var/obj/item/clothing/under/uniform = src.w_uniform
-			uniform.attackby(W,src)
+			for(var/obj/item/clothing/C in worn_clothing)
+				C.attackby(W, usr)
 		else
 			src << "<font color='red'>You are trying to eqip this item to an unsupported inventory slot. How the heck did you manage that? Stop it...</font>"
 			return
--- a/code/modules/mob/living/carbon/human/species/station/prometheans.dm
+++ b/code/modules/mob/living/carbon/human/species/station/prometheans.dm
@@ -150,11 +150,14 @@ var/datum/species/shapeshifter/promethean/prometheans
 			H.nutrition += rand(15, 45)
 VOREStation Removal End */
 	// Heal remaining damage.
-	if(H.getBruteLoss() || H.getFireLoss() || H.getOxyLoss() || H.getToxLoss())
-		H.adjustBruteLoss(-heal_rate)
-		H.adjustFireLoss(-heal_rate)
-		H.adjustOxyLoss(-heal_rate)
-		H.adjustToxLoss(-heal_rate)
+	if(H.fire_stacks >= 0)
+		if(H.getBruteLoss() || H.getFireLoss() || H.getOxyLoss() || H.getToxLoss())
+			H.adjustBruteLoss(-heal_rate)
+			H.adjustFireLoss(-heal_rate)
+			H.adjustOxyLoss(-heal_rate)
+			H.adjustToxLoss(-heal_rate)
+	else
+		H.adjustToxLoss(2*heal_rate)	// Doubled because 0.5 is miniscule, and fire_stacks are capped in both directions

 /datum/species/shapeshifter/promethean/get_blood_colour(var/mob/living/carbon/human/H)
 	return (H ? rgb(H.r_skin, H.g_skin, H.b_skin) : ..())
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -427,20 +427,24 @@ var/global/list/damage_icon_parts = list()
 			var/icon/temp = part.get_icon(skeleton)
 			//That part makes left and right legs drawn topmost and lowermost when human looks WEST or EAST
 			//And no change in rendering for other parts (they icon_position is 0, so goes to 'else' part)
-			if(part.icon_position & (LEFT | RIGHT))
+			if(part.icon_position == RIGHT)
 				var/icon/temp2 = new('icons/mob/human.dmi',"blank")
+				var/icon/temp3 = new('icons/mob/human.dmi',"blank")
 				temp2.Insert(new/icon(temp,dir=NORTH),dir=NORTH)
 				temp2.Insert(new/icon(temp,dir=SOUTH),dir=SOUTH)
-				if(!(part.icon_position & LEFT))
-					temp2.Insert(new/icon(temp,dir=EAST),dir=EAST)
-				if(!(part.icon_position & RIGHT))
-					temp2.Insert(new/icon(temp,dir=WEST),dir=WEST)
+				temp2.Insert(new/icon(temp,dir=EAST),dir=EAST)
 				base_icon.Blend(temp2, ICON_OVERLAY)
-				if(part.icon_position & LEFT)
-					temp2.Insert(new/icon(temp,dir=EAST),dir=EAST)
-				if(part.icon_position & RIGHT)
-					temp2.Insert(new/icon(temp,dir=WEST),dir=WEST)
-				base_icon.Blend(temp2, ICON_UNDERLAY)
+				temp3.Insert(new/icon(temp,dir=WEST),dir=WEST)
+				base_icon.Blend(temp3, ICON_UNDERLAY)
+			else if(part.icon_position == LEFT)
+				var/icon/temp2 = new('icons/mob/human.dmi',"blank")
+				var/icon/temp3 = new('icons/mob/human.dmi',"blank")
+				temp2.Insert(new/icon(temp,dir=NORTH),dir=NORTH)
+				temp2.Insert(new/icon(temp,dir=SOUTH),dir=SOUTH)
+				temp2.Insert(new/icon(temp,dir=WEST),dir=WEST)
+				base_icon.Blend(temp2, ICON_OVERLAY)
+				temp3.Insert(new/icon(temp,dir=EAST),dir=EAST)
+				base_icon.Blend(temp3, ICON_UNDERLAY)
 			else if(part.icon_position & UNDER)
 				base_icon.Blend(temp, ICON_UNDERLAY)
 			else
@@ -671,7 +675,7 @@ var/global/list/damage_icon_parts = list()
 	update_fire(0)
 	update_water(0)
 	update_surgery(0)
-	UpdateDamageIcon()
+	UpdateDamageIcon(0)
 	update_icons_layers(0)
 	update_icons_huds(0)
 	update_icons()
@@ -1019,6 +1023,13 @@ var/global/list/damage_icon_parts = list()
 			standing = image(base)
 		else
 			standing.color = head.color
+
+		// Accessories - copied from uniform, BOILERPLATE because fuck this system.
+		var/obj/item/clothing/head/hat = head
+		if(istype(hat) && hat.accessories.len)
+			for(var/obj/item/clothing/accessory/A in hat.accessories)
+				standing.overlays |= A.get_mob_overlay()
+
 		overlays_standing[HEAD_LAYER] = standing

 	else
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -892,6 +892,18 @@
 								cleaned_human.update_inv_shoes(0)
 							cleaned_human.clean_blood(1)
 							cleaned_human << "<font color='red'>[src] cleans your face!</font>"
+
+		if((module_state_1 && istype(module_state_1, /obj/item/weapon/storage/bag/ore)) || (module_state_2 && istype(module_state_2, /obj/item/weapon/storage/bag/ore)) || (module_state_3 && istype(module_state_3, /obj/item/weapon/storage/bag/ore))) //Borgs and drones can use their mining bags ~automagically~ if they're deployed in a slot. Only mining bags, as they're optimized for mass use.
+			var/obj/item/weapon/storage/bag/ore/B = null
+			if(istype(module_state_1, /obj/item/weapon/storage/bag/ore)) //First orebag has priority, if they for some reason have multiple.
+				B = module_state_1
+			else if(istype(module_state_2, /obj/item/weapon/storage/bag/ore))
+				B = module_state_2
+			else if(istype(module_state_3, /obj/item/weapon/storage/bag/ore))
+				B = module_state_3
+			var/turf/tile = loc
+			if(isturf(tile))
+				B.gather_all(tile, src, 1) //Shhh, unless the bag fills, don't spam the borg's chat with stuff that's going on every time they move!
 		return

 /mob/living/silicon/robot/proc/self_destruct()
--- a/code/modules/mob/living/simple_animal/animals/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/animals/giant_spider.dm
@@ -78,6 +78,18 @@ Nurse Family
 	var/atom/cocoon_target
 	var/egg_inject_chance = 5

+/mob/living/simple_animal/hostile/giant_spider/nurse/medical
+	desc = "Furry and beige, it makes you shudder to look at it. This one has brilliant green eyes and a tiny nurse hat."
+	icon_state = "nursemed"
+	icon_living = "nursemed"
+	icon_dead = "nursemed_dead"
+
+	melee_damage_lower = 8
+	melee_damage_upper = 16
+	poison_type = "tramadol"
+	poison_chance = 15
+
+
 /mob/living/simple_animal/hostile/giant_spider/nurse/queen
 	desc = "Absolutely gigantic, this creature is horror itself."
 	icon = 'icons/mob/64x64.dmi'
--- a/code/modules/mob/living/simple_animal/animals/sif_wildlife/diyaab.dm
+++ b/code/modules/mob/living/simple_animal/animals/sif_wildlife/diyaab.dm
@@ -18,7 +18,7 @@
 	melee_damage_lower = 1
 	melee_damage_upper = 8

-	attacktext = "gouged"
+	attacktext = list("gouged")
 	cold_damage_per_tick = 0

 	speak_chance = 5
--- a/code/modules/mob/living/simple_animal/animals/sif_wildlife/savik.dm
+++ b/code/modules/mob/living/simple_animal/animals/sif_wildlife/savik.dm
@@ -17,7 +17,7 @@
 	melee_damage_lower = 15
 	melee_damage_upper = 25

-	attacktext = "mauled"
+	attacktext = list("mauled")
 	cold_damage_per_tick = 0

 	speak_chance = 5
--- a/code/modules/mob/living/simple_animal/animals/sif_wildlife/shantak.dm
+++ b/code/modules/mob/living/simple_animal/animals/sif_wildlife/shantak.dm
@@ -17,7 +17,7 @@
 	melee_damage_lower = 3
 	melee_damage_upper = 12

-	attacktext = "gouged"
+	attacktext = list("gouged")
 	cold_damage_per_tick = 0

 	speak_chance = 5
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -119,6 +119,10 @@
 	var/melee_miss_chance = 15		// percent chance to miss a melee attack.
 	var/melee_attack_minDelay = 5		// How long between attacks at least
 	var/melee_attack_maxDelay = 10		// How long between attacks at most
+	var/attack_armor_type = "melee"		// What armor does this check?
+	var/attack_armor_pen = 0			// How much armor pen this attack has.
+	var/attack_sharp = 0				// Is the attack sharp?
+	var/attack_edge = 0					// Does the attack have an edge?

 	//Special attacks
 	var/spattack_prob = 0			// Chance of the mob doing a special attack (0 for never)
@@ -663,7 +667,6 @@
 		if(istype(O, /obj/item/weapon/material/knife) || istype(O, /obj/item/weapon/material/knife/butch))
 			harvest(user)
 	else
-		O.attack(src, user, user.zone_sel.selecting)
 		ai_log("attackby() I was weapon'd by: [user]",2)
 		if(O.force)
 			react_to_attack(user)
@@ -1296,7 +1299,7 @@
 		if(H.check_shields(damage = damage_to_do, damage_source = src, attacker = src, def_zone = null, attack_text = "the attack"))
 			return FALSE

-	if(A.attack_generic(src, damage_to_do, pick(attacktext)) && attack_sound)
+	if(A.attack_generic(src, damage_to_do, pick(attacktext), attack_armor_type, attack_armor_pen, attack_sharp, attack_edge) && attack_sound)
 		playsound(src, attack_sound, 75, 1)

 	return TRUE
--- a/code/modules/mob/living/simple_animal/simple_hud.dm
+++ b/code/modules/mob/living/simple_animal/simple_hud.dm
@@ -74,7 +74,7 @@
 	ico = new(ui_style, "black")
 	ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
 	ico.DrawBox(rgb(255,255,255,1),1,ico.Height()/2,ico.Width()/2,ico.Height())
-	using = new /obj/screen( src )
+	using = new /obj/screen()
 	using.name = I_HELP
 	using.icon = ico
 	using.screen_loc = ui_acti
@@ -86,7 +86,7 @@
 	ico = new(ui_style, "black")
 	ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
 	ico.DrawBox(rgb(255,255,255,1),ico.Width()/2,ico.Height()/2,ico.Width(),ico.Height())
-	using = new /obj/screen( src )
+	using = new /obj/screen()
 	using.name = I_DISARM
 	using.icon = ico
 	using.screen_loc = ui_acti
@@ -98,7 +98,7 @@
 	ico = new(ui_style, "black")
 	ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
 	ico.DrawBox(rgb(255,255,255,1),ico.Width()/2,1,ico.Width(),ico.Height()/2)
-	using = new /obj/screen( src )
+	using = new /obj/screen()
 	using.name = I_GRAB
 	using.icon = ico
 	using.screen_loc = ui_acti
@@ -110,7 +110,7 @@
 	ico = new(ui_style, "black")
 	ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
 	ico.DrawBox(rgb(255,255,255,1),1,1,ico.Width()/2,ico.Height()/2)
-	using = new /obj/screen( src )
+	using = new /obj/screen()
 	using.name = I_HURT
 	using.icon = ico
 	using.screen_loc = ui_acti
--- a/code/modules/mob/living/simple_animal/slime/combat.dm
+++ b/code/modules/mob/living/simple_animal/slime/combat.dm
@@ -180,7 +180,7 @@
 				var/damage_to_do = rand(melee_damage_lower, melee_damage_upper)
 				var/armor_modifier = abs((L.getarmor(null, "bio") / 100) - 1)

-				L.attack_generic(src, damage_to_do, attacktext)
+				L.attack_generic(src, damage_to_do, pick(attacktext))
 				playsound(src, 'sound/weapons/bite.ogg', 75, 1)

 				// Give the slime some nutrition, if applicable.
@@ -199,7 +199,7 @@

 	if(istype(L,/obj/mecha))
 		var/obj/mecha/M = L
-		M.attack_generic(src, rand(melee_damage_lower, melee_damage_upper), attacktext)
+		M.attack_generic(src, rand(melee_damage_lower, melee_damage_upper), pick(attacktext))

 /mob/living/simple_animal/slime/proc/post_attack(var/mob/living/L, var/intent = I_HURT)
 	if(intent != I_HELP)
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -334,14 +334,24 @@
 	if(!IsJobAvailable(rank))
 		src << alert("[rank] is not available. Please try another.")
 		return 0
-	if (!attempt_vr(src,"spawn_checks_vr",list())) return 0 // VOREStation Insert
+	if(!attempt_vr(src,"spawn_checks_vr",list())) return 0 // VOREStation Insert
+	if(!client)
+		return 0
+
+	//Find our spawning point.
+	var/list/join_props = job_master.LateSpawn(client, rank)
+	var/turf/T = join_props["turf"]
+	var/join_message = join_props["msg"]
+
+	if(!T || !join_message)
+		return 0

 	spawning = 1
 	close_spawn_windows()

 	job_master.AssignRole(src, rank, 1)

-	var/mob/living/character = create_character()	//creates the human and transfers vars and mind
+	var/mob/living/character = create_character(T)	//creates the human and transfers vars and mind
 	character = job_master.EquipRank(character, rank, 1)					//equips the human
 	UpdateFactionList(character)

@@ -363,14 +373,11 @@
 		qdel(src)
 		return

-	//Find our spawning point.
-	var/join_message = job_master.LateSpawn(character, rank)
 	// Equip our custom items only AFTER deploying to spawn points eh?
 	equip_custom_items(character)

 	//character.apply_traits() //VOREStation Removal

-	// character.lastarea = get_area(loc) //create_character() does this
 	// Moving wheelchair if they have one
 	if(character.buckled && istype(character.buckled, /obj/structure/bed/chair/wheelchair))
 		character.buckled.loc = character.loc
@@ -428,7 +435,7 @@
 	src << browse(dat, "window=latechoices;size=300x640;can_close=1")


-/mob/new_player/proc/create_character()
+/mob/new_player/proc/create_character(var/turf/T)
 	if (!attempt_vr(src,"spawn_checks_vr",list())) return 0 // VOREStation Insert
 	spawning = 1
 	close_spawn_windows()
@@ -444,12 +451,12 @@
 	if(chosen_species && use_species_name)
 		// Have to recheck admin due to no usr at roundstart. Latejoins are fine though.
 		if(is_alien_whitelisted(chosen_species))
-			new_character = new(loc, use_species_name)
+			new_character = new(T, use_species_name)

 	if(!new_character)
-		new_character = new(loc)
+		new_character = new(T)

-	new_character.lastarea = get_area(loc)
+	new_character.lastarea = get_area(T)

 	if(ticker.random_players)
 		new_character.gender = pick(MALE, FEMALE)
--- a/code/modules/nano/interaction/default.dm
+++ b/code/modules/nano/interaction/default.dm
@@ -17,7 +17,7 @@
 	return STATUS_UPDATE									// Ghosts can view updates

 /mob/living/silicon/pai/default_can_use_topic(var/src_object)
-	if((src_object == src || src_object == radio) && !stat)
+	if((src_object == src || src_object == radio || src_object == communicator) && !stat)
 		return STATUS_INTERACTIVE
 	else
 		return ..()
--- a/code/modules/organs/internal/eyes.dm
+++ b/code/modules/organs/internal/eyes.dm
@@ -96,6 +96,6 @@

 /obj/item/organ/internal/eyes/emp_act(severity)
 	// ..()	//Returns if the organ isn't robotic // VOREStation Edit - Don't take damage
-	if(!(robotic >= ORGAN_ASSISTED))
+	if(robotic >= ORGAN_ASSISTED)
 		return
 	owner.eye_blurry += (4/severity)
--- a/code/modules/organs/organ.dm
+++ b/code/modules/organs/organ.dm
@@ -83,13 +83,13 @@ var/list/organ_cache = list()
 			blood_DNA[dna.unique_enzymes] = dna.b_type

 /obj/item/organ/proc/die()
-	if(robotic >= ORGAN_ROBOT)
-		return
+	if(robotic < ORGAN_ROBOT)
+		status |= ORGAN_DEAD
 	damage = max_damage
-	status |= ORGAN_DEAD
 	processing_objects -= src
 	if(owner && vital)
 		owner.death()
+		owner.can_defib = 0

 /obj/item/organ/proc/adjust_germ_level(var/amount)		// Unless you're setting germ level directly to 0, use this proc instead
 	germ_level = Clamp(germ_level + amount, 0, INFECTION_LEVEL_MAX)
@@ -107,6 +107,11 @@ var/list/organ_cache = list()
 		return
 	if(preserved)
 		return
+
+	//check if we've hit max_damage
+	if(damage >= max_damage)
+		die()
+
 	//Process infections
 	if(robotic >= ORGAN_ROBOT || (owner && owner.species && (owner.species.flags & IS_PLANT || (owner.species.flags & NO_INFECT))))
 		germ_level = 0
@@ -132,10 +137,6 @@ var/list/organ_cache = list()
 		handle_rejection()
 		handle_germ_effects()

-	//check if we've hit max_damage
-	if(damage >= max_damage)
-		die()
-
 /obj/item/organ/examine(mob/user)
 	..(user)
 	if(status & ORGAN_DEAD)
@@ -329,6 +330,7 @@ var/list/organ_cache = list()
 			owner.attack_log += "\[[time_stamp()]\]<font color='orange'> had a vital organ ([src]) removed by [user.name] ([user.ckey]) (INTENT: [uppertext(user.a_intent)])</font>"
 			msg_admin_attack("[user.name] ([user.ckey]) removed a vital organ ([src]) from [owner.name] ([owner.ckey]) (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 		owner.death()
+		owner.can_defib = 0

 	owner = null

--- a/code/modules/organs/organ_icon.dm
+++ b/code/modules/organs/organ_icon.dm
@@ -18,7 +18,7 @@ var/global/list/limb_icon_cache = list()
 	h_col = null
 	if(robotic >= ORGAN_ROBOT)
 		var/datum/robolimb/franchise = all_robolimbs[model]
-		if(!(franchise && franchise.lifelike))
+		if(!(franchise && franchise.skin_tone))
 			if(human.synth_color)
 				s_col = list(human.r_synth, human.g_synth, human.b_synth)
 			return
@@ -36,7 +36,7 @@ var/global/list/limb_icon_cache = list()
 	h_col = null
 	if(robotic >= ORGAN_ROBOT)
 		var/datum/robolimb/franchise = all_robolimbs[model]
-		if(!(franchise && franchise.lifelike))
+		if(!(franchise && franchise.skin_tone))
 			return
 	if(!isnull(dna.GetUIValue(DNA_UI_SKIN_TONE)) && (species.appearance_flags & HAS_SKIN_TONE))
 		s_tone = dna.GetUIValue(DNA_UI_SKIN_TONE)
--- a/code/modules/organs/robolimbs.dm
+++ b/code/modules/organs/robolimbs.dm
@@ -21,7 +21,7 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
 	scroll=ipc_scroll;\
 	console=ipc_console;\
 	glider=ipc_gol_glider;\
-	rainnbow=ipc_rainbow;\
+	rainbow=ipc_rainbow;\
 	smiley=ipc_smiley;\
 	database=ipc_database"

@@ -40,6 +40,7 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
 	var/unavailable_at_chargen                           // If set, not available at chargen.
 	var/unavailable_to_build							 // If set, can't be constructed.
 	var/lifelike										 // If set, appears organic.
+	var/skin_tone										 // If set, applies skin tone rather than part color
 	var/blood_color = "#030303"
 	var/list/species_cannot_use = list("Teshari")
 	var/list/monitor_styles			 		 			 //If empty, the model of limbs offers a head compatible with monitors.
@@ -100,7 +101,7 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
 	icon = 'icons/mob/human_races/cyberlimbs/cybersolutions/cybersolutions_alt2.dmi'
 	unavailable_to_build = 1
 	parts = list(BP_HEAD)
-	
+
 /datum/robolimb/cybersolutions_alt1
 	company = "Cyber Solutions - Wight"
 	desc = "This limb has cheap plastic panels mounted on grey metal."
@@ -198,6 +199,7 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
 	icon = 'icons/mob/human_races/cyberlimbs/veymed/veymed_main_vr.dmi' //Vorestation edit, fixing the color application
 	unavailable_to_build = 1
 	lifelike = 1
+	skin_tone = 1
 	blood_color = "#CCCCCC"
 	speech_bubble_appearance = "normal"

@@ -220,7 +222,6 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
 	icon = 'icons/mob/human_races/cyberlimbs/wardtakahashi/wardtakahashi_alt2.dmi'
 	unavailable_to_build = 1

-
 /datum/robolimb/wardtakahashi_monitor
 	company = "Ward-Takahashi Monitor"
 	desc = "Ward-Takahashi's unique spin on a popular prosthetic head model. It looks sleek and modern."
@@ -278,6 +279,7 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
 	desc = "This limb has a rubbery fleshtone covering with visible seams."
 	icon = 'icons/mob/human_races/cyberlimbs/zenghu/zenghu_main.dmi'
 	unavailable_to_build = 1
+	skin_tone = 1

 /obj/item/weapon/disk/limb
 	name = "Limb Blueprints"
--- a/code/modules/organs/subtypes/standard.dm
+++ b/code/modules/organs/subtypes/standard.dm
@@ -281,8 +281,6 @@
 		spawn(1)
 			owner.update_hair()
 	get_icon()
-	if(vital)	//This is just in case we ever add something that both a) Doesn't need a head to live, and b) Can be defibbed
-		owner.can_defib = 0
 	..()

 /obj/item/organ/external/head/take_damage(brute, burn, sharp, edge, used_weapon = null, list/forbidden_limbs = list())
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -622,3 +622,7 @@

 /obj/item/weapon/paper/crumpled/bloody
 	icon_state = "scrap_bloodied"
+
+/obj/item/weapon/paper/crumpled/bloody/CrashedMedShuttle
+	name = "Blackbox Transcript - VMV Aurora's Light"
+	info = "<I>\[The paper is torn at the top, presumably from the impact. It's oil-stained, but you can just about read it.]</I><BR> <B>mmons 19:52:01:</B> Come on... it's right there in the distance, we're almost there!<BR> <B>Doctor Nazarril 19:52:26:</B> Odysseus online. Orrderrs, sirr?<BR> <B>Captain Simmons 19:52:29:</B> Brace for impact. We're going in full-speed.<BR> <B>Technician Dynasty 19:52:44:</B> Chief, fire's spread to the secondary propulsion systems.<BR> <B>Captain Simmons 19:52:51:</B> Copy. Any word from TraCon? Transponder's down still?<BR> <B>Technician Dynasty 19:53:02:</B> Can't get in touch, sir. Emergency beacon's active, but we're not going t-<BR> <B>Doctor Nazarril 19:53:08:</B> Don't say it. As long as we believe, we'll get through this.<BR> <B>Captain Simmons 19:53:11:</B> Damn right. We're a few klicks out from the port. Rough landing, but we can do it.<BR> <B>V.I.T.A 19:53:26:</B> Vessel diagnostics complete. Engines one, two, three offline. Engine four status: critical. Transponder offline. Fire alarm in the patient bay.<BR> <B>A loud explosion is heard.</B><BR> <B>V.I.T.A 19:53:29:</B> Alert: fuel intake valve open.<BR> <B>Technician Dynasty 19:53:31:</B> ... ah.<BR> <B>Doctor Nazarril 19:53:34:</B> Trrranslate?<BR> <B>V.I.T.A 19:53:37:</B> There is a 16.92% chance of this vessel safely landing at the emergency destination. Note that there is an 83.08% chance of detonation of fuel supplies upon landing.<BR> <B>Technician Dynasty 19:53:48:</B> We'll make it, sure, but we'll explode and take out half the LZ with us. Propulsion's down, we can't slow down. If we land there, everyone in that port dies, no question.<BR> <B>V.I.T.A 19:53:53:</B> The Technician is correct.<BR> <B>Doctor Nazarril 19:54:02:</B> Then... we can't land therrre.<BR> <B>V.I.T.A 19:54:11:</B>  Analysing... recommended course of action: attempt emergency landing in isolated area. Chances of survival: negligible. <BR> <B>Captain Simmons 19:54:27:</B> I- alright. I'm bringing us down. You all know what this means.<BR> <B>Doctor Nazarril 19:54:33:</B> Sh... I- I understand. It's been- it's been an honorr, Captain, Dynasty, VITA.<BR> <B>Technician Dynasty 19:54:39:</B> We had a good run. I'm going to miss this.<BR> <B>Captain Simmons 19:54:47:</B> VITA. Tell them we died heroes. Tell them... we did all we could.<BR> <B>V.I.T.A 19:54:48:</B> I will. Impact in five. Four. Three.<BR> <B>Doctor Nazarril 19:54:49:</B> Oh, starrs... I- you werrre all the... best frriends she everr had. Thank you.<BR> <B>Technician Dynasty 19:54:50:</B> Any time, kid. Any time.<BR> <B>V.I.T.A 19:54:41:</B> Two.<BR><B>V.I.T.A 19:54:42:</B> One.<BR> **8/DEC/2561**<BR> <B>V.I.T.A 06:22:16:</B> Backup power restored. Attempting to establish connection with emergency rescue personnel.<BR> <B>V.I.T.A 06:22:17:</B> Unable to establish connection. Transponder destroyed on impact.<BR> <B>V.I.T.A 06:22:18:</B> No lifesigns detected on board.<BR> **1/JAN/2562**<BR> <B>V.I.T.A 00:00:00:</B> Happy New Year, crew.<BR> <B>V.I.T.A 00:00:01:</B> Power reserves: 41%. Diagnostics offline. Cameras offline. Communications offline.<BR> <B>V.I.T.A 00:00:02:</B> Nobody's coming.<BR> **14/FEB/2562**<BR> <B>V.I.T.A 00:00:00:</B> Roses are red.<BR> <B>V.I.T.A 00:00:01:</B> Violets are blue.<BR> <B>V.I.T.A 00:00:02:</B> Won't you come back?<BR> <B>V.I.T.A 00:00:03:</B> I miss you.<BR> **15/FEB/2562**<BR><B>V.I.T.A 22:19:06:</B> Power reserves critical. Transferring remaining power to emergency broadcasting beacon.<BR> <B>V.I.T.A 22:19:07:</B> Should anyone find this, lay them to rest. They deserve a proper burial.<BR> <B>V.I.T.A 22:19:08:</B> Erasing files... shutting down.<BR> <B>A low, monotone beep.</B><BR> **16/FEB/2562**<BR> <B>Something chitters.</B><BR> <B>End of transcript.</B>"
--- a/code/modules/planet/sif.dm
+++ b/code/modules/planet/sif.dm
@@ -234,6 +234,18 @@ datum/weather/sif
 			if(!T.outdoors)
 				continue // They're indoors, so no need to rain on them.

+			// If they have an open umbrella, it'll guard from rain
+			if(istype(L.get_active_hand(), /obj/item/weapon/melee/umbrella))
+				var/obj/item/weapon/melee/umbrella/U = L.get_active_hand()
+				if(U.open)
+					to_chat(L, "<span class='notice'>Rain patters softly onto your umbrella</span>")
+					continue
+			else if(istype(L.get_inactive_hand(), /obj/item/weapon/melee/umbrella))
+				var/obj/item/weapon/melee/umbrella/U = L.get_inactive_hand()
+				if(U.open)
+					to_chat(L, "<span class='notice'>Rain patters softly onto your umbrella</span>")
+					continue
+
 			L.water_act(1)
 			to_chat(L, "<span class='warning'>Rain falls on you.</span>")

@@ -258,6 +270,20 @@ datum/weather/sif
 			if(!T.outdoors)
 				continue // They're indoors, so no need to rain on them.

+			// If they have an open umbrella, it'll get stolen by the wind
+			if(istype(L.get_active_hand(), /obj/item/weapon/melee/umbrella))
+				var/obj/item/weapon/melee/umbrella/U = L.get_active_hand()
+				if(U.open)
+					to_chat(L, "<span class='warning'>A gust of wind yanks the umbrella from your hand!</span>")
+					L.drop_from_inventory(U)
+					U.throw_at(get_edge_target_turf(U, pick(alldirs)), 8, 1, L)
+			else if(istype(L.get_inactive_hand(), /obj/item/weapon/melee/umbrella))
+				var/obj/item/weapon/melee/umbrella/U = L.get_inactive_hand()
+				if(U.open)
+					to_chat(L, "<span class='warning'>A gust of wind yanks the umbrella from your hand!</span>")
+					L.drop_from_inventory(U)
+					U.throw_at(get_edge_target_turf(U, pick(alldirs)), 8, 1, L)
+
 			L.water_act(2)
 			to_chat(L, "<span class='warning'>Rain falls on you, drenching you in water.</span>")

@@ -282,6 +308,18 @@ datum/weather/sif
 			if(!T.outdoors)
 				continue // They're indoors, so no need to pelt them with ice.

+			// If they have an open umbrella, it'll guard from rain
+			if(istype(L.get_active_hand(), /obj/item/weapon/melee/umbrella))
+				var/obj/item/weapon/melee/umbrella/U = L.get_active_hand()
+				if(U.open)
+					to_chat(L, "<span class='notice'>Hail patters gently onto your umbrella.</span>")
+					continue
+			else if(istype(L.get_inactive_hand(), /obj/item/weapon/melee/umbrella))
+				var/obj/item/weapon/melee/umbrella/U = L.get_inactive_hand()
+				if(U.open)
+					to_chat(L, "<span class='notice'>Hail patters gently onto your umbrella.</span>")
+					continue
+
 			var/target_zone = pick(BP_ALL)
 			var/amount_blocked = L.run_armor_check(target_zone, "melee")
 			var/amount_soaked = L.get_armor_soak(target_zone, "melee")
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -99,7 +99,7 @@
 	fire_delay = 20
 	w_class = ITEMSIZE_LARGE
 //	one_handed_penalty = 90 // The thing's heavy and huge.
-	accuracy = 3
+	accuracy = 45
 	charge_cost = 600

 /obj/item/weapon/gun/energy/lasercannon/mounted
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -3,6 +3,7 @@
 	desc = "The NT Mk60 EW Halicon is a man portable anti-armor weapon designed to disable mechanical threats, produced by NT. Not the best of its type."
 	icon_state = "ionrifle"
 	item_state = "ionrifle"
+	wielded_item_state = "ionrifle-wielded"
 	origin_tech = list(TECH_COMBAT = 2, TECH_MAGNET = 4)
 	w_class = ITEMSIZE_LARGE
 	force = 10
@@ -33,7 +34,6 @@
 	charge_cost = 300
 	projectile_type = /obj/item/projectile/energy/phase

-
 /obj/item/weapon/gun/energy/decloner
 	name = "biological demolecularisor"
 	desc = "A gun that discharges high amounts of controlled radiation to slowly break a target into component elements."
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -53,6 +53,8 @@
 	name = "assault rifle"
 	desc = "The rugged STS-35 is a durable automatic weapon of a make popular on the frontier worlds. Uses 5.45mm rounds."
 	icon_state = "arifle"
+	item_state = "arifle"
+	wielded_item_state = "arifle-wielded"
 	item_state = null
 	w_class = ITEMSIZE_LARGE
 	force = 10
@@ -109,6 +111,7 @@
 	desc = "The Z8 Bulldog is an older model designated marksman rifle, made by the now defunct Zendai Foundries. Makes you feel like a space marine when you hold it, even though it can only hold 10 round magazines. Uses 7.62mm rounds and has an under barrel grenade launcher."
 	icon_state = "carbine" // This isn't a carbine. :T
 	item_state = "z8carbine"
+	wielded_item_state = "z8carbine-wielded"
 	w_class = ITEMSIZE_LARGE
 	force = 10
 	caliber = "7.62mm"
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
@@ -169,6 +169,18 @@
 		L.adjust_fire_stacks(-(amount / 5))
 		remove_self(needed)

+/datum/reagent/water/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+	if(alien == IS_SLIME)
+		M.adjustToxLoss(6 * removed)
+	else
+		..()
+
+/datum/reagent/fuel/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+	if(alien == IS_SLIME)
+		M.adjustToxLoss(6 * removed)
+	else
+		..()
+
 /datum/reagent/fuel
 	name = "Welding fuel"
 	id = "fuel"
--- a/code/modules/research/circuitprinter.dm
+++ b/code/modules/research/circuitprinter.dm
@@ -93,7 +93,7 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid).
 		if(materials[f] >= SHEET_MATERIAL_AMOUNT)
 			var/path = getMaterialType(f)
 			if(path)
-				var/obj/item/stack/S = new f(loc)
+				var/obj/item/stack/S = new path(loc)
 				S.amount = round(materials[f] / SHEET_MATERIAL_AMOUNT)
 	..()

--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -491,13 +491,13 @@ other types of metals and chemistry for reagents).
 	build_path = /obj/item/roller/adv
 	sort_string = "MBBAF"

-/datum/design/item/medical/enhanced_analyzer
-	name = "enhanced health analyzer"
+/datum/design/item/medical/improved_analyzer
+	name = "improved health analyzer"
 	desc = "A prototype version of the regular health analyzer, able to distinguish the location of more serious injuries as well as accurately determine radiation levels."
-	id = "advanced_analyzer"
+	id = "improved_analyzer"
 	req_tech = list(TECH_MAGNET = 5, TECH_BIO = 6)
 	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 1000, "silver" = 1000, "gold" = 1500)
-	build_path = /obj/item/device/healthanalyzer/advanced
+	build_path = /obj/item/device/healthanalyzer/improved
 	sort_string = "MBBAG"

 /datum/design/item/implant
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -258,7 +258,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 									qdel(S)
 									linked_destroy.icon_state = "d_analyzer"
 							else
-								if(!(I in linked_destroy.component_parts))
+								if(I != linked_destroy.circuit && !(I in linked_destroy.component_parts))
 									qdel(I)
 									linked_destroy.icon_state = "d_analyzer"

--- a/code/modules/shieldgen/shield_capacitor.dm
+++ b/code/modules/shieldgen/shield_capacitor.dm
@@ -104,7 +104,7 @@

 	//see if we can connect to a power net.
 	var/datum/powernet/PN
-	var/turf/T = src.loc
+	var/turf/T = get_turf(src)
 	var/obj/structure/cable/C = T.get_cable_node()
 	if (C)
 		PN = C.powernet
--- a/code/modules/surgery/organs_internal.dm
+++ b/code/modules/surgery/organs_internal.dm
@@ -73,7 +73,7 @@
 		return
 	var/is_organ_damaged = 0
 	for(var/obj/item/organ/I in affected.internal_organs)
-		if(I.damage > 0)
+		if(I && (I.damage > 0 || I.status == ORGAN_DEAD))
 			is_organ_damaged = 1
 			break
 	return ..() && is_organ_damaged
@@ -91,7 +91,7 @@
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)

 	for(var/obj/item/organ/I in affected.internal_organs)
-		if(I && I.damage > 0)
+		if(I && (I.damage > 0 || I.status == ORGAN_DEAD))
 			if(!(I.robotic >= ORGAN_ROBOT))
 				user.visible_message("[user] starts treating damage to [target]'s [I.name] with [tool_name].", \
 				"You start treating damage to [target]'s [I.name] with [tool_name]." )
@@ -111,11 +111,12 @@
 	var/obj/item/organ/external/affected = target.get_organ(target_zone)

 	for(var/obj/item/organ/internal/I in affected.internal_organs)
-		if(I && I.damage > 0)
+		if(I && (I.damage > 0 || I.status == ORGAN_DEAD))
 			if(!(I.robotic >= ORGAN_ROBOT))
 				user.visible_message("<span class='notice'>[user] treats damage to [target]'s [I.name] with [tool_name].</span>", \
 				"<span class='notice'>You treat damage to [target]'s [I.name] with [tool_name].</span>" )
 				I.damage = 0
+				I.status = 0
 				if(I.organ_tag == O_EYES)
 					target.sdisabilities &= ~BLIND
 				if(I.organ_tag == O_LUNGS)
--- a/code/modules/ventcrawl/ventcrawl.dm
+++ b/code/modules/ventcrawl/ventcrawl.dm
@@ -10,6 +10,7 @@ var/list/ventcrawl_machinery = list(
 	/obj/item/weapon/holder,
 	/obj/machinery/camera,
 	/mob/living/simple_animal/borer,
+	/obj/screen
 	)

 /mob/living/var/list/icon/pipes_shown = list()
@@ -41,18 +42,21 @@ var/list/ventcrawl_machinery = list(
 		return FALSE
 	. = ..()

-/mob/living/proc/is_allowed_vent_crawl_item(var/obj/item/carried_item)
+/mob/living/proc/is_allowed_vent_crawl_item(var/obj/carried_item)
+	//Ability master easy test for allowed (cheaper than istype)
 	if(carried_item == ability_master)
 		return 1

-	var/list/allowed = list()
-	for(var/type in can_enter_vent_with)
-		var/list/types = typesof(type)
-		allowed += types
+	//Try to find it in our allowed list (istype includes subtypes)
+	var/listed = FALSE
+	for(var/test_type in can_enter_vent_with)
+		if(istype(carried_item,test_type))
+			listed = TRUE
+			break

-	if(carried_item.type in allowed)
-		if(get_inventory_slot(carried_item) == 0)
-			return 1
+	//Only allow it if it's "IN" the mob, not equipped on/being held
+	if(listed && !get_inventory_slot(carried_item))
+		return 1

 /mob/living/carbon/is_allowed_vent_crawl_item(var/obj/item/carried_item)
 	if(carried_item in internal_organs)
--- a/code/modules/xenobio2/mob/slime/slime.dm
+++ b/code/modules/xenobio2/mob/slime/slime.dm
@@ -22,7 +22,7 @@ Slime definitions, Life and New live here.
 	var/shiny = 0
 	move_to_delay = 17 //Slimes shouldn't be able to go faster than humans.
 	default_chems = list("slimejelly" = 5)
-	attacktext = "absorbed some of"
+	attacktext = list("absorbed some of")
 	response_help = "pats"
 	response_disarm = "tries to stop"
 	response_harm = "hits"
--- a/code/modules/xenobio2/mob/xeno.dm
+++ b/code/modules/xenobio2/mob/xeno.dm
@@ -12,7 +12,7 @@ Also includes Life and New
 	desc = "Something's broken, yell at someone."
 	melee_damage_lower = 0
 	melee_damage_upper = 0
-	attacktext = "hit"
+	attacktext = list("hit")
 	attack_sound = null
 	friendly = "touches"
 	environment_smash = 0
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,6 +53,49 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">22 February 2018</h2>
+			<h3 class="author">Anewbe updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added Warden and HoS helmets.</li>
+				<li class="tweak">Clothing items must be click+dragged to be unequipped. A lot of them already had this, but the system is now standardized.</li>
+				<li class="tweak">Accessories now apply slowdown to what they're attached to.</li>
+				<li class="tweak">Certain items, notably Technomancer spells, no longer show up when you examine the mob wearing them.</li>
+				<li class="tweak">Flashbangs confuse, instead of stunning.</li>
+			</ul>
+			<h3 class="author">Atermonera updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">GPS units are generally more useful, providing both coordinate locations and, so long as you're on the same Z level, direction with x-y component distances, to 1m accuracy</li>
+				<li class="rscadd">Added a halogen counter tool, functions as the PDA function.</li>
+				<li class="tweak">Analyzers can now analyze gas containers, in addition to providing atmosphere readouts, as the PDA gas scanner function.</li>
+				<li class="rscadd">Added umbrellas.</li>
+			</ul>
+			<h3 class="author">battlefieldCommander updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added fireplaces which operate similarly to bonfires.</li>
+				<li class="bugfix">Fixed an oversight that allowed for an in-between state in bonfires where the fire would mysteriously go out after adding wood.</li>
+				<li class="rscadd">Added blue sifwood floor tiles.</li>
+				<li class="bugfix">Fixed blue carpet, now known as teal carpet</li>
+				<li class="rscadd">Added the ability to dig up tree stumps with a shovel.</li>
+			</ul>
+
+			<h2 class="date">21 February 2018</h2>
+			<h3 class="author">Anewbe updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Headsets for jobs that spend a lot of time planetside can now function as local radios when comms are down.</li>
+				<li class="rscadd">Most headsets now have on-mob sprites.</li>
+				<li class="rscadd">Added a Planetside Gun Permit item, specifying permission to possess a firearm on the planet's surface. Explorers should spawn with these by default, and a further two can be found in their gun locker.</li>
+				<li class="rscadd">Prometheans now react to water. Being soaked will stop their regen and deal minor toxin damage. Drinking or being injected with water will deal slightly more toxin damage.</li>
+				<li class="bugfix">Suit Coolers now properly cool FBPs in slightly burning rooms. If it gets too hot for your suit, you're still dead.</li>
+			</ul>
+			<h3 class="author">Leshana updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Makes electrochromatic glass buildable and programmable in game.  Use cable and multitool.</li>
+			</ul>
+			<h3 class="author">Woodrat updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Additions of 6 new POIs for the cave area.</li>
+			</ul>
+
 			<h2 class="date">17 February 2018</h2>
 			<h3 class="author">Anewbe updated:</h3>
 			<ul class="changes bgimages16">
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -3900,3 +3900,45 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
  - rscadd: Added packed snow brick material. Craft it using snow piles.
  - recadd: Added snow girders and igloo walls. Craft them using snow bricks.
  - rscadd: Added various snowmen. Craft them using snow piles. Punch 'em to destroy.
+2018-02-21:
+  Anewbe:
+  - rscadd: Headsets for jobs that spend a lot of time planetside can now function
+      as local radios when comms are down.
+  - rscadd: Most headsets now have on-mob sprites.
+  - rscadd: Added a Planetside Gun Permit item, specifying permission to possess a
+      firearm on the planet's surface. Explorers should spawn with these by default,
+      and a further two can be found in their gun locker.
+  - rscadd: Prometheans now react to water. Being soaked will stop their regen and
+      deal minor toxin damage. Drinking or being injected with water will deal slightly
+      more toxin damage.
+  - bugfix: Suit Coolers now properly cool FBPs in slightly burning rooms. If it gets
+      too hot for your suit, you're still dead.
+  Leshana:
+  - rscadd: Makes electrochromatic glass buildable and programmable in game.  Use
+      cable and multitool.
+  Woodrat:
+  - rscadd: Additions of 6 new POIs for the cave area.
+2018-02-22:
+  Anewbe:
+  - rscadd: Added Warden and HoS helmets.
+  - tweak: Clothing items must be click+dragged to be unequipped. A lot of them already
+      had this, but the system is now standardized.
+  - tweak: Accessories now apply slowdown to what they're attached to.
+  - tweak: Certain items, notably Technomancer spells, no longer show up when you
+      examine the mob wearing them.
+  - tweak: Flashbangs confuse, instead of stunning.
+  Atermonera:
+  - tweak: GPS units are generally more useful, providing both coordinate locations
+      and, so long as you're on the same Z level, direction with x-y component distances,
+      to 1m accuracy
+  - rscadd: Added a halogen counter tool, functions as the PDA function.
+  - tweak: Analyzers can now analyze gas containers, in addition to providing atmosphere
+      readouts, as the PDA gas scanner function.
+  - rscadd: Added umbrellas.
+  battlefieldCommander:
+  - rscadd: Added fireplaces which operate similarly to bonfires.
+  - bugfix: Fixed an oversight that allowed for an in-between state in bonfires where
+      the fire would mysteriously go out after adding wood.
+  - rscadd: Added blue sifwood floor tiles.
+  - bugfix: Fixed blue carpet, now known as teal carpet
+  - rscadd: Added the ability to dig up tree stumps with a shovel.
--- a/html/changelogs/Anewbe
+++ b/html/changelogs/Anewbe
@@ -1,36 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes: 
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name.  
-author: Anewbe
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - bugfix: "Suit Coolers now properly cool FBPs in slightly burning rooms. If it gets too hot for your suit, you're still dead."
--- a/html/changelogs/Leshana
+++ b/html/changelogs/Leshana
@@ -0,0 +1,4 @@
+author: Leshana
+delete-after: True
+changes: 
+  - tweak: "Grounding rods act intuitively, only having an expanded lighting catch area when anchored."
--- a/icons/effects/128x48.dmi
+++ b/icons/effects/128x48.dmi
--- a/icons/mob/animal.dmi
+++ b/icons/mob/animal.dmi
--- a/Show More
+++ b/Show More