Merge branch 'master' into crewobjectivesandmiscreants

2017-09-17 02:26:07 +00:00
parent 45330c909a a9d42c9051
commit c4e3b778b3
760 changed files with 27800 additions and 18957 deletions
@@ -413,6 +413,11 @@
 		if(job && IsJobAvailable(job.title))
 			available_job_count++;

+
+	for(var/datum/job/prioritized_job in SSjob.prioritized_jobs)
+		if(prioritized_job.current_positions >= prioritized_job.total_positions)
+			SSjob.prioritized_jobs -= prioritized_job
+
 	if(length(SSjob.prioritized_jobs))
 		dat += "<div class='notice red'>The station has flagged these jobs as high priority:<br>"
 		var/amt = length(SSjob.prioritized_jobs)
@@ -411,7 +411,7 @@
 			to_chat(src, "<span class='danger'>Error: Invalid (non-numeric) votes in the vote data.</span>")
 			return 0
 		if (!(vote in optionlist))
-			to_chat(src, "<span class='danger'>Votes for choices that do not appear to be in the poll detected<span>")
+			to_chat(src, "<span class='danger'>Votes for choices that do not appear to be in the poll detected.</span>")
 			return 0
 	if (!numberedvotelist.len)
 		to_chat(src, "<span class='danger'>Invalid vote data</span>")
@@ -500,6 +500,10 @@
 	name = "Sidecut"
 	icon_state = "hair_sidecut"

+/datum/sprite_accessory/hair/largebun
+	name = "Large Bun"
+	icon_state = "hair_largebun"
+	
 /////////////////////////////
 // Facial Hair Definitions //
 /////////////////////////////
@@ -1,8 +1,8 @@
 /datum/sprite_accessory
-	var/extra = 0
+	var/extra = FALSE
 	var/extra_icon = 'icons/mob/mam_bodyparts.dmi'
 	var/extra_color_src = MUTCOLORS2						//The color source for the extra overlay.
-	var/extra2 = 0
+	var/extra2 = FALSE
 	var/extra2_icon = 'icons/mob/mam_bodyparts.dmi'
 	var/extra2_color_src = MUTCOLORS3
 //	var/list/ckeys_allowed = null
@@ -13,6 +13,10 @@
 	icon = 'icons/mob/mam_bodyparts.dmi'
 */

+/***************** Alphabetical Order please ***************
+************* Keep it to Ears, Tails, Tails Animated *********/
+
+
 /datum/sprite_accessory/tails/lizard/none
 	name = "None"
 	icon_state = "None"
@@ -31,12 +35,17 @@
 	color_src = 0
 	icon = 'icons/mob/mam_bodyparts.dmi'

+/datum/sprite_accessory/ears/human/bear
+	name = "Bear"
+	icon_state = "bear"
+	icon = 'icons/mob/mam_bodyparts.dmi'
+	
 /datum/sprite_accessory/tails/human/bear
 	name = "Bear"
 	icon_state = "bear"
 	icon = 'icons/mob/mam_bodyparts.dmi'

-/datum/sprite_accessory/ears/human/bear
+/datum/sprite_accessory/tails_animated/human/bear
 	name = "Bear"
 	icon_state = "bear"
 	icon = 'icons/mob/mam_bodyparts.dmi'
@@ -51,10 +60,27 @@
 	icon_state = "catbig"
 	icon = 'icons/mob/mam_bodyparts.dmi'

+/datum/sprite_accessory/ears/human/cow
+	name = "Cow"
+	icon_state = "cow"
+	icon = 'icons/mob/mam_bodyparts.dmi'
+	gender_specific = 1
+	
+/datum/sprite_accessory/tails/human/cow
+	name = "Cow"
+	icon_state = "cow"
+	icon = 'icons/mob/mam_bodyparts.dmi'
+
+/datum/sprite_accessory/tails_animated/human/cow
+	name = "Cow"
+	icon_state = "cow"
+	icon = 'icons/mob/mam_bodyparts.dmi'
+
 /datum/sprite_accessory/ears/fennec
 	name = "Fennec"
 	icon_state = "fennec"
 	icon = 'icons/mob/mam_bodyparts.dmi'
+	hasinner = 1

 /datum/sprite_accessory/tails/human/fennec
 	name = "Fennec"
@@ -76,25 +102,51 @@
 	name = "Fox"
 	icon_state = "fox"
 	icon = 'icons/mob/mam_bodyparts.dmi'
-	extra = 1
+	extra = TRUE

 /datum/sprite_accessory/tails_animated/human/fox
 	name = "Fox"
 	icon_state = "fox"
 	icon = 'icons/mob/mam_bodyparts.dmi'
-	extra = 1
+	extra = TRUE
+
+/datum/sprite_accessory/tails/human/horse
+	name = "Horse"
+	icon_state = "horse"
+	icon = 'icons/mob/mam_bodyparts.dmi'
+	color_src = HAIR
+
+/datum/sprite_accessory/tails_animated/human/horse
+	name = "Horse"
+	icon_state = "horse"
+	icon = 'icons/mob/mam_bodyparts.dmi'
+	color_src = HAIR

 /datum/sprite_accessory/tails/human/husky
 	name = "Husky"
 	icon_state = "husky"
 	icon = 'icons/mob/mam_bodyparts.dmi'
-	extra = 1
+	extra = TRUE

 /datum/sprite_accessory/tails_animated/human/husky
 	name = "Husky"
 	icon_state = "husky"
 	icon = 'icons/mob/mam_bodyparts.dmi'
-	extra = 1
+	extra = TRUE
+
+/datum/sprite_accessory/tails/human/kitsune
+	name = "Kitsune"
+	icon_state = "kitsune"
+	extra = TRUE
+	extra_color_src = MUTCOLORS2
+	icon = 'icons/mob/mam_bodyparts.dmi'
+
+/datum/sprite_accessory/tails_animated/human/kitsune
+	name = "Kitsune"
+	icon_state = "kitsune"
+	extra = TRUE
+	extra_color_src = MUTCOLORS2
+	icon = 'icons/mob/mam_bodyparts.dmi'

 /datum/sprite_accessory/ears/lab
 	name = "Dog, Floppy"
@@ -119,6 +171,51 @@
 	color_src = 0
 	icon = 'icons/mob/mam_bodyparts.dmi'

+/datum/sprite_accessory/ears/human/otie
+	name = "Otusian"
+	icon_state = "otie"
+	hasinner= 1
+
+/datum/sprite_accessory/tails/human/otie
+	name = "Otusian"
+	icon_state = "otie"
+
+/datum/sprite_accessory/tails_animated/human/otie
+	name = "Otusian"
+	icon_state = "otie"
+
+/datum/sprite_accessory/ears/human/rabbit
+    name = "Rabbit"
+    icon_state = "rabbit"
+    hasinner= 1
+    icon = 'icons/mob/mam_bodyparts.dmi'
+	
+/datum/sprite_accessory/tails/human/rabbit
+	name = "Rabbit"
+	icon_state = "rabbit"
+	color_src = 0
+	icon = 'icons/mob/mam_bodyparts.dmi'
+
+/datum/sprite_accessory/tails_animated/human/rabbit
+	name = "Rabbit"
+	icon_state = "rabbit"
+	color_src = 0
+	icon = 'icons/mob/mam_bodyparts.dmi'
+	
+/datum/sprite_accessory/ears/human/skunk
+	name = "skunk"
+	icon_state = "skunk"
+
+/datum/sprite_accessory/tails/human/skunk
+	name = "skunk"
+	icon_state = "skunk"
+	color_src = 0
+
+/datum/sprite_accessory/tails_animated/human/skunk
+	name = "skunk"
+	icon_state = "skunk"
+	color_src = 0
+
 /datum/sprite_accessory/tails/human/shark
 	name = "Shark"
 	icon_state = "shark"
@@ -150,7 +247,7 @@
 /datum/sprite_accessory/ears/wolf
 	name = "Wolf"
 	icon_state = "wolf"
-	extra = 1
+	hasinner = 1

 /datum/sprite_accessory/tails/human/wolf
 	name = "Wolf"
@@ -162,18 +259,6 @@
 	icon_state = "wolf"
 	icon = 'icons/mob/mam_bodyparts.dmi'

-/datum/sprite_accessory/tails/human/rabbit
-	name = "Rabbit"
-	icon_state = "rabbit"
-	color_src = 0
-	icon = 'icons/mob/mam_bodyparts.dmi'
-
-/datum/sprite_accessory/ears/human/rabbit
-    name = "Rabbit"
-    icon_state = "rabbit"
-    hasinner= 1
-    icon = 'icons/mob/mam_bodyparts.dmi'
-
 /******************************************
 *************** Body Parts ****************
 *******************************************/
@@ -198,35 +283,46 @@
 **************** Snouts *******************
 *******************************************/

+/datum/sprite_accessory/snouts/none
+	name = "None"
+	icon_state = "none"
+	icon = 'icons/mob/mam_bodyparts.dmi'
+
+/datum/sprite_accessory/snouts/bird
+	name = "Beak"
+	icon_state = "bird"
+	icon = 'icons/mob/mam_bodyparts.dmi'
+	color_src = MUTCOLORS3
+
 /datum/sprite_accessory/snouts/lcanid
 	name = "Fox, Long"
 	icon_state = "lcanid"
 	icon = 'icons/mob/mam_bodyparts.dmi'
-	extra = 1
+	extra = TRUE

 /datum/sprite_accessory/snouts/scanid
 	name = "Fox, Short"
 	icon_state = "scanid"
 	icon = 'icons/mob/mam_bodyparts.dmi'
-	extra = 1
+	extra = TRUE

 /datum/sprite_accessory/snouts/wolf
 	name = "Wolf"
 	icon_state = "wolf"
 	icon = 'icons/mob/mam_bodyparts.dmi'
-	extra = 1
+	extra = TRUE

 /datum/sprite_accessory/snouts/husky
 	name = "Husky"
 	icon_state = "husky"
 	icon = 'icons/mob/mam_bodyparts.dmi'
-	extra = 1
+	extra = TRUE

 /datum/sprite_accessory/snouts/otie
 	name = "Otie"
 	icon_state = "otie"
 	icon = 'icons/mob/mam_bodyparts.dmi'
-	extra = 1
+	extra = TRUE

 /******************************************
 ************ Actual Species ***************
@@ -235,31 +331,30 @@
 /datum/sprite_accessory/mam_tails/ailurus
 	name = "Ailurus"
 	icon_state = "ailurus"
-	extra = 1
-	extra_color_src = MUTCOLORS2
+	extra = TRUE

 /datum/sprite_accessory/mam_tails_animated/ailurus
 	name = "Ailurus"
 	icon_state = "ailurus"
-	extra = 1
-	extra_color_src = MUTCOLORS2
-
-/datum/sprite_accessory/mam_tails/bear
-	name = "Bear"
-	icon_state = "bear"
-	icon = 'icons/mob/mam_bodyparts.dmi'
+	extra = TRUE

 /datum/sprite_accessory/mam_ears/bear
 	name = "Bear"
 	icon_state = "bear"
-	icon = 'icons/mob/mam_bodyparts.dmi'
+	
+/datum/sprite_accessory/mam_tails/bear
+	name = "Bear"
+	icon_state = "bear"
+
+/datum/sprite_accessory/mam_tails_animated/bear
+	name = "Bear"
+	icon_state = "bear"

 /datum/sprite_accessory/mam_ears/catbig
 	name = "Cat, Big"
 	icon_state = "cat"
 	hasinner = 1
-	icon = 'icons/mob/mutant_bodyparts.dmi'
-
+	
 /datum/sprite_accessory/mam_tails/catbig
 	name = "Cat, Big"
 	icon_state = "catbig"
@@ -272,6 +367,14 @@
 	name = "Cow"
 	icon_state = "cow"
 	gender_specific = 1
+	
+/datum/sprite_accessory/mam_tail/cow
+	name = "Cow"
+	icon_state = "cow"
+
+/datum/sprite_accessory/mam_tails_animated/cow
+	name = "Cow"
+	icon_state = "cow"

 /datum/sprite_accessory/mam_ears/deer
 	name = "Deer"
@@ -280,8 +383,7 @@
 /datum/sprite_accessory/mam_tails/eevee
 	name = "Eevee"
 	icon_state = "eevee"
-	extra = 1
-	extra_color_src = MUTCOLORS2
+	extra = TRUE

 /datum/sprite_accessory/mam_ears/eevee
 	name = "Eevee"
@@ -290,8 +392,7 @@
 /datum/sprite_accessory/mam_tails_animated/eevee
 	name = "Eevee"
 	icon_state = "eevee"
-	extra = 1
-	extra_color_src = MUTCOLORS2
+	extra = TRUE

 /datum/sprite_accessory/mam_ears/fennec
 	name = "Fennec"
@@ -309,25 +410,17 @@
 /datum/sprite_accessory/mam_ears/fox
 	name = "Fox"
 	icon_state = "fox"
-	hasinner = 0
+	hasinner = 1

 /datum/sprite_accessory/mam_tails/fox
 	name = "Fox"
 	icon_state = "fox"
-	extra = 1
-	extra_color_src = MUTCOLORS2
+	extra = TRUE

 /datum/sprite_accessory/mam_tails_animated/fox
 	name = "Fox"
 	icon_state = "fox"
-	extra = 1
-	extra_color_src = MUTCOLORS2
-
-/datum/sprite_accessory/mam_ears/husky
-	name = "Husky"
-	icon_state = "wolf"
-	icon = 'icons/mob/mam_bodyparts.dmi'
-	extra = 1
+	extra = TRUE

 /datum/sprite_accessory/mam_tails/hawk
 	name = "Hawk"
@@ -337,15 +430,54 @@
 	name = "Hawk"
 	icon_state = "hawk"

+/datum/sprite_accessory/mam_tails/horse
+	name = "Horse"
+	icon_state = "horse"
+	color_src = HAIR
+
+/datum/sprite_accessory/mam_tails_animated/horse
+	name = "Horse"
+	icon_state = "Horse"
+	color_src = HAIR
+
+/datum/sprite_accessory/mam_ears/husky
+	name = "Husky"
+	icon_state = "wolf"
+	icon = 'icons/mob/mam_bodyparts.dmi'
+	extra = TRUE
+
 /datum/sprite_accessory/mam_tails/husky
 	name = "Husky"
 	icon_state = "husky"
-	extra = 1
+	extra = TRUE

 /datum/sprite_accessory/mam_tails_animated/husky
 	name = "Husky"
 	icon_state = "husky"
-	extra = 1
+	extra = TRUE
+
+/datum/sprite_accessory/mam_ears/kangaroo
+	name = "kangaroo"
+	icon_state = "kangaroo"
+	extra = TRUE
+
+/datum/sprite_accessory/mam_tails/kangaroo
+	name = "kangaroo"
+	icon_state = "kangaroo"
+
+/datum/sprite_accessory/mam_tails_animated/kangaroo
+	name = "kangaroo"
+	icon_state = "kangaroo"
+
+/datum/sprite_accessory/mam_tails/kitsune
+	name = "Kitsune"
+	icon_state = "kitsune"
+	extra = TRUE
+
+/datum/sprite_accessory/mam_tails_animated/kitsune
+	name = "Kitsune"
+	icon_state = "kitsune"
+	extra = TRUE

 /datum/sprite_accessory/mam_ears/lab
 	name = "Dog, Long"
@@ -386,6 +518,48 @@
 	name = "Otusian"
 	icon_state = "otie"

+/datum/sprite_accessory/mam_ears/rabbit
+    name = "Rabbit"
+    icon_state = "rabbit"
+    hasinner= 1
+	
+/datum/sprite_accessory/mam_tails/rabbit
+	name = "Rabbit"
+	icon_state = "rabbit"
+
+/datum/sprite_accessory/mam_tails_animated/rabbit
+	name = "Rabbit"
+	icon_state = "rabbit"
+
+/datum/sprite_accessory/mam_ears/sergal
+	name = "Sergal"
+	icon_state = "sergal"
+	hasinner= 1
+
+/datum/sprite_accessory/mam_tails/sergal
+	name = "Sergal"
+	icon_state = "sergal"
+
+/datum/sprite_accessory/mam_tails_animated/sergal
+	name = "Sergal"
+	icon_state = "sergal"
+
+/datum/sprite_accessory/mam_ears/skunk
+	name = "skunk"
+	icon_state = "skunk"
+
+/datum/sprite_accessory/mam_tails/skunk
+	name = "skunk"
+	icon_state = "skunk"
+	color_src = 0
+	extra = TRUE
+
+/datum/sprite_accessory/mam_tails_animated/skunk
+	name = "skunk"
+	icon_state = "skunk"
+	color_src = 0
+	extra = TRUE
+
 /datum/sprite_accessory/mam_tails/shark
 	name = "Shark"
 	icon_state = "shark"
@@ -394,30 +568,19 @@
 /datum/sprite_accessory/mam_tails_animated/shark
 	name = "Shark"
 	icon_state = "shark"
-	color_src = 0
-
-/datum/sprite_accessory/mam_tails/shark/datashark
-	name = "DataShark"
-	icon_state = "datashark"
-	color_src = 0
-//	ckeys_allowed = list("rubyflamewing")
-
-/datum/sprite_accessory/mam_tails_animated/shark/datashark
-	name = "DataShark"
-	icon_state = "datashark"
-	color_src = 0
+	color_src = MUTCOLORS

 /datum/sprite_accessory/mam_tails/shepherd
 	name = "Shepherd"
 	icon_state = "shepherd"
-	extra = 1
-	extra2 = 1
+	extra = TRUE
+	extra2 = TRUE

 /datum/sprite_accessory/mam_tails_animated/shepherd
 	name = "Shepherd"
 	icon_state = "shepherd"
-	extra = 1
-	extra2 = 1
+	extra = TRUE
+	extra2 = TRUE

 /datum/sprite_accessory/mam_ears/squirrel
 	name = "Squirrel"
@@ -435,7 +598,7 @@
 /datum/sprite_accessory/mam_ears/wolf
 	name = "Wolf"
 	icon_state = "wolf"
-	extra = 1
+	hasinner = 1

 /datum/sprite_accessory/mam_tails/wolf
 	name = "Wolf"
@@ -445,39 +608,13 @@
 	name = "Wolf"
 	icon_state = "wolf"

-/datum/sprite_accessory/mam_tails/guilmon
-	name = "Guilmon"
-	icon_state = "guilmon"
-	extra = 1
-
-/datum/sprite_accessory/mam_tails_animated/guilmon
-	name = "Guilmon"
-	icon_state = "guilmon"
-	extra = 1
-
-/datum/sprite_accessory/mam_ears/guilmon
-	name = "Guilmon"
-	icon_state = "guilmon"
-	icon = 'icons/mob/mam_bodyparts.dmi'
-
-/datum/sprite_accessory/mam_tails/rabbit
-	name = "Rabbit"
-	icon_state = "rabbit"
-	icon = 'icons/mob/mam_bodyparts.dmi'
-
-/datum/sprite_accessory/mam_ears/rabbit
-    name = "Rabbit"
-    icon_state = "rabbit"
-    hasinner= 1
-    icon = 'icons/mob/mam_bodyparts.dmi'
-
 /******************************************
 ************ Body Markings ****************
 *******************************************/

 /datum/sprite_accessory/mam_body_markings
-	extra = 1
-	extra2 = 1
+	extra = TRUE
+	extra2 = TRUE
 	icon = 'icons/mob/mam_body_markings.dmi'

 /datum/sprite_accessory/mam_body_markings/none
@@ -487,8 +624,6 @@
 /datum/sprite_accessory/mam_body_markings/ailurus
 	name = "Red Panda"
 	icon_state = "ailurus"
-	extra_color_src = MUTCOLORS2
-	extra2_color_src = MUTCOLORS3
 	gender_specific = 1

 /datum/sprite_accessory/mam_body_markings/belly
@@ -530,20 +665,11 @@
 /datum/sprite_accessory/mam_body_markings/fennec
 	name = "Fennec"
 	icon_state = "Fennec"
-	extra_color_src = MUTCOLORS3
 	gender_specific = 1

 /datum/sprite_accessory/mam_body_markings/fox
 	name = "Fox"
 	icon_state = "fox"
-	extra_color_src = MUTCOLORS3
-	gender_specific = 1
-
-/datum/sprite_accessory/mam_body_markings/guilmon
-	name = "Guilmon"
-	icon_state = "guilmon"
-	extra_color_src = MUTCOLORS2
-	extra2_color_src = MUTCOLORS3
 	gender_specific = 1

 /datum/sprite_accessory/mam_body_markings/hawk
@@ -593,22 +719,23 @@
 	color_src = MUTCOLORS2
 	gender_specific = 1

-	/datum/sprite_accessory/mam_body_markings/xeno
+/datum/sprite_accessory/mam_body_markings/xeno
 	name = "Xeno"
 	icon_state = "xeno"
 	color_src = MUTCOLORS2
 	extra_color_src = MUTCOLORS3
 	gender_specific = 1

+
 /******************************************
 ************ Taur Bodies ******************
 *******************************************/
 /datum/sprite_accessory/taur
 	icon = 'icons/mob/mam_taur.dmi'
 	extra_icon = 'icons/mob/mam_taur.dmi'
-	extra = 1
+	extra = TRUE
 	extra2_icon = 'icons/mob/mam_taur.dmi'
-	extra2 = 1
+	extra2 = TRUE
 	center = TRUE
 	dimension_x = 64

@@ -711,7 +838,6 @@
 	icon = 'icons/mob/xeno_parts_greyscale.dmi'

 //Xeno Caste Heads
-//unused as of October 3, 2016
 /datum/sprite_accessory/xeno_head
 	icon = 'icons/mob/xeno_parts_greyscale.dmi'

@@ -739,17 +865,65 @@
 	icon_state = "warrior"
 	icon = 'icons/mob/xeno_parts_greyscale.dmi'

+// *** Snooooow flaaaaake ***
+
+/datum/sprite_accessory/mam_body_markings/guilmon
+	name = "Guilmon"
+	icon_state = "guilmon"
+	gender_specific = 1
+
+/datum/sprite_accessory/mam_tails/guilmon
+	name = "Guilmon"
+	icon_state = "guilmon"
+	extra = TRUE
+
+/datum/sprite_accessory/mam_tails_animated/guilmon
+	name = "Guilmon"
+	icon_state = "guilmon"
+	extra = TRUE
+
+/datum/sprite_accessory/mam_ears/guilmon
+	name = "Guilmon"
+	icon_state = "guilmon"
+	icon = 'icons/mob/mam_bodyparts.dmi'
+
+/datum/sprite_accessory/mam_tails/shark/datashark
+	name = "DataShark"
+	icon_state = "datashark"
+	color_src = 0
+//	ckeys_allowed = list("rubyflamewing")
+
+/datum/sprite_accessory/mam_tails_animated/shark/datashark
+	name = "DataShark"
+	icon_state = "datashark"
+	color_src = 0
+
 /*
-//Slimecoon Parts
-/datum/sprite_accessory/slimecoon_ears
-	icon = 'icons/mob/exotic_bodyparts.dmi'
-	name = "Slimecoon Ears"
-	icon_state = "slimecoon"
-/datum/sprite_accessory/slimecoon_tail
-	icon = 'icons/mob/exotic_bodyparts.dmi'
-	name = "Slimecoon Tail"
-	icon_state = "slimecoon"
-/datum/sprite_accessory/slimecoon_snout
-	icon = 'icons/mob/exotic_bodyparts.dmi'
-	name = "Hunter"
-	icon_state = "slimecoon" */
+//Till I get my snowflake only ckey lock, these are locked-locked :D
+
+/datum/sprite_accessory/mam_ears/sabresune
+	name = "sabresune"
+	icon_state = "sabresune"
+	extra = TRUE
+	extra_color_src = MUTCOLORS3
+	locked = TRUE
+
+/datum/sprite_accessory/mam_tails/sabresune
+	name = "sabresune"
+	icon_state = "sabresune"
+	extra = TRUE
+	locked = TRUE
+
+/datum/sprite_accessory/mam_tails_animated/sabresune
+	name = "sabresune"
+	icon_state = "sabresune"
+	extra = TRUE
+
+/datum/sprite_accessory/mam_body_markings/sabresune
+	name = "Sabresune"
+	icon_state = "sabresune"
+	color_src = MUTCOLORS2
+	extra = FALSE
+	extra2 = FALSE
+	locked = TRUE
+*/
@@ -106,7 +106,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
 		if(turfs.len)
 			T = pick(turfs)
 		else
-			T = locate(round(world.maxx/2), round(world.maxy/2), ZLEVEL_STATION)	//middle of the station
+			T = locate(round(world.maxx/2), round(world.maxy/2), ZLEVEL_STATION_PRIMARY)	//middle of the station

 	loc = T

@@ -309,9 +309,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	..()
 	if(statpanel("Status"))
 		if(SSticker.HasRoundStarted())
-			for(var/datum/gang/G in SSticker.mode.gangs)
-				if(G.is_dominating)
-					stat(null, "[G.name] Gang Takeover: [max(G.domination_time_remaining(), 0)]")
 			if(istype(SSticker.mode, /datum/game_mode/blob))
 				var/datum/game_mode/blob/B = SSticker.mode
 				if(B.message_sent)
@@ -823,10 +820,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	GLOB.observer_default_invisibility = amount

 /mob/dead/observer/proc/open_spawners_menu()
-	set name = "Mob spawners menu"
-	set desc = "See all currently available ghost spawners"
+	set name = "Spawners Menu"
+	set desc = "See all currently available spawners"
 	set category = "Ghost"
 	if(!spawners_menu)
 		spawners_menu = new(src)

-	spawners_menu.ui_interact(src)
+	spawners_menu.ui_interact(src)
@@ -162,7 +162,7 @@
 		return
 	src.loc = B.loc
 	src.client.eye = src
-	src.visible_message("<span class='warning'><B>[src] rises out of the pool of blood!</B>")
+	src.visible_message("<span class='warning'><B>[src] rises out of the pool of blood!</B></span>")
 	exit_blood_effect(B)
 	if(iscarbon(src))
 		var/mob/living/carbon/C = src
@@ -7,7 +7,7 @@
 	see_invisible = SEE_INVISIBLE_LIVING

 /mob/living/brain/Initialize()
-	..()
+	. = ..()
 	create_dna(src)
 	stored_dna.initialize_dna(random_blood_type())
 	if(isturf(loc)) //not spawned in an MMI or brain organ (most likely adminspawned)
@@ -149,7 +149,7 @@ GLOBAL_VAR(posibrain_notify_cooldown)
 	to_chat(user, msg)

 /obj/item/device/mmi/posibrain/Initialize()
-	..()
+	. = ..()
 	brainmob = new(src)
 	var/new_name
 	if(!LAZYLEN(possible_names))
@@ -17,7 +17,6 @@
 	initial_language_holder = /datum/language_holder/alien
 	bubble_icon = "alien"
 	type_of_meat = /obj/item/reagent_containers/food/snacks/meat/slab/xeno
-	var/nightvision = 1

 	var/obj/item/card/id/wear_id = null // Fix for station bounced radios -- Skie
 	var/has_fine_manipulation = 0
@@ -32,7 +31,7 @@

 	var/static/regex/alien_name_regex = new("alien (larva|sentinel|drone|hunter|praetorian|queen)( \\(\\d+\\))?")
 	devourable = TRUE
-	
+
 /mob/living/carbon/alien/Initialize()
 	verbs += /mob/living/proc/mob_sleep
 	verbs += /mob/living/proc/lay_down
@@ -1,62 +1,62 @@
-/obj/effect/proc_holder/alien/hide
-	name = "Hide"
-	desc = "Allows aliens to hide beneath tables or certain items. Toggled on or off."
-	plasma_cost = 0
-
-	action_icon_state = "alien_hide"
-
-/obj/effect/proc_holder/alien/hide/fire(mob/living/carbon/alien/user)
-	if(user.stat != CONSCIOUS)
-		return
-
-	if (user.layer != ABOVE_NORMAL_TURF_LAYER)
-		user.layer = ABOVE_NORMAL_TURF_LAYER
-		user.visible_message("<span class='name'>[user] scurries to the ground!</span>", \
-						"<span class='noticealien'>You are now hiding.</span>")
-	else
-		user.layer = MOB_LAYER
-		user.visible_message("[user.] slowly peeks up from the ground...", \
-					"<span class='noticealien'>You stop hiding.</span>")
-	return 1
-
-
-/obj/effect/proc_holder/alien/larva_evolve
-	name = "Evolve"
-	desc = "Evolve into a higher alien caste."
-	plasma_cost = 0
-
-	action_icon_state = "alien_evolve_larva"
-
-/obj/effect/proc_holder/alien/larva_evolve/fire(mob/living/carbon/alien/user)
-	if(!islarva(user))
-		return
-	var/mob/living/carbon/alien/larva/L = user
-
-	if(L.handcuffed || L.legcuffed) // Cuffing larvas ? Eh ?
-		to_chat(user, "<span class='danger'>You cannot evolve when you are cuffed.</span>")
-
-	if(L.amount_grown >= L.max_grown)	//TODO ~Carn
-		to_chat(L, "<span class='name'>You are growing into a beautiful alien! It is time to choose a caste.</span>")
-		to_chat(L, "<span class='info'>There are three to choose from:")
-		to_chat(L, "<span class='name'>Hunters</span> <span class='info'>are the most agile caste, tasked with hunting for hosts. They are faster than a human and can even pounce, but are not much tougher than a drone.</span>")
-		to_chat(L, "<span class='name'>Sentinels</span> <span class='info'>are tasked with protecting the hive. With their ranged spit, invisibility, and high health, they make formidable guardians and acceptable secondhand hunters.</span>")
-		to_chat(L, "<span class='name'>Drones</span> <span class='info'>are the weakest and slowest of the castes, but can grow into a praetorian and then queen if no queen exists, and are vital to maintaining a hive with their resin secretion abilities.</span>")
-		var/alien_caste = alert(L, "Please choose which alien caste you shall belong to.",,"Hunter","Sentinel","Drone")
-
-		if(user.incapacitated()) //something happened to us while we were choosing.
-			return
-
-		var/mob/living/carbon/alien/humanoid/new_xeno
-		switch(alien_caste)
-			if("Hunter")
-				new_xeno = new /mob/living/carbon/alien/humanoid/hunter(L.loc)
-			if("Sentinel")
-				new_xeno = new /mob/living/carbon/alien/humanoid/sentinel(L.loc)
-			if("Drone")
-				new_xeno = new /mob/living/carbon/alien/humanoid/drone(L.loc)
-
-		L.alien_evolve(new_xeno)
-		return 0
-	else
-		to_chat(user, "<span class='danger'>You are not fully grown.</span>")
-		return 0
+/obj/effect/proc_holder/alien/hide
+	name = "Hide"
+	desc = "Allows aliens to hide beneath tables or certain items. Toggled on or off."
+	plasma_cost = 0
+
+	action_icon_state = "alien_hide"
+
+/obj/effect/proc_holder/alien/hide/fire(mob/living/carbon/alien/user)
+	if(user.stat != CONSCIOUS)
+		return
+
+	if (user.layer != ABOVE_NORMAL_TURF_LAYER)
+		user.layer = ABOVE_NORMAL_TURF_LAYER
+		user.visible_message("<span class='name'>[user] scurries to the ground!</span>", \
+						"<span class='noticealien'>You are now hiding.</span>")
+	else
+		user.layer = MOB_LAYER
+		user.visible_message("[user.] slowly peeks up from the ground...", \
+					"<span class='noticealien'>You stop hiding.</span>")
+	return 1
+
+
+/obj/effect/proc_holder/alien/larva_evolve
+	name = "Evolve"
+	desc = "Evolve into a higher alien caste."
+	plasma_cost = 0
+
+	action_icon_state = "alien_evolve_larva"
+
+/obj/effect/proc_holder/alien/larva_evolve/fire(mob/living/carbon/alien/user)
+	if(!islarva(user))
+		return
+	var/mob/living/carbon/alien/larva/L = user
+
+	if(L.handcuffed || L.legcuffed) // Cuffing larvas ? Eh ?
+		to_chat(user, "<span class='danger'>You cannot evolve when you are cuffed.</span>")
+
+	if(L.amount_grown >= L.max_grown)	//TODO ~Carn
+		to_chat(L, "<span class='name'>You are growing into a beautiful alien! It is time to choose a caste.</span>")
+		to_chat(L, "<span class='info'>There are three to choose from:</span>")
+		to_chat(L, "<span class='name'>Hunters</span> <span class='info'>are the most agile caste, tasked with hunting for hosts. They are faster than a human and can even pounce, but are not much tougher than a drone.</span>")
+		to_chat(L, "<span class='name'>Sentinels</span> <span class='info'>are tasked with protecting the hive. With their ranged spit, invisibility, and high health, they make formidable guardians and acceptable secondhand hunters.</span>")
+		to_chat(L, "<span class='name'>Drones</span> <span class='info'>are the weakest and slowest of the castes, but can grow into a praetorian and then queen if no queen exists, and are vital to maintaining a hive with their resin secretion abilities.</span>")
+		var/alien_caste = alert(L, "Please choose which alien caste you shall belong to.",,"Hunter","Sentinel","Drone")
+
+		if(user.incapacitated()) //something happened to us while we were choosing.
+			return
+
+		var/mob/living/carbon/alien/humanoid/new_xeno
+		switch(alien_caste)
+			if("Hunter")
+				new_xeno = new /mob/living/carbon/alien/humanoid/hunter(L.loc)
+			if("Sentinel")
+				new_xeno = new /mob/living/carbon/alien/humanoid/sentinel(L.loc)
+			if("Drone")
+				new_xeno = new /mob/living/carbon/alien/humanoid/drone(L.loc)
+
+		L.alien_evolve(new_xeno)
+		return 0
+	else
+		to_chat(user, "<span class='danger'>You are not fully grown.</span>")
+		return 0
@@ -128,12 +128,12 @@
 		return
 	if(isalien(owner)) //Different effects for aliens than humans
 		to_chat(owner, "<span class='userdanger'>Your Queen has been struck down!</span>")
-		to_chat(owner, "<span class='danger'>You are struck with overwhelming agony! You feel confused, and your connection to the hivemind is severed.")
+		to_chat(owner, "<span class='danger'>You are struck with overwhelming agony! You feel confused, and your connection to the hivemind is severed.</span>")
 		owner.emote("roar")
 		owner.Stun(200) //Actually just slows them down a bit.

 	else if(ishuman(owner)) //Humans, being more fragile, are more overwhelmed by the mental backlash.
-		to_chat(owner, "<span class='danger'>You feel a splitting pain in your head, and are struck with a wave of nausea. You cannot hear the hivemind anymore!")
+		to_chat(owner, "<span class='danger'>You feel a splitting pain in your head, and are struck with a wave of nausea. You cannot hear the hivemind anymore!</span>")
 		owner.emote("scream")
 		owner.Knockdown(100)

@@ -119,14 +119,12 @@
 		Leap(hit_atom)

 /obj/item/clothing/mask/facehugger/proc/valid_to_attach(mob/living/M)
-	// valid targets: corgis, carbons except aliens and devils
+	// valid targets: carbons except aliens and devils
 	// facehugger state early exit checks
 	if(stat != CONSCIOUS)
 		return FALSE
 	if(attached)
 		return FALSE
-	if(!iscorgi(M) && !iscarbon(M))
-		return FALSE
 	if(iscarbon(M))
 		// disallowed carbons
 		if(isalien(M) || isdevil(M))
@@ -140,9 +138,8 @@
 			return FALSE
 		// carbon, has head, not alien or devil, has no hivenode or embryo: valid
 		return TRUE
-	else if(iscorgi(M))
-		// corgi: valid
-		return TRUE
+
+	return FALSE

 /obj/item/clothing/mask/facehugger/proc/Leap(mob/living/M)
 	if(!valid_to_attach(M))
@@ -183,11 +180,6 @@
 	//ensure we detach once we no longer need to be attached
 	addtimer(CALLBACK(src, .proc/detach), MAX_IMPREGNATION_TIME)

-	if (iscorgi(M))
-		var/mob/living/simple_animal/pet/dog/corgi/C = M
-		loc = C
-		C.facehugger = src
-		C.regenerate_icons()

 	if(!sterile)
 		M.take_bodypart_damage(strength,0) //done here so that humans in helmets take damage
@@ -221,10 +213,6 @@
 		if((!LC || LC.status != BODYPART_ROBOTIC) && !target.getorgan(/obj/item/organ/body_egg/alien_embryo))
 			new /obj/item/organ/body_egg/alien_embryo(target)

-		if(iscorgi(target))
-			var/mob/living/simple_animal/pet/dog/corgi/C = target
-			src.loc = get_turf(C)
-			C.facehugger = null
 	else
 		target.visible_message("<span class='danger'>[src] violates [target]'s face!</span>", \
 								"<span class='userdanger'>[src] violates [target]'s face!</span>")
@@ -263,7 +251,7 @@
 	if(M.getorgan(/obj/item/organ/alien/hivenode))
 		return 0

-	if(iscorgi(M) || ismonkey(M))
+	if(ismonkey(M))
 		return 1

 	var/mob/living/carbon/C = M
@@ -610,50 +610,94 @@
 	if(!client)
 		return

-	if(stat == UNCONSCIOUS && health <= HEALTH_THRESHOLD_CRIT)
+	if(health <= HEALTH_THRESHOLD_CRIT)
 		var/severity = 0
 		switch(health)
-			if(-20 to -10) severity = 1
-			if(-30 to -20) severity = 2
-			if(-40 to -30) severity = 3
-			if(-50 to -40) severity = 4
-			if(-60 to -50) severity = 5
-			if(-70 to -60) severity = 6
-			if(-80 to -70) severity = 7
-			if(-90 to -80) severity = 8
-			if(-95 to -90) severity = 9
-			if(-INFINITY to -95) severity = 10
+			if(-20 to -10)
+				severity = 1
+			if(-30 to -20)
+				severity = 2
+			if(-40 to -30)
+				severity = 3
+			if(-50 to -40)
+				severity = 4
+			if(-50 to -40)
+				severity = 5
+			if(-60 to -50)
+				severity = 6
+			if(-70 to -60)
+				severity = 7
+			if(-90 to -70)
+				severity = 8
+			if(-95 to -90)
+				severity = 9
+			if(-INFINITY to -95)
+				severity = 10
+		if(!InFullCritical())
+			var/visionseverity = 4
+			switch(health)
+				if(-8 to -4)
+					visionseverity = 5
+				if(-12 to -8)
+					visionseverity = 6
+				if(-16 to -12)
+					visionseverity = 7
+				if(-20 to -16)
+					visionseverity = 8
+				if(-24 to -20)
+					visionseverity = 9
+				if(-INFINITY to -24)
+					visionseverity = 10
+			overlay_fullscreen("critvision", /obj/screen/fullscreen/crit/vision, visionseverity)
+		else
+			clear_fullscreen("critvision")
 		overlay_fullscreen("crit", /obj/screen/fullscreen/crit, severity)
 	else
 		clear_fullscreen("crit")
-		if(oxyloss)
-			var/severity = 0
-			switch(oxyloss)
-				if(10 to 20) severity = 1
-				if(20 to 25) severity = 2
-				if(25 to 30) severity = 3
-				if(30 to 35) severity = 4
-				if(35 to 40) severity = 5
-				if(40 to 45) severity = 6
-				if(45 to INFINITY) severity = 7
-			overlay_fullscreen("oxy", /obj/screen/fullscreen/oxy, severity)
-		else
-			clear_fullscreen("oxy")
+		clear_fullscreen("critvision")

-		//Fire and Brute damage overlay (BSSR)
-		var/hurtdamage = getBruteLoss() + getFireLoss() + damageoverlaytemp
-		if(hurtdamage)
-			var/severity = 0
-			switch(hurtdamage)
-				if(5 to 15) severity = 1
-				if(15 to 30) severity = 2
-				if(30 to 45) severity = 3
-				if(45 to 70) severity = 4
-				if(70 to 85) severity = 5
-				if(85 to INFINITY) severity = 6
-			overlay_fullscreen("brute", /obj/screen/fullscreen/brute, severity)
-		else
-			clear_fullscreen("brute")
+	//Oxygen damage overlay
+	if(oxyloss)
+		var/severity = 0
+		switch(oxyloss)
+			if(10 to 20)
+				severity = 1
+			if(20 to 25)
+				severity = 2
+			if(25 to 30)
+				severity = 3
+			if(30 to 35)
+				severity = 4
+			if(35 to 40)
+				severity = 5
+			if(40 to 45)
+				severity = 6
+			if(45 to INFINITY)
+				severity = 7
+		overlay_fullscreen("oxy", /obj/screen/fullscreen/oxy, severity)
+	else
+		clear_fullscreen("oxy")
+
+	//Fire and Brute damage overlay (BSSR)
+	var/hurtdamage = getBruteLoss() + getFireLoss() + damageoverlaytemp
+	if(hurtdamage)
+		var/severity = 0
+		switch(hurtdamage)
+			if(5 to 15)
+				severity = 1
+			if(15 to 30)
+				severity = 2
+			if(30 to 45)
+				severity = 3
+			if(45 to 70)
+				severity = 4
+			if(70 to 85)
+				severity = 5
+			if(85 to INFINITY)
+				severity = 6
+		overlay_fullscreen("brute", /obj/screen/fullscreen/brute, severity)
+	else
+		clear_fullscreen("brute")

 /mob/living/carbon/update_health_hud(shown_health_amount)
 	if(!client || !hud_used)
@@ -688,20 +732,19 @@
 	if(status_flags & GODMODE)
 		return
 	if(stat != DEAD)
-		if(health<= HEALTH_THRESHOLD_DEAD)
+		if(health <= HEALTH_THRESHOLD_DEAD)
 			death()
 			return
-		if(IsUnconscious() || IsSleeping() || getOxyLoss() > 50 || (status_flags & FAKEDEATH) || health <= HEALTH_THRESHOLD_CRIT)
-			if(stat == CONSCIOUS)
-				stat = UNCONSCIOUS
-				blind_eyes(1)
-				update_canmove()
+		if(IsUnconscious() || IsSleeping() || getOxyLoss() > 50 || (status_flags & FAKEDEATH) || health <= HEALTH_THRESHOLD_FULLCRIT)
+			stat = UNCONSCIOUS
+			blind_eyes(1)
 		else
-			if(stat == UNCONSCIOUS)
+			if(health <= HEALTH_THRESHOLD_CRIT)
+				stat = SOFT_CRIT
+			else
 				stat = CONSCIOUS
-				resting = 0
-				adjust_blindness(-1)
-				update_canmove()
+			adjust_blindness(-1)
+		update_canmove()
 	update_damage_hud()
 	update_health_hud()
 	med_hud_set_status()
@@ -817,7 +860,7 @@
 /mob/living/carbon/vv_get_dropdown()
 	. = ..()
 	. += "---"
-	.["Make AI"] = "?_src_=vars;makeai=\ref[src]"
-	.["Modify bodypart"] = "?_src_=vars;editbodypart=\ref[src]"
-	.["Modify organs"] = "?_src_=vars;editorgans=\ref[src]"
-	.["Hallucinate"] = "?_src_=vars;hallucinate=\ref[src]"
+	.["Make AI"] = "?_src_=vars;[HrefToken()];makeai=\ref[src]"
+	.["Modify bodypart"] = "?_src_=vars;[HrefToken()];editbodypart=\ref[src]"
+	.["Modify organs"] = "?_src_=vars;[HrefToken()];editorgans=\ref[src]"
+	.["Hallucinate"] = "?_src_=vars;[HrefToken()];hallucinate=\ref[src]"
@@ -244,7 +244,7 @@

 /mob/living/carbon/proc/help_shake_act(mob/living/carbon/M)
 	if(on_fire)
-		to_chat(M, "<span class='warning'>You can't put them out with just your bare hands!")
+		to_chat(M, "<span class='warning'>You can't put them out with just your bare hands!</span>")
 		return

 	if(health >= 0 && !(status_flags & FAKEDEATH))
@@ -255,6 +255,8 @@
 		else if(check_zone(M.zone_selected) == "head")
 			M.visible_message("<span class='notice'>[M] gives [src] a pat on the head to make [p_them()] feel better!</span>", \
 						"<span class='notice'>You give [src] a pat on the head to make [p_them()] feel better!</span>")
+			if(dna && dna.species && (("tail_lizard" in dna.species.mutant_bodyparts) || (dna.features["tail_human"] != "None") || ("mam_tail" in dna.species.mutant_bodyparts)))
+				emote("wag") //lewd
 		else
 			M.visible_message("<span class='notice'>[M] hugs [src] to make [p_them()] feel better!</span>", \
 						"<span class='notice'>You hug [src] to make [p_them()] feel better!</span>")
@@ -1,10 +1,8 @@
 /mob/living/carbon/movement_delay()
-	var/FP
-	if(iscarbon(src))
-		var/mob/living/carbon/C = src
-		var/obj/item/device/flightpack/F = C.get_flightpack()
-		if(istype(F) && F.flight)
-			FP = 1
+	var/FP = FALSE
+	var/obj/item/device/flightpack/F = get_flightpack()
+	if(istype(F) && F.flight)
+		FP = TRUE
 	. = ..(FP)
 	if(!FP)
 		. += grab_state * 1	//Flightpacks are too powerful to be slowed too much by the weight of a corpse.
@@ -19,6 +17,9 @@
 		if(legcuffed)
 			. += legcuffed.slowdown

+	if(stat == SOFT_CRIT)
+		. += SOFTCRIT_ADD_SLOWDOWN
+ 
 /mob/living/carbon/slip(knockdown_amount, obj/O, lube)
 	if(movement_type & FLYING)
 		return 0
@@ -79,6 +79,8 @@
 	if(!appears_dead)
 		if(stat == UNCONSCIOUS)
 			msg += "[t_He] [t_is]n't responding to anything around [t_him] and seems to be asleep.\n"
+		else if(InCritical())
+			msg += "[t_His] breathing is shallow and labored.\n"

 		if(digitalcamo)
 			msg += "[t_He] [t_is] moving [t_his] body in an unnatural and blatantly unsimian manner.\n"
@@ -34,7 +34,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)

 	handcrafting = new()

-	..()
+	. = ..()

 /mob/living/carbon/human/create_internal_organs()
 	if(!(NOHUNGER in dna.species.species_traits))
@@ -613,7 +613,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)

 	//Check for dresscode violations
 	if(istype(head, /obj/item/clothing/head/wizard) || istype(head, /obj/item/clothing/head/helmet/space/hardsuit/wizard) || istype(head, /obj/item/clothing/head/helmet/space/hardsuit/syndi) || istype(head, /obj/item/clothing/head/helmet/space/hardsuit/shielded/syndi))
-		threatcount += 3
+		threatcount += 6

 	//Check for nonhuman scum
 	if(dna && dna.species.id && !(dna.species.id in list("human" , "lizard", "mammal", "avian", "aquatic", "insect")))
@@ -643,6 +643,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
 	update_hair()

 /mob/living/carbon/human/singularity_pull(S, current_size)
+	..()
 	if(current_size >= STAGE_THREE)
 		for(var/obj/item/hand in held_items)
 			if(prob(current_size * 5) && hand.w_class >= ((11-current_size)/2)  && dropItemToGround(hand))
@@ -651,7 +652,6 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
 	rad_act(current_size * 3)
 	if(mob_negates_gravity())
 		return
-	..()

 /mob/living/carbon/human/proc/do_cpr(mob/living/carbon/C)
 	CHECK_DNA_AND_SPECIES(C)
@@ -906,12 +906,12 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
 /mob/living/carbon/human/vv_get_dropdown()
 	. = ..()
 	. += "---"
-	.["Make monkey"] = "?_src_=vars;makemonkey=\ref[src]"
-	.["Set Species"] = "?_src_=vars;setspecies=\ref[src]"
-	.["Make cyborg"] = "?_src_=vars;makerobot=\ref[src]"
-	.["Make alien"] = "?_src_=vars;makealien=\ref[src]"
-	.["Make slime"] = "?_src_=vars;makeslime=\ref[src]"
-	.["Toggle Purrbation"] = "?_src_=vars;purrbation=\ref[src]"
+	.["Make monkey"] = "?_src_=vars;[HrefToken()];makemonkey=\ref[src]"
+	.["Set Species"] = "?_src_=vars;[HrefToken()];setspecies=\ref[src]"
+	.["Make cyborg"] = "?_src_=vars;[HrefToken()];makerobot=\ref[src]"
+	.["Make alien"] = "?_src_=vars;[HrefToken()];makealien=\ref[src]"
+	.["Make slime"] = "?_src_=vars;[HrefToken()];makeslime=\ref[src]"
+	.["Toggle Purrbation"] = "?_src_=vars;[HrefToken()];purrbation=\ref[src]"

 /mob/living/carbon/human/MouseDrop_T(mob/living/target, mob/living/user)
 	if((target != pulling) || (grab_state < GRAB_AGGRESSIVE) || (user != target) || !isliving(user) || stat || user.stat)//Get consent first :^)
@@ -105,9 +105,6 @@
 /mob/living/carbon/human/IsAdvancedToolUser()
 	return 1//Humans can use guns and such

-/mob/living/carbon/human/InCritical()
-	return (health <= HEALTH_THRESHOLD_CRIT && stat == UNCONSCIOUS)
-
 /mob/living/carbon/human/reagent_check(datum/reagent/R)
 	return dna.species.handle_chemicals(R,src)
 	// if it returns 0, it will run the usual on_mob_life for that reagent. otherwise, it will stop after running handle_chemicals for the species.
@@ -1,67 +1,67 @@
-/mob/living/carbon/human/movement_delay()
-	. = 0
-	. += ..()
-	. += config.human_delay
-	. += dna.species.movement_delay(src)
-
-/mob/living/carbon/human/slip(knockdown_amount, obj/O, lube)
+/mob/living/carbon/human/movement_delay()
+	. = 0
+	. += ..()
+	. += config.human_delay
+	. += dna.species.movement_delay(src)
+
+/mob/living/carbon/human/slip(knockdown_amount, obj/O, lube)
 	if(isobj(shoes) && (shoes.flags_1&NOSLIP_1) && !(lube&GALOSHES_DONT_HELP))
-		return 0
-	return ..()
-
-/mob/living/carbon/human/experience_pressure_difference()
-	playsound(src, 'sound/effects/space_wind.ogg', 50, 1)
+		return 0
+	return ..()
+
+/mob/living/carbon/human/experience_pressure_difference()
+	playsound(src, 'sound/effects/space_wind.ogg', 50, 1)
 	if(shoes && shoes.flags_1&NOSLIP_1)
-		return 0
-	return ..()
-
-/mob/living/carbon/human/mob_has_gravity()
-	. = ..()
-	if(!.)
-		if(mob_negates_gravity())
-			. = 1
-
-/mob/living/carbon/human/mob_negates_gravity()
-	return ((shoes && shoes.negates_gravity()) || dna.species.negates_gravity(src))
-
-/mob/living/carbon/human/Move(NewLoc, direct)
-	. = ..()
-	for(var/datum/mutation/human/HM in dna.mutations)
-		HM.on_move(src, NewLoc)
-	if(shoes)
-		if(!lying && !buckled)
-			if(loc == NewLoc)
-				if(!has_gravity(loc))
-					return
-				var/obj/item/clothing/shoes/S = shoes
-
-				//Bloody footprints
-				var/turf/T = get_turf(src)
-				if(S.bloody_shoes && S.bloody_shoes[S.blood_state])
-					var/obj/effect/decal/cleanable/blood/footprints/oldFP = locate(/obj/effect/decal/cleanable/blood/footprints) in T
-					if(oldFP && oldFP.blood_state == S.blood_state)
-						return
-					else
-						//No oldFP or it's a different kind of blood
-						S.bloody_shoes[S.blood_state] = max(0, S.bloody_shoes[S.blood_state]-BLOOD_LOSS_PER_STEP)
-						var/obj/effect/decal/cleanable/blood/footprints/FP = new /obj/effect/decal/cleanable/blood/footprints(T)
-						FP.blood_state = S.blood_state
-						FP.entered_dirs |= dir
-						FP.bloodiness = S.bloody_shoes[S.blood_state]
-						if(S.blood_DNA && S.blood_DNA.len)
-							FP.transfer_blood_dna(S.blood_DNA)
-						FP.update_icon()
-						update_inv_shoes()
-				//End bloody footprints
-
-				S.step_action()
-
-/mob/living/carbon/human/Moved()
-	. = ..()
-	if(buckled_mobs && buckled_mobs.len && riding_datum)
-		riding_datum.on_vehicle_move()
-
-/mob/living/carbon/human/Process_Spacemove(movement_dir = 0) //Temporary laziness thing. Will change to handles by species reee.
-	if(..())
-		return 1
-	return dna.species.space_move(src)
+		return 0
+	return ..()
+
+/mob/living/carbon/human/mob_has_gravity()
+	. = ..()
+	if(!.)
+		if(mob_negates_gravity())
+			. = 1
+
+/mob/living/carbon/human/mob_negates_gravity()
+	return ((shoes && shoes.negates_gravity()) || dna.species.negates_gravity(src))
+
+/mob/living/carbon/human/Move(NewLoc, direct)
+	. = ..()
+	for(var/datum/mutation/human/HM in dna.mutations)
+		HM.on_move(src, NewLoc)
+
+	if(shoes)
+		if(!lying && !buckled)
+			if(loc == NewLoc)
+				if(!has_gravity(loc))
+					return
+				var/obj/item/clothing/shoes/S = shoes
+
+				//Bloody footprints
+				var/turf/T = get_turf(src)
+				if(S.bloody_shoes && S.bloody_shoes[S.blood_state])
+					var/obj/effect/decal/cleanable/blood/footprints/oldFP = locate(/obj/effect/decal/cleanable/blood/footprints) in T
+					if(oldFP && oldFP.blood_state == S.blood_state)
+						return
+					else
+						//No oldFP or it's a different kind of blood
+						S.bloody_shoes[S.blood_state] = max(0, S.bloody_shoes[S.blood_state]-BLOOD_LOSS_PER_STEP)
+						var/obj/effect/decal/cleanable/blood/footprints/FP = new /obj/effect/decal/cleanable/blood/footprints(T)
+						FP.blood_state = S.blood_state
+						FP.entered_dirs |= dir
+						FP.bloodiness = S.bloody_shoes[S.blood_state]
+						if(S.blood_DNA && S.blood_DNA.len)
+							FP.transfer_blood_dna(S.blood_DNA)
+						FP.update_icon()
+						update_inv_shoes()
+				//End bloody footprints
+
+				S.step_action()
+/mob/living/carbon/human/Moved()
+	. = ..()
+	if(buckled_mobs && buckled_mobs.len && riding_datum)
+		riding_datum.on_vehicle_move()
+
+/mob/living/carbon/human/Process_Spacemove(movement_dir = 0) //Temporary laziness thing. Will change to handles by species reee.
+	if(..())
+		return 1
+	return dna.species.space_move(src)
@@ -87,17 +87,12 @@
 /// SNPC voice handling

 /mob/living/carbon/human/interactive/proc/loadVoice()
-	if(fexists("data/npc_saves/snpc.sav"))
-		var/savefile/S = new /savefile("data/npc_saves/snpc.sav")
-		S["knownStrings"] >> knownStrings
-		fdel(S)
-	else
-		var/json_file = file("data/npc_saves/snpc.json")
-		if(!fexists(json_file))
-			return
-		var/list/json = list()
-		json = json_decode(file2text(json_file))
-		knownStrings = json["knownStrings"]
+	var/json_file = file("data/npc_saves/snpc.json")
+	if(!fexists(json_file))
+		return
+	var/list/json = list()
+	json = json_decode(file2text(json_file))
+	knownStrings = json["knownStrings"]
 	if(isnull(knownStrings))
 		knownStrings = list()

@@ -295,7 +290,7 @@
 	//job specific favours
 	switch(myjob.title)
 		if("Assistant")
-			favoured_types = list(/obj/item/clothing, /obj/item/weapon)
+			favoured_types = list(/obj/item/clothing, /obj/item)
 		if("Captain","Head of Personnel")
 			favoured_types = list(/obj/item/clothing, /obj/item/stamp/captain, /obj/item/disk/nuclear)
 		if("Cook")
@@ -307,14 +302,14 @@
 			functions += "bartend"
 			restrictedJob = 1
 		if("Station Engineer","Chief Engineer","Atmospheric Technician")
-			favoured_types = list(/obj/item/stack, /obj/item/weapon, /obj/item/clothing)
+			favoured_types = list(/obj/item/stack, /obj/item, /obj/item/clothing)
 		if("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist")
 			favoured_types = list(/obj/item/reagent_containers/glass/beaker, /obj/item/storage/firstaid, /obj/item/stack/medical, /obj/item/reagent_containers/syringe)
 			functions += "healpeople"
 		if("Research Director","Scientist","Roboticist")
 			favoured_types = list(/obj/item/reagent_containers/glass/beaker, /obj/item/stack, /obj/item/reagent_containers)
 		if("Head of Security","Warden","Security Officer","Detective")
-			favoured_types = list(/obj/item/clothing, /obj/item/weapon, /obj/item/restraints)
+			favoured_types = list(/obj/item/clothing, /obj/item, /obj/item/restraints)
 		if("Janitor")
 			favoured_types = list(/obj/item/mop, /obj/item/reagent_containers/glass/bucket, /obj/item/reagent_containers/spray/cleaner, /obj/effect/decal/cleanable)
 			functions += "dojanitor"
@@ -324,7 +319,7 @@
 		if("Mime")
 			functions -= "chatter"
 		if("Botanist")
-			favoured_types = list(/obj/machinery/hydroponics,  /obj/item/reagent_containers, /obj/item/weapon)
+			favoured_types = list(/obj/machinery/hydroponics,  /obj/item/reagent_containers, /obj/item)
 			functions += "botany"
 			restrictedJob = 1
 		else
@@ -375,7 +370,7 @@
 	faction += "hostile"

 /mob/living/carbon/human/interactive/Initialize()
-	..()
+	. = ..()

 	set_species(/datum/species/synth)

@@ -644,7 +639,7 @@
 			insert_into_backpack() // dump random item into backpack to make space
 			//---------ITEMS
 			if(isitem(TARGET))
-				if(istype(TARGET, /obj/item/weapon))
+				if(istype(TARGET, /obj/item))
 					var/obj/item/W = TARGET
 					if(W.force >= best_force || prob((FUZZY_CHANCE_LOW+FUZZY_CHANCE_HIGH)/2))
 						if(!get_item_for_held_index(1) || !get_item_for_held_index(2))
@@ -1484,7 +1479,7 @@
 				foundFav = 1
 				return
 		if(!foundFav)
-			if(istype(test, /obj/item/weapon))
+			if(istype(test, /obj/item))
 				var/obj/item/R = test
 				if(R.force > 2) // make sure we don't equip any non-weaponlike items, ie bags and stuff
 					if(!best)
@@ -1509,7 +1504,7 @@
 					if(istype(A, /obj/item/gun))	// guns are for shooting, not throwing.
 						continue
 					if(prob(robustness))
-						if(istype(A, /obj/item/weapon))
+						if(istype(A, /obj/item))
 							var/obj/item/W = A
 							if(W.throwforce > 19) // Only throw worthwile stuff, no more lobbing wrenches at wenches
 								npcDrop(W,1)
@@ -1596,7 +1591,7 @@
 	TRAITS |= TRAIT_ROBUST
 	TRAITS |= TRAIT_MEAN
 	faction += "bot_angry"
-	..()
+	. = ..()

 /mob/living/carbon/human/interactive/friendly/Initialize()
 	TRAITS |= TRAIT_FRIENDLY
@@ -1604,7 +1599,7 @@
 	faction += "bot_friendly"
 	faction += "neutral"
 	functions -= "combat"
-	..()
+	. = ..()

 /mob/living/carbon/human/interactive/greytide/Initialize()
 	TRAITS |= TRAIT_ROBUST
@@ -1615,7 +1610,7 @@
 	targetInterestShift = 2 // likewise
 	faction += "bot_grey"
 	graytide = 1
-	..()
+	. = ..()

 //Walk softly and carry a big stick
 /mob/living/carbon/human/interactive/robust/Initialize()
@@ -1623,4 +1618,4 @@
 	TRAITS |= TRAIT_ROBUST
 	TRAITS |= TRAIT_SMART
 	faction += "bot_power"
-	..()
+	. = ..()
@@ -57,6 +57,8 @@
 /mob/living/carbon/human/calculate_affecting_pressure(pressure)
 	if((wear_suit && (wear_suit.flags_1 & STOPSPRESSUREDMAGE_1)) && (head && (head.flags_1 & STOPSPRESSUREDMAGE_1)))
 		return ONE_ATMOSPHERE
+	if(ismob(loc))
+		return ONE_ATMOSPHERE
 	else
 		return pressure

@@ -242,6 +244,9 @@

 	if(dna && (RESISTCOLD in dna.species.species_traits))
 		return 1
+	
+	if(ismob(loc))
+		return 1 //because lazy and being inside somemone insulates you from space

 	temperature = max(temperature, 2.7) //There is an occasional bug where the temperature is miscalculated in ares with a small amount of gas on them, so this is necessary to ensure that that bug does not affect this calculation. Space's temperature is 2.7K and most suits that are intended to protect against any cold, protect down to 2.0K.
 	var/thermal_protection_flags = get_cold_protection_flags(temperature)
@@ -417,7 +422,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 		if(drunkenness >= 91)
 			adjustBrainLoss(0.4)
 			if(prob(20) && !stat)
-				if(SSshuttle.emergency.mode == SHUTTLE_DOCKED && z == ZLEVEL_STATION) //QoL mainly
+				if(SSshuttle.emergency.mode == SHUTTLE_DOCKED && (z in GLOB.station_z_levels)) //QoL mainly
 					to_chat(src, "<span class='warning'>You're so tired... but you can't miss that shuttle...</span>")
 				else
 					to_chat(src, "<span class='warning'>Just a quick nap...</span>")
@@ -1108,7 +1108,7 @@

 					if(prob(15))
 						if(!( H.hair_style == "Shaved") || !(H.hair_style == "Bald") || (HAIR in species_traits))
-							to_chat(H, "<span class='danger'>Your hair starts to fall out in clumps...<span>")
+							to_chat(H, "<span class='danger'>Your hair starts to fall out in clumps...</span>")
 							addtimer(CALLBACK(src, .proc/go_bald, H), 50)

 				if(75 to 100)
@@ -9,6 +9,8 @@
 	attack_sound = 'sound/weapons/slash.ogg'
 	miss_sound = 'sound/weapons/slashmiss.ogg'
 	roundstart = 1
+	liked_food = MEAT | FRIED
+	disliked_food = TOXIC

 /datum/species/mammal/spec_death(gibbed, mob/living/carbon/human/H)
 	if(H)
@@ -24,12 +26,14 @@
 	say_mod = "chirps"
 	default_color = "BCAC9B"
 	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR)
-	mutant_bodyparts = list("snout", "wings", "taur", "mam_tail", "mam_body_markings")
+	mutant_bodyparts = list("snout", "wings", "taur", "mam_tail", "mam_body_markings", "taur")
 	default_features = list("snout" = "Sharp", "wings" = "None", "taur" = "None", "mam_body_markings" = "Hawk")
 	attack_verb = "peck"
 	attack_sound = 'sound/weapons/slash.ogg'
 	miss_sound = 'sound/weapons/slashmiss.ogg'
 	roundstart = 1
+	liked_food = MEAT | FRUIT
+	disliked_food = TOXIC

 /datum/species/avian/spec_death(gibbed, mob/living/carbon/human/H)
 	if(H)
@@ -44,12 +48,14 @@
 	id = "aquatic"
 	default_color = "BCAC9B"
 	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR)
-	mutant_bodyparts = list("mam_tail", "mam_body_markings", "mam_ears")
+	mutant_bodyparts = list("mam_tail", "mam_body_markings", "mam_ears", "taur")
 	default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF","mam_tail" = "shark", "mam_body_markings" = "None", "mam_ears" = "None")
 	attack_verb = "bite"
 	attack_sound = 'sound/weapons/bite.ogg'
 	miss_sound = 'sound/weapons/slashmiss.ogg'
 	roundstart = 1
+	liked_food = MEAT
+	disliked_food = TOXIC

 /datum/species/aquatic/spec_death(gibbed, mob/living/carbon/human/H)
 	if(H)
@@ -64,12 +70,14 @@
 	id = "insect"
 	default_color = "BCAC9B"
 	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR)
-	mutant_bodyparts = list("mam_body_markings", "mam_ears", "mam_tail")
+	mutant_bodyparts = list("mam_body_markings", "mam_ears", "mam_tail", "taur")
 	default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_body_markings" = "moth", "mam_tail" = "None", "mam_ears" = "None")
 	attack_verb = "flutter" //wat?
 	attack_sound = 'sound/weapons/slash.ogg'
 	miss_sound = 'sound/weapons/slashmiss.ogg'
 	roundstart = 1
+	liked_food = MEAT | FRUIT
+	disliked_food = TOXIC

 /datum/species/insect/spec_death(gibbed, mob/living/carbon/human/H)
 	if(H)
@@ -98,6 +106,7 @@
 	exotic_bloodtype = "L"
 	damage_overlay_type = "xeno"
 	roundstart = 1
+	liked_food = MEAT

 //Praise the Omnissiah, A challange worthy of my skills - HS

@@ -80,11 +80,11 @@
 /datum/species/golem/plasma/spec_life(mob/living/carbon/human/H)
 	if(H.bodytemperature > 750)
 		if(!boom_warning && H.on_fire)
-			to_chat(H, "<span class='userdanger'>You feel like you could blow up at any moment!<span>")
+			to_chat(H, "<span class='userdanger'>You feel like you could blow up at any moment!</span>")
 			boom_warning = TRUE
 	else
 		if(boom_warning)
-			to_chat(H, "<span class='notice'>You feel more stable.<span>")
+			to_chat(H, "<span class='notice'>You feel more stable.</span>")
 			boom_warning = FALSE

 	if(H.bodytemperature > 850 && H.on_fire && prob(25))
@@ -10,7 +10,7 @@
 	damage_overlay_type = ""
 	var/datum/action/innate/regenerate_limbs/regenerate_limbs
 	toxic_food = NONE
-	liked_food = NONE
+	liked_food = MEAT

 /datum/species/jelly/on_species_loss(mob/living/carbon/C)
 	if(regenerate_limbs)
@@ -1,23 +1,115 @@
-/datum/species/shadow
-	// Humans cursed to stay in the darkness, lest their life forces drain. They regain health in shadow and die in light.
-	name = "???"
-	id = "shadow"
-	sexes = 0
-	blacklisted = 1
-	ignored_by = list(/mob/living/simple_animal/hostile/faithless)
-	meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/shadow
-	species_traits = list(NOBREATH,NOBLOOD,RADIMMUNE,VIRUSIMMUNE)
-	dangerous_existence = 1
-	mutanteyes = /obj/item/organ/eyes/night_vision
-
-
-/datum/species/shadow/spec_life(mob/living/carbon/human/H)
-	var/light_amount = 0
-	if(isturf(H.loc))
-		var/turf/T = H.loc
-		light_amount = T.get_lumcount()
-
-		if(light_amount > 0.2) //if there's enough light, start dying
-			H.take_overall_damage(1,1)
-		else if (light_amount < 0.2) //heal in the dark
-			H.heal_overall_damage(1,1)
+/datum/species/shadow
+	// Humans cursed to stay in the darkness, lest their life forces drain. They regain health in shadow and die in light.
+	name = "???"
+	id = "shadow"
+	sexes = 0
+	blacklisted = 1
+	ignored_by = list(/mob/living/simple_animal/hostile/faithless)
+	meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/shadow
+	species_traits = list(NOBREATH,NOBLOOD,RADIMMUNE,VIRUSIMMUNE)
+
+	dangerous_existence = 1
+	mutanteyes = /obj/item/organ/eyes/night_vision
+
+
+/datum/species/shadow/spec_life(mob/living/carbon/human/H)
+	var/turf/T = H.loc
+	if(istype(T))
+		var/light_amount = T.get_lumcount()
+
+		if(light_amount > SHADOW_SPECIES_LIGHT_THRESHOLD) //if there's enough light, start dying
+			H.take_overall_damage(1,1)
+		else if (light_amount < SHADOW_SPECIES_LIGHT_THRESHOLD) //heal in the dark
+			H.heal_overall_damage(1,1)
+
+
+/datum/species/shadow/nightmare
+	name = "Nightmare"
+	id = "nightmare"
+	limbs_id = "shadow"
+	burnmod = 1.5
+	blacklisted = TRUE
+	no_equip = list(slot_wear_mask, slot_wear_suit, slot_gloves, slot_shoes, slot_w_uniform, slot_s_store)
+	species_traits = list(NOBREATH,RESISTCOLD,RESISTPRESSURE,NOGUNS,NOBLOOD,RADIMMUNE,VIRUSIMMUNE,PIERCEIMMUNE,NODISMEMBER,NO_UNDERWEAR,NOHUNGER)
+	mutanteyes = /obj/item/organ/eyes/night_vision/nightmare
+	var/obj/effect/proc_holder/spell/targeted/shadowwalk/shadowwalk
+
+	var/info_text = "You are a <span class='danger'>Nightmare</span>. The ability <span class='warning'>shadow walk</span> allows unlimited, unrestricted movement in the dark using. \
+					Your <span class='warning'>light eater</span> will destroy any light producing objects you attack, as well as destroy any lights a living creature may be holding. You will automatically dodge gunfire and melee attacks when on a dark tile."
+
+/datum/species/shadow/nightmare/on_species_gain(mob/living/carbon/C, datum/species/old_species)
+	. = ..()
+	var/obj/effect/proc_holder/spell/targeted/shadowwalk/SW = new
+	C.AddSpell(SW)
+	shadowwalk = SW
+	var/obj/item/light_eater/blade = new
+	C.put_in_hands(blade)
+
+	to_chat(C, "[info_text]")
+
+	C.real_name = "Nightmare"
+	C.name = "Nightmare"
+	if(C.mind)
+		C.mind.name = "Nightmare"
+	C.dna.real_name = "Nightmare"
+
+/datum/species/shadow/nightmare/on_species_loss(mob/living/carbon/C)
+	. = ..()
+	if(shadowwalk)
+		C.RemoveSpell(shadowwalk)
+
+/datum/species/shadow/nightmare/bullet_act(obj/item/projectile/P, mob/living/carbon/human/H)
+	var/turf/T = H.loc
+	if(istype(T))
+		var/light_amount = T.get_lumcount()
+		if(light_amount < SHADOW_SPECIES_LIGHT_THRESHOLD)
+			H.visible_message("<span class='danger'>[H] dances in the shadows, evading [P]!</span>")
+			playsound(T, "bullet_miss", 75, 1)
+			return -1
+	return 0
+
+/obj/item/light_eater
+	name = "light eater"
+	icon_state = "arm_blade"
+	item_state = "arm_blade"
+	force = 25
+	armour_penetration = 35
+	lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/antag/changeling_righthand.dmi'
+	flags_1 = ABSTRACT_1 | NODROP_1 | DROPDEL_1
+	w_class = WEIGHT_CLASS_HUGE
+	sharpness = IS_SHARP
+
+/obj/item/light_eater/afterattack(atom/movable/AM, mob/user, proximity)
+	if(!proximity)
+		return
+	if(isopenturf(AM)) //So you can actually melee with it
+		return
+	if(isliving(AM))
+		var/mob/living/L = AM
+		if(iscyborg(AM))
+			var/mob/living/silicon/robot/borg = AM
+			borg.update_headlamp(TRUE, 100)
+		else
+			for(var/obj/item/O in AM)
+				if(O.light_range && O.light_power)
+					disintegrate(O)
+		if(L.pulling && L.pulling.light_range && isitem(L.pulling))
+			disintegrate(L.pulling)
+	else if(isitem(AM))
+		var/obj/item/I = AM
+		if(I.light_range && I.light_power)
+			disintegrate(I)
+
+/obj/item/light_eater/proc/disintegrate(obj/item/O)
+	if(istype(O, /obj/item/device/pda))
+		var/obj/item/device/pda/PDA = O
+		PDA.set_light(0)
+		PDA.fon = 0
+		PDA.f_lum = 0
+		PDA.update_icon()
+		visible_message("<span class='danger'>The light in [PDA] shorts out!</span>")
+	else
+		visible_message("<span class='danger'>[O] is disintegrated by [src]!</span>")
+		O.burn()
+	playsound(src, 'sound/items/welder.ogg', 50, 1)
@@ -129,10 +129,10 @@ There are several things that need to be remembered:
 		if(dna && dna.species.sexes)
 			var/G = (gender == FEMALE) ? "f" : "m"
 			if(G == "f" && U.fitted != NO_FEMALE_UNIFORM)
-				uniform_overlay = U.build_worn_icon(state = "[t_color]", default_layer = UNIFORM_LAYER, default_icon_file = 'icons/mob/uniform.dmi', isinhands = FALSE, femaleuniform = U.fitted)
+				uniform_overlay = U.build_worn_icon(state = "[t_color]", default_layer = UNIFORM_LAYER, default_icon_file = ((w_uniform.icon_override) ? w_uniform.icon_override : 'icons/mob/uniform.dmi'), isinhands = FALSE, femaleuniform = U.fitted)

 		if(!uniform_overlay)
-			uniform_overlay = U.build_worn_icon(state = "[t_color]", default_layer = UNIFORM_LAYER, default_icon_file = 'icons/mob/uniform.dmi', isinhands = FALSE)
+			uniform_overlay = U.build_worn_icon(state = "[t_color]", default_layer = UNIFORM_LAYER, default_icon_file = ((w_uniform.icon_override) ? w_uniform.icon_override : 'icons/mob/uniform.dmi'), isinhands = FALSE)

 		overlays_standing[UNIFORM_LAYER] = uniform_overlay

@@ -154,7 +154,7 @@ There are several things that need to be remembered:
 		update_observer_view(wear_id)

 		//TODO: add an icon file for ID slot stuff, so it's less snowflakey
-		overlays_standing[ID_LAYER] = wear_id.build_worn_icon(state = wear_id.item_state, default_layer = ID_LAYER, default_icon_file = 'icons/mob/mob.dmi')
+		overlays_standing[ID_LAYER] = wear_id.build_worn_icon(state = wear_id.item_state, default_layer = ID_LAYER, default_icon_file = ((wear_id.icon_override) ? wear_id.icon_override : 'icons/mob/mob.dmi'))

 	apply_overlay(ID_LAYER)

@@ -185,7 +185,7 @@ There are several things that need to be remembered:
 		var/t_state = gloves.item_state
 		if(!t_state)
 			t_state = gloves.icon_state
-		overlays_standing[GLOVES_LAYER] = gloves.build_worn_icon(state = t_state, default_layer = GLOVES_LAYER, default_icon_file = 'icons/mob/hands.dmi')
+		overlays_standing[GLOVES_LAYER] = gloves.build_worn_icon(state = t_state, default_layer = GLOVES_LAYER, default_icon_file = ((gloves.icon_override) ? gloves.icon_override : 'icons/mob/hands.dmi'))

 	apply_overlay(GLOVES_LAYER)

@@ -208,7 +208,7 @@ There are several things that need to be remembered:
 		update_observer_view(glasses,1)
 		if(!(head && (head.flags_inv & HIDEEYES)) && !(wear_mask && (wear_mask.flags_inv & HIDEEYES)))

-			overlays_standing[GLASSES_LAYER] = glasses.build_worn_icon(state = glasses.icon_state, default_layer = GLASSES_LAYER, default_icon_file = 'icons/mob/eyes.dmi')
+			overlays_standing[GLASSES_LAYER] = glasses.build_worn_icon(state = glasses.icon_state, default_layer = GLASSES_LAYER, default_icon_file = ((glasses.icon_override) ? glasses.icon_override : 'icons/mob/eyes.dmi'))

 	apply_overlay(GLASSES_LAYER)

@@ -230,7 +230,7 @@ There are several things that need to be remembered:
 				client.screen += ears					//add it to the client's screen
 		update_observer_view(ears,1)

-		overlays_standing[EARS_LAYER] = ears.build_worn_icon(state = ears.icon_state, default_layer = EARS_LAYER, default_icon_file = 'icons/mob/ears.dmi')
+		overlays_standing[EARS_LAYER] = ears.build_worn_icon(state = ears.icon_state, default_layer = EARS_LAYER, default_icon_file = ((ears.icon_override) ? ears.icon_override : 'icons/mob/ears.dmi'))

 	apply_overlay(EARS_LAYER)

@@ -251,7 +251,7 @@ There are several things that need to be remembered:
 			if(hud_used.inventory_shown)			//if the inventory is open
 				client.screen += shoes					//add it to client's screen
 		update_observer_view(shoes,1)
-		overlays_standing[SHOES_LAYER] = shoes.build_worn_icon(state = shoes.icon_state, default_layer = SHOES_LAYER, default_icon_file = 'icons/mob/feet.dmi')
+		overlays_standing[SHOES_LAYER] = shoes.build_worn_icon(state = shoes.icon_state, default_layer = SHOES_LAYER, default_icon_file = ((shoes.icon_override) ? shoes.icon_override : 'icons/mob/feet.dmi'))

 	apply_overlay(SHOES_LAYER)

@@ -297,7 +297,7 @@ There are several things that need to be remembered:
 		if(!t_state)
 			t_state = belt.icon_state

-		overlays_standing[BELT_LAYER] = belt.build_worn_icon(state = t_state, default_layer = BELT_LAYER, default_icon_file = 'icons/mob/belt.dmi')
+		overlays_standing[BELT_LAYER] = belt.build_worn_icon(state = t_state, default_layer = BELT_LAYER, default_icon_file = ((belt.icon_override) ? belt.icon_override : 'icons/mob/belt.dmi'))


 	apply_overlay(BELT_LAYER)
@@ -318,7 +318,7 @@ There are several things that need to be remembered:
 				client.screen += wear_suit
 		update_observer_view(wear_suit,1)

-		overlays_standing[SUIT_LAYER] = wear_suit.build_worn_icon(state = wear_suit.icon_state, default_layer = SUIT_LAYER, default_icon_file = 'icons/mob/suit.dmi')
+		overlays_standing[SUIT_LAYER] = wear_suit.build_worn_icon(state = wear_suit.icon_state, default_layer = SUIT_LAYER, default_icon_file = ((wear_suit.icon_override) ? wear_suit.icon_override : 'icons/mob/suit.dmi'))

 	update_hair()
 	update_mutant_bodyparts()
@@ -48,6 +48,8 @@
 		return
 	if(istype(loc, /obj/machinery/atmospherics/components/unary/cryo_cell))
 		return
+	if(istype(loc, /obj/item/device/dogborg/sleeper))
+		return
 	if(ismob(loc))
 		return
 	var/datum/gas_mixture/environment
@@ -56,11 +58,16 @@

 	var/datum/gas_mixture/breath

-	if(health <= HEALTH_THRESHOLD_CRIT || (pulledby && pulledby.grab_state >= GRAB_KILL && !getorganslot("breathing_tube")))
-		losebreath++
+	if(!getorganslot("breathing_tube"))
+		if(health <= HEALTH_THRESHOLD_FULLCRIT || (pulledby && pulledby.grab_state >= GRAB_KILL))
+			losebreath++  //You can't breath at all when in critical or when being choked, so you're going to miss a breath
+
+		else if(health <= HEALTH_THRESHOLD_CRIT)
+			losebreath += 0.25 //You're having trouble breathing in soft crit, so you'll miss a breath one in four times
+

 	//Suffocate
-	if(losebreath > 0)
+	if(losebreath >= 1) //You've missed a breath, take oxy damage
 		losebreath--
 		if(prob(10))
 			emote("gasp")
@@ -148,7 +155,7 @@

 	else //Enough oxygen
 		failed_last_breath = 0
-		if(oxyloss)
+		if(health >= HEALTH_THRESHOLD_CRIT)
 			adjustOxyLoss(-5)
 		oxygen_used = breath_gases["o2"][MOLES]
 		clear_alert("not_enough_oxy")
@@ -3,3 +3,7 @@

 /mob/living/carbon/monkey/dust_animation()
 	new /obj/effect/temp_visual/dust_animation(loc, "dust-m")
+
+/mob/living/carbon/monkey/death(gibbed)
+	walk(src,0) // Stops dead monkeys from fleeing their attacker or climbing out from inside His Grace
+	. = ..()
@@ -147,7 +147,7 @@
 	aggressive = TRUE

 /mob/living/carbon/monkey/angry/Initialize()
-	..()
+	. = ..()
 	if(prob(10))
 		var/obj/item/clothing/head/helmet/justice/escape/helmet = new(src)
 		equip_to_slot_or_del(helmet,slot_head)
@@ -21,7 +21,7 @@
 		else
 			name = pick(pet_monkey_names)
 		gender = pick(MALE, FEMALE)
-	..()
+	. = ..()

 	//These have to be after the parent new to ensure that the monkey
 	//bodyparts are actually created before we try to equip things to
@@ -42,23 +42,15 @@
 	..()

 /mob/living/carbon/monkey/punpun/proc/Read_Memory()
-	if(fexists("data/npc_saves/Punpun.sav")) //legacy compatability to convert old format to new
-		var/savefile/S = new /savefile("data/npc_saves/Punpun.sav")
-		S["ancestor_name"]	>> ancestor_name
-		S["ancestor_chain"] >> ancestor_chain
-		S["relic_hat"]		>> relic_hat
-		S["relic_mask"]		>> relic_mask
-		fdel("data/npc_saves/Punpun.sav")
-	else
-		var/json_file = file("data/npc_saves/Punpun.json")
-		if(!fexists(json_file))
-			return
-		var/list/json = list()
-		json = json_decode(file2text(json_file))
-		ancestor_name = json["ancestor_name"]
-		ancestor_chain = json["ancestor_chain"]
-		relic_hat = json["relic_hat"]
-		relic_mask = json["relic_hat"]
+	var/json_file = file("data/npc_saves/Punpun.json")
+	if(!fexists(json_file))
+		return
+	var/list/json = list()
+	json = json_decode(file2text(json_file))
+	ancestor_name = json["ancestor_name"]
+	ancestor_chain = json["ancestor_chain"]
+	relic_hat = json["relic_hat"]
+	relic_mask = json["relic_hat"]

 /mob/living/carbon/monkey/punpun/proc/Write_Memory(dead, gibbed)
 	var/json_file = file("data/npc_saves/Punpun.json")
@@ -76,6 +68,6 @@
 	if(!ancestor_name)
 		file_data["ancestor_name"] = name
 	fdel(json_file)
-	WRITE_FILE(json_file, json_encode(json_file))
+	WRITE_FILE(json_file, json_encode(file_data))
 	if(!dead)
-		memory_saved = 1
+		memory_saved = 1
@@ -229,8 +229,8 @@
 /mob/living/verb/succumb(whispered as null)
 	set hidden = 1
 	if (InCritical())
-		src.log_message("Has [whispered ? "whispered his final words" : "succumbed to death"] with [round(health, 0.1)] points of health!", INDIVIDUAL_ATTACK_LOG)
-		src.adjustOxyLoss(src.health - HEALTH_THRESHOLD_DEAD)
+		log_message("Has [whispered ? "whispered his final words" : "succumbed to death"] while in [InFullCritical() ? "hard":"soft"] critical with [round(health, 0.1)] points of health!", INDIVIDUAL_ATTACK_LOG)
+		adjustOxyLoss(health - HEALTH_THRESHOLD_DEAD)
 		updatehealth()
 		if(!whispered)
 			to_chat(src, "<span class='notice'>You have given up life and succumbed to death.</span>")
@@ -241,7 +241,10 @@
 		return 1

 /mob/living/proc/InCritical()
-	return (health < HEALTH_THRESHOLD_CRIT && health > HEALTH_THRESHOLD_DEAD && stat == UNCONSCIOUS)
+	return (health <= HEALTH_THRESHOLD_CRIT && (stat == SOFT_CRIT || stat == UNCONSCIOUS))
+
+/mob/living/proc/InFullCritical()
+	return (health <= HEALTH_THRESHOLD_FULLCRIT && stat == UNCONSCIOUS)

 //This proc is used for mobs which are affected by pressure to calculate the amount of pressure that actually
 //affects them once clothing is factored in. ~Errorage
@@ -426,6 +429,7 @@
 		else
 			return 0

+	var/old_direction = dir
 	var/atom/movable/pullee = pulling
 	if(pullee && get_dist(src, pullee) > 1)
 		stop_pulling()
@@ -441,10 +445,6 @@

 		var/pull_dir = get_dir(src, pulling)
 		if(get_dist(src, pulling) > 1 || ((pull_dir - 1) & pull_dir)) //puller and pullee more than one tile away or in diagonal position
-			if(isliving(pulling))
-				var/mob/living/M = pulling
-				if(M.lying && !M.buckled && (prob(M.getBruteLoss()*200/M.maxHealth)))
-					M.makeTrail(T)
 			pulling.Move(T, get_dir(pulling, T)) //the pullee tries to reach our previous position
 			if(pulling && get_dist(src, pulling) > 1) //the pullee couldn't keep up
 				stop_pulling()
@@ -455,6 +455,10 @@
 	if (s_active && !(CanReach(s_active,view_only = TRUE)))
 		s_active.close(src)

+	if(lying && !buckled && prob(getBruteLoss()*200/maxHealth))
+
+		makeTrail(newloc, T, old_direction)
+
 /mob/living/movement_delay(ignorewalk = 0)
 	. = ..()
 	if(isopenturf(loc) && !is_flying())
@@ -471,31 +475,32 @@
 			if(MOVE_INTENT_WALK)
 				. += config.walk_speed

-/mob/living/proc/makeTrail(turf/T)
+/mob/living/proc/makeTrail(turf/target_turf, turf/start, direction)
 	if(!has_gravity())
 		return
-	var/blood_exists = 0
+	var/blood_exists = FALSE

-	for(var/obj/effect/decal/cleanable/trail_holder/C in src.loc) //checks for blood splatter already on the floor
-		blood_exists = 1
-	if (isturf(src.loc))
+	for(var/obj/effect/decal/cleanable/trail_holder/C in start) //checks for blood splatter already on the floor
+		blood_exists = TRUE
+	if(isturf(start))
 		var/trail_type = getTrail()
 		if(trail_type)
-			var/brute_ratio = round(getBruteLoss()/maxHealth, 0.1)
+			var/brute_ratio = round(getBruteLoss() / maxHealth, 0.1)
 			if(blood_volume && blood_volume > max(BLOOD_VOLUME_NORMAL*(1 - brute_ratio * 0.25), 0))//don't leave trail if blood volume below a threshold
 				blood_volume = max(blood_volume - max(1, brute_ratio * 2), 0) 					//that depends on our brute damage.
-				var/newdir = get_dir(T, src.loc)
-				if(newdir != src.dir)
-					newdir = newdir | src.dir
+				var/newdir = get_dir(target_turf, start)
+				if(newdir != direction)
+					newdir = newdir | direction
 					if(newdir == 3) //N + S
 						newdir = NORTH
 					else if(newdir == 12) //E + W
 						newdir = EAST
 				if((newdir in GLOB.cardinals) && (prob(50)))
-					newdir = turn(get_dir(T, src.loc), 180)
+					newdir = turn(get_dir(target_turf, start), 180)
 				if(!blood_exists)
-					new /obj/effect/decal/cleanable/trail_holder(src.loc)
-				for(var/obj/effect/decal/cleanable/trail_holder/TH in src.loc)
+					new /obj/effect/decal/cleanable/trail_holder(start)
+
+				for(var/obj/effect/decal/cleanable/trail_holder/TH in start)
 					if((!(newdir in TH.existing_dirs) || trail_type == "trails_1" || trail_type == "trails_2") && TH.existing_dirs.len <= 16) //maximum amount of overlays is 16 (all light & heavy directions filled)
 						TH.existing_dirs += newdir
 						TH.add_overlay(image('icons/effects/blood.dmi', trail_type, dir = newdir))
@@ -560,16 +565,16 @@

 	// climbing out of a gut
 	if(attempt_vr(src,"vore_process_resist",args)) return TRUE
-	
+
 	//Breaking out of a container (Locker, sleeper, cryo...)
 	else if(isobj(loc))
 		var/obj/C = loc
 		C.container_resist(src)

-	else if(has_status_effect(/datum/status_effect/freon))
+	else if(IsFrozen())
 		to_chat(src, "You start breaking out of the ice cube!")
 		if(do_mob(src, src, 40))
-			if(has_status_effect(/datum/status_effect/freon))
+			if(IsFrozen())
 				to_chat(src, "You break out of the ice cube!")
 				remove_status_effect(/datum/status_effect/freon)
 				update_canmove()
@@ -687,6 +692,7 @@
 						who.equip_to_slot(what, where, TRUE)

 /mob/living/singularity_pull(S, current_size)
+	..()
 	if(current_size >= STAGE_SIX)
 		throw_at(S,14,3, spin=1)
 	else
@@ -740,9 +746,6 @@

 	if(statpanel("Status"))
 		if(SSticker && SSticker.mode)
-			for(var/datum/gang/G in SSticker.mode.gangs)
-				if(G.is_dominating)
-					stat(null, "[G.name] Gang Takeover: [max(G.domination_time_remaining(), 0)]")
 			if(istype(SSticker.mode, /datum/game_mode/blob))
 				var/datum/game_mode/blob/B = SSticker.mode
 				if(B.message_sent)
@@ -946,13 +949,14 @@
 //Updates canmove, lying and icons. Could perhaps do with a rename but I can't think of anything to describe it.
 //Robots, animals and brains have their own version so don't worry about them
 /mob/living/proc/update_canmove()
-	var/ko = IsKnockdown() || IsUnconscious() || stat || (status_flags & FAKEDEATH)
+	var/ko = IsKnockdown() || IsUnconscious() || (stat && (stat != SOFT_CRIT || pulledby)) || (status_flags & FAKEDEATH)
+	var/move_and_fall = stat == SOFT_CRIT && !pulledby
 	var/chokehold = pulledby && pulledby.grab_state >= GRAB_NECK
 	var/buckle_lying = !(buckled && !buckled.buckle_lying)
 	var/has_legs = get_num_legs()
 	var/has_arms = get_num_arms()
 	var/ignore_legs = get_leg_ignore()
-	if(ko || resting || has_status_effect(STATUS_EFFECT_STUN) || chokehold)
+	if(ko || resting || move_and_fall || IsStun() || chokehold)
 		drop_all_held_items()
 		unset_machine()
 		if(pulling)
@@ -965,9 +969,9 @@
 	else if(!lying)
 		if(resting)
 			fall()
-		else if(ko || (!has_legs && !ignore_legs) || chokehold)
+		else if(ko || move_and_fall || (!has_legs && !ignore_legs) || chokehold)
 			fall(forced = 1)
-	canmove = !(ko || resting || has_status_effect(STATUS_EFFECT_STUN) || has_status_effect(/datum/status_effect/freon) || chokehold || buckled || (!has_legs && !ignore_legs && !has_arms))
+	canmove = !(ko || resting || IsStun() || IsFrozen() || chokehold || buckled || (!has_legs && !ignore_legs && !has_arms))
 	density = !lying
 	if(lying)
 		if(layer == initial(layer)) //to avoid special cases like hiding larvas.
@@ -75,3 +75,5 @@
 	var/datum/riding/riding_datum

 	var/datum/language/selected_default_language
+
+	var/last_words	//used for database logging
@@ -145,16 +145,18 @@ GLOBAL_LIST_INIT(department_radio_keys, list(

 	var/succumbed = FALSE

-	if(message_mode == MODE_WHISPER)
+	var/fullcrit = InFullCritical()
+	if((InCritical() && !fullcrit) || message_mode == MODE_WHISPER)
 		message_range = 1
-		spans |= SPAN_ITALICS
+		message_mode = MODE_WHISPER
 		log_talk(src,"[key_name(src)] : [message]",LOGWHISPER)
-		if(in_critical)
+		if(fullcrit)
 			var/health_diff = round(-HEALTH_THRESHOLD_DEAD + health)
 			// If we cut our message short, abruptly end it with a-..
 			var/message_len = length(message)
 			message = copytext(message, 1, health_diff) + "[message_len > health_diff ? "-.." : "..."]"
 			message = Ellipsis(message, 10, 1)
+			last_words = message
 			message_mode = MODE_WHISPER_CRIT
 			succumbed = TRUE
 	else
@@ -164,7 +166,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 	if(!message)
 		return

-	spans += get_spans()
+	spans |= get_spans()

 	if(language)
 		var/datum/language/L = GLOB.language_datum_instances[language]
@@ -178,6 +180,8 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 		spans |= SPAN_ITALICS
 	if(radio_return & REDUCE_RANGE)
 		message_range = 1
+	if(radio_return & NOPASS)
+		return 1

 	//No screams in space, unless you're next to someone.
 	var/turf/T = get_turf(src)
@@ -295,10 +299,10 @@ GLOBAL_LIST_INIT(department_radio_keys, list(

 /mob/living/proc/get_message_mode(message)
 	var/key = copytext(message, 1, 2)
-	if(key == ";")
-		return MODE_HEADSET
-	else if(key == "#")
+	if(key == "#")
 		return MODE_WHISPER
+	else if(key == ";")
+		return MODE_HEADSET
 	else if(length(message) > 2 && (key in GLOB.department_radio_prefixes))
 		var/key_symbol = lowertext(copytext(message, 2, 3))
 		return GLOB.department_radio_keys[key_symbol]
@@ -384,6 +388,8 @@ GLOBAL_LIST_INIT(department_radio_keys, list(

 /mob/living/proc/radio(message, message_mode, list/spans, language)
 	switch(message_mode)
+		if(MODE_WHISPER)
+			return ITALICS
 		if(MODE_R_HAND)
 			for(var/obj/item/r_hand in get_held_items_for_side("r", all = TRUE))
 				if (r_hand)
@@ -465,7 +465,7 @@
 	set category = "AI Commands"
 	set name = "Access Robot Control"
 	set desc = "Wirelessly control various automatic robots."
-	if(stat == 2)
+	if(stat == DEAD)
 		return //won't work if dead

 	if(control_disabled)
@@ -585,7 +585,7 @@
 	cameraFollow = null
 	var/cameralist[0]

-	if(stat == 2)
+	if(stat == DEAD)
 		return //won't work if dead

 	var/mob/living/silicon/ai/U = usr
@@ -629,7 +629,7 @@
 	set category = "AI Commands"
 	set name = "AI Status"

-	if(stat == 2)
+	if(stat == DEAD)
 		return //won't work if dead
 	var/list/ai_emotions = list("Very Happy", "Happy", "Neutral", "Unsure", "Confused", "Sad", "BSOD", "Blank", "Problems?", "Awesome", "Facepalm", "Friend Computer", "Dorfy", "Blue Glow", "Red Glow")
 	var/emote = input("Please, select a status!", "AI Status", null, null) in ai_emotions
@@ -652,7 +652,7 @@
 	set desc = "Change the default hologram available to AI to something else."
 	set category = "AI Commands"

-	if(stat == 2)
+	if(stat == DEAD)
 		return //won't work if dead
 	var/input
 	switch(alert("Would you like to select a hologram based on a crew member, an animal, or switch to a unique avatar?",,"Crew Member","Unique","Animal"))
@@ -774,7 +774,7 @@
 	set desc = "Allows you to change settings of your radio."
 	set category = "AI Commands"

-	if(stat == 2)
+	if(stat == DEAD)
 		return //won't work if dead

 	to_chat(src, "Accessing Subspace Transceiver control...")
@@ -790,7 +790,7 @@
 	set desc = "Modify the default radio setting for your automatic announcements."
 	set category = "AI Commands"

-	if(stat == 2)
+	if(stat == DEAD)
 		return //won't work if dead
 	set_autosay()

@@ -35,9 +35,9 @@
 	if(nuking)
 		set_security_level("red")
 		nuking = FALSE
-		for(var/obj/item/pinpointer/P in GLOB.pinpointer_list)
+		for(var/obj/item/pinpointer/nuke/P in GLOB.pinpointer_list)
 			P.switch_mode_to(TRACK_NUKE_DISK) //Party's over, back to work, everyone
-			P.nuke_warning = FALSE
+			P.alert = FALSE

 	if(doomsday_device)
 		doomsday_device.timing = FALSE
@@ -0,0 +1,13 @@
+diff a/code/modules/mob/living/silicon/ai/death.dm b/code/modules/mob/living/silicon/ai/death.dm	(rejected hunks)
+@@ -35,9 +35,9 @@
+ 	if(nuking)
+ 		set_security_level("red")
+ 		nuking = FALSE
+-		for(var/obj/item/weapon/pinpointer/P in GLOB.pinpointer_list)
+		for(var/obj/item/weapon/pinpointer/nuke/P in GLOB.pinpointer_list)
+ 			P.switch_mode_to(TRACK_NUKE_DISK) //Party's over, back to work, everyone
+-			P.nuke_warning = FALSE
+			P.alert = FALSE
+ 
+ 	if(doomsday_device)
+ 		doomsday_device.timing = FALSE
@@ -106,7 +106,7 @@
 	set category = "AI Commands"
 	set name = "Toggle Camera Acceleration"

-	if(usr.stat == 2)
+	if(usr.stat == DEAD)
 		return //won't work if dead
 	acceleration = !acceleration
 	to_chat(usr, "Camera acceleration has been toggled [acceleration ? "on" : "off"].")
@@ -2,7 +2,7 @@
 /mob/living/silicon/ai/proc/show_laws_verb()
 	set category = "AI Commands"
 	set name = "Show Laws"
-	if(usr.stat == 2)
+	if(usr.stat == DEAD)
 		return //won't work if dead
 	src.show_laws()

@@ -1,5 +1,5 @@
 /mob/living/silicon/ai/say(message, language)
-	if(parent && istype(parent) && parent.stat != 2) //If there is a defined "parent" AI, it is actually an AI, and it is alive, anything the AI tries to say is said by the parent instead.
+	if(parent && istype(parent) && parent.stat != DEAD) //If there is a defined "parent" AI, it is actually an AI, and it is alive, anything the AI tries to say is said by the parent instead.
 		parent.say(message, language)
 		return
 	..(message)
@@ -71,7 +71,7 @@
 	set desc = "Display a list of vocal words to announce to the crew."
 	set category = "AI Commands"

-	if(usr.stat == 2)
+	if(usr.stat == DEAD)
 		return //won't work if dead

 	var/dat = "Here is a list of words you can type into the 'Announcement' button to create sentences to vocally announce to everyone on the same level at you.<BR> \
@@ -2,5 +2,4 @@
 	if(mind && SSticker.mode)
 		SSticker.mode.remove_cultist(mind, 0, 0)
 		SSticker.mode.remove_revolutionary(mind, 0)
-		SSticker.mode.remove_gangster(mind, remove_bosses=1)
 	..()
@@ -104,7 +104,7 @@
 		pda.owner = text("[]", src)
 		pda.name = pda.owner + " (" + pda.ownjob + ")"

-	..()
+	. = ..()

 	var/datum/action/innate/pai/shell/AS = new /datum/action/innate/pai/shell
 	var/datum/action/innate/pai/chassis/AC = new /datum/action/innate/pai/chassis
@@ -93,7 +93,7 @@
 	return FALSE

 /mob/living/silicon/pai/proc/toggle_integrated_light()
-	if(!luminosity)
+	if(!light_range)
 		set_light(brightness_power)
 		to_chat(src, "<span class='notice'>You enable your integrated light.</span>")
 	else
@@ -32,7 +32,7 @@

 	if(temp)
 		left_part = temp
-	else if(src.stat == 2)						// Show some flavor text if the pAI is dead
+	else if(src.stat == DEAD)						// Show some flavor text if the pAI is dead
 		left_part = "<b><font color=red>�Rr�R �a�� ��Rr����o�</font></b>"
 		right_part = "<pre>Program index hash not found</pre>"

@@ -5,4 +5,3 @@
 	show_laws(0)
 	if(mind)
 		SSticker.mode.remove_revolutionary(mind)
-		SSticker.mode.remove_gangster(mind,1,remove_bosses=1)
@@ -72,7 +72,7 @@

 	var/lamp_max = 10 //Maximum brightness of a borg lamp. Set as a var for easy adjusting.
 	var/lamp_intensity = 0 //Luminosity of the headlamp. 0 is off. Higher settings than the minimum require power.
-	var/lamp_recharging = 0 //Flag for if the lamp is on cooldown after being forcibly disabled.
+	var/lamp_cooldown = 0 //Flag for if the lamp is on cooldown after being forcibly disabled.

 	var/sight_mode = 0
 	hud_possible = list(ANTAG_HUD, DIAG_STAT_HUD, DIAG_HUD, DIAG_BATT_HUD, DIAG_TRACK_HUD)
@@ -742,7 +742,7 @@
 	set_autosay()

 /mob/living/silicon/robot/proc/control_headlamp()
-	if(stat || lamp_recharging || low_power_mode)
+	if(stat || lamp_cooldown > world.time || low_power_mode)
 		to_chat(src, "<span class='danger'>This function is currently offline.</span>")
 		return

@@ -757,8 +757,7 @@
 	if(lamp_intensity && (turn_off || stat || low_power_mode))
 		to_chat(src, "<span class='danger'>Your headlamp has been deactivated.</span>")
 		lamp_intensity = 0
-		lamp_recharging = TRUE
-		addtimer(CALLBACK(src, .proc/reset_headlamp), cooldown)
+		lamp_cooldown = world.time + cooldown
 	else
 		set_light(lamp_intensity)

@@ -767,9 +766,6 @@

 	update_icons()

-/mob/living/silicon/robot/proc/reset_headlamp()
-	lamp_recharging = FALSE
-
 /mob/living/silicon/robot/proc/deconstruct()
 	var/turf/T = get_turf(src)
 	if (robot_suit)
@@ -828,7 +824,7 @@
 	var/set_module = /obj/item/robot_module/syndicate

 /mob/living/silicon/robot/syndicate/Initialize()
-	..()
+	. = ..()
 	cell.maxcharge = 25000
 	cell.charge = 25000
 	radio = new /obj/item/device/radio/borg/syndicate(src)
@@ -599,7 +599,7 @@
 		/obj/item/gun/ballistic/revolver/grenadelauncher/cyborg,
 		/obj/item/card/emag,
 		/obj/item/crowbar/cyborg,
-		/obj/item/pinpointer/syndicate/cyborg)
+		/obj/item/pinpointer/syndicate_cyborg)

 	ratvar_modules = list(
 		/obj/item/clockwork/slab/cyborg/security,
@@ -625,7 +625,7 @@
 		/obj/item/roller/robo,
 		/obj/item/card/emag,
 		/obj/item/crowbar/cyborg,
-		/obj/item/pinpointer/syndicate/cyborg,
+		/obj/item/pinpointer/syndicate_cyborg,
 		/obj/item/stack/medical/gauze/cyborg,
 		/obj/item/gun/medbeam)
 	ratvar_modules = list(
@@ -0,0 +1,19 @@
+diff a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm	(rejected hunks)
+@@ -519,7 +519,7 @@
+ 		/obj/item/weapon/gun/ballistic/revolver/grenadelauncher/cyborg,
+ 		/obj/item/weapon/card/emag,
+ 		/obj/item/weapon/crowbar/cyborg,
+-		/obj/item/weapon/pinpointer/syndicate/cyborg)
+		/obj/item/weapon/pinpointer/syndicate_cyborg)
+ 
+ 	ratvar_modules = list(
+ 		/obj/item/clockwork/slab/cyborg/security,
+@@ -545,7 +545,7 @@
+ 		/obj/item/roller/robo,
+ 		/obj/item/weapon/card/emag,
+ 		/obj/item/weapon/crowbar/cyborg,
+-		/obj/item/weapon/pinpointer/syndicate/cyborg,
+		/obj/item/weapon/pinpointer/syndicate_cyborg,
+ 		/obj/item/stack/medical/gauze/cyborg,
+ 		/obj/item/weapon/gun/medbeam)
+ 	ratvar_modules = list(
@@ -36,11 +36,11 @@
 	var/d_hud = DATA_HUD_DIAGNOSTIC //There is only one kind of diag hud

 	var/law_change_counter = 0
-	var/obj/machinery/camera/builtInCamera = null
-	var/updating = FALSE //portable camera camerachunk update
+	var/obj/machinery/camera/builtInCamera = null
+	var/updating = FALSE //portable camera camerachunk update

 /mob/living/silicon/Initialize()
-	. = ..()
+	. = ..()
 	GLOB.silicon_mobs += src
 	var/datum/atom_hud/data/diagnostic/diag_hud = GLOB.huds[DATA_HUD_DIAGNOSTIC]
 	diag_hud.add_to_hud(src)
@@ -56,7 +56,7 @@
 /mob/living/silicon/Destroy()
 	radio = null
 	aicamera = null
-	QDEL_NULL(builtInCamera)
+	QDEL_NULL(builtInCamera)
 	GLOB.silicon_mobs -= src
 	return ..()

@@ -310,7 +310,7 @@
 	else	//For department channels, if any, given by the internal radio.
 		for(var/key in GLOB.department_radio_keys)
 			if(GLOB.department_radio_keys[key] == Autochan)
-				radiomod = key
+				radiomod = ":" + key
 				break

 	to_chat(src, "<span class='notice'>Automatic announcements [Autochan == "None" ? "will not use the radio." : "set to [Autochan]."]</span>")
@@ -39,7 +39,7 @@
 	#define TILE_EMAG		7

 /mob/living/simple_animal/bot/floorbot/Initialize()
-	..()
+	. = ..()
 	update_icon()
 	var/datum/job/engineer/J = new/datum/job/engineer
 	access_card.access += J.get_access()
@@ -250,7 +250,7 @@
 			oldpatient = user

 /mob/living/simple_animal/bot/medbot/process_scan(mob/living/carbon/human/H)
-	if(H.stat == 2)
+	if(H.stat == DEAD)
 		return

 	if((H == oldpatient) && (world.time < last_found + 200))
@@ -47,7 +47,7 @@
 	var/bloodiness = 0

 /mob/living/simple_animal/bot/mulebot/Initialize()
-	..()
+	. = ..()
 	wires = new /datum/wires/mulebot(src)
 	var/datum/job/cargo_tech/J = new/datum/job/cargo_tech
 	access_card.access = J.get_access()
@@ -650,7 +650,7 @@
 /mob/living/simple_animal/bot/mulebot/proc/RunOver(mob/living/carbon/human/H)
 	add_logs(src, H, "run over", null, "(DAMTYPE: [uppertext(BRUTE)])")
 	H.visible_message("<span class='danger'>[src] drives over [H]!</span>", \
-					"<span class='userdanger'>[src] drives over you!<span>")
+					"<span class='userdanger'>[src] drives over you!</span>")
 	playsound(loc, 'sound/effects/splat.ogg', 50, 1)

 	var/damage = rand(5,15)
@@ -28,3 +28,6 @@
 	. = ..()
 	var/newcolor = rgb(rand(0, 255), rand(0, 255), rand(0, 255))
 	add_atom_colour(newcolor, FIXED_COLOUR_PRIORITY)
+
+/mob/living/simple_animal/butterfly/bee_friendly()
+	return TRUE //treaty signed at the Beeneeva convention
@@ -32,7 +32,7 @@
 	devourable = TRUE

 /mob/living/simple_animal/pet/cat/Initialize()
-	..()
+	. = ..()
 	verbs += /mob/living/proc/lay_down

 /mob/living/simple_animal/pet/cat/update_canmove()
@@ -92,7 +92,7 @@
 		icon_living = "original"
 		icon_dead = "original_dead"
 	Read_Memory()
-	..()
+	. = ..()

 /mob/living/simple_animal/pet/cat/Runtime/Life()
 	if(!cats_deployed && SSticker.current_state >= GAME_STATE_SETTING_UP)
@@ -113,17 +113,12 @@
 	..()

 /mob/living/simple_animal/pet/cat/Runtime/proc/Read_Memory()
-	if(fexists("data/npc_saves/Runtime.sav")) //legacy compatability to convert old format to new
-		var/savefile/S = new /savefile("data/npc_saves/Runtime.sav")
-		S["family"] >> family
-		fdel("data/npc_saves/Runtime.sav")
-	else
-		var/json_file = file("data/npc_saves/Runtime.json")
-		if(!fexists(json_file))
-			return
-		var/list/json = list()
-		json = json_decode(file2text(json_file))
-		family = json["family"]
+	var/json_file = file("data/npc_saves/Runtime.json")
+	if(!fexists(json_file))
+		return
+	var/list/json = list()
+	json = json_decode(file2text(json_file))
+	family = json["family"]
 	if(isnull(family))
 		family = list()

@@ -280,4 +275,4 @@
 	..()
 	if(L.a_intent == INTENT_HARM && L.reagents && !stat)
 		L.reagents.add_reagent("nutriment", 0.4)
-		L.reagents.add_reagent("vitamin", 0.4)
+		L.reagents.add_reagent("vitamin", 0.4)
@@ -1,47 +1,78 @@
-//Look Sir, free crabs!
-/mob/living/simple_animal/crab
-	name = "crab"
-	desc = "Free crabs!"
-	icon_state = "crab"
-	icon_living = "crab"
-	icon_dead = "crab_dead"
-	speak_emote = list("clicks")
-	emote_hear = list("clicks.")
-	emote_see = list("clacks.")
-	speak_chance = 1
-	turns_per_move = 5
-	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 1)
-	response_help  = "pets"
-	response_disarm = "gently pushes aside"
-	response_harm   = "stomps"
-	stop_automated_movement = 1
-	friendly = "pinches"
-	ventcrawler = VENTCRAWLER_ALWAYS
-	var/obj/item/inventory_head
-	var/obj/item/inventory_mask
-	gold_core_spawnable = 2
-	devourable = TRUE
-
-/mob/living/simple_animal/crab/Life()
-	..()
-	//CRAB movement
-	if(!ckey && !stat)
-		if(isturf(src.loc) && !resting && !buckled)		//This is so it only moves if it's not inside a closet, gentics machine, etc.
-			turns_since_move++
-			if(turns_since_move >= turns_per_move)
-				var/east_vs_west = pick(4,8)
-				if(Process_Spacemove(east_vs_west))
-					Move(get_step(src,east_vs_west), east_vs_west)
-					turns_since_move = 0
-	regenerate_icons()
-
-//COFFEE! SQUEEEEEEEEE!
-/mob/living/simple_animal/crab/Coffee
-	name = "Coffee"
-	real_name = "Coffee"
-	desc = "It's Coffee, the other pet!"
-	gender = FEMALE
-	response_help  = "pets"
-	response_disarm = "gently pushes aside"
-	response_harm   = "stomps"
-	gold_core_spawnable = 0
+//Look Sir, free crabs!
+/mob/living/simple_animal/crab
+	name = "crab"
+	desc = "Free crabs!"
+	icon_state = "crab"
+	icon_living = "crab"
+	icon_dead = "crab_dead"
+	speak_emote = list("clicks")
+	emote_hear = list("clicks.")
+	emote_see = list("clacks.")
+	speak_chance = 1
+	turns_per_move = 5
+	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 1)
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "stomps"
+	stop_automated_movement = 1
+	friendly = "pinches"
+	ventcrawler = VENTCRAWLER_ALWAYS
+	var/obj/item/inventory_head
+	var/obj/item/inventory_mask
+	gold_core_spawnable = 2
+	devourable = TRUE
+
+/mob/living/simple_animal/crab/Life()
+	..()
+	//CRAB movement
+	if(!ckey && !stat)
+		if(isturf(src.loc) && !resting && !buckled)		//This is so it only moves if it's not inside a closet, gentics machine, etc.
+			turns_since_move++
+			if(turns_since_move >= turns_per_move)
+				var/east_vs_west = pick(4,8)
+				if(Process_Spacemove(east_vs_west))
+					Move(get_step(src,east_vs_west), east_vs_west)
+					turns_since_move = 0
+	regenerate_icons()
+
+//COFFEE! SQUEEEEEEEEE!
+/mob/living/simple_animal/crab/Coffee
+	name = "Coffee"
+	real_name = "Coffee"
+	desc = "It's Coffee, the other pet!"
+	gender = FEMALE
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "stomps"
+	gold_core_spawnable = FALSE
+
+/mob/living/simple_animal/crab/evil
+	name = "Evil Crab"
+	real_name = "Evil Crab"
+	desc = "Unnerving, isn't it? It has to be planning something nefarious..."
+	icon_state = "evilcrab"
+	icon_living = "evilcrab"
+	icon_dead = "evilcrab_dead"
+	response_help = "pokes"
+	response_disarm = "shoves"
+	response_harm = "stomps"
+	gold_core_spawnable = TRUE
+
+/mob/living/simple_animal/crab/kreb
+	name = "Kreb"
+	desc = "This is a real crab. The other crabs are simply gubbucks in disguise!"
+	real_name = "Kreb"
+	icon_state = "kreb"
+	icon_living = "kreb"
+	icon_dead = "kreb_dead"
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "stomps"
+	gold_core_spawnable = FALSE
+
+/mob/living/simple_animal/crab/evil/kreb
+	name = "Evil Kreb"
+	real_name = "Evil Kreb"
+	icon_state = "evilkreb"
+	icon_living = "evilkreb"
+	icon_dead = "evilkreb_dead"
@@ -29,7 +29,6 @@
 	var/shaved = 0
 	var/obj/item/inventory_head
 	var/obj/item/inventory_back
-	var/facehugger
 	var/nofur = 0 		//Corgis that have risen past the material plane of existence.
 	gold_core_spawnable = 2

@@ -328,21 +327,14 @@
 	..()

 /mob/living/simple_animal/pet/dog/corgi/Ian/proc/Read_Memory()
-	if(fexists("data/npc_saves/Ian.sav")) //legacy compatability to convert old format to new
-		var/savefile/S = new /savefile("data/npc_saves/Ian.sav")
-		S["age"] 		>> age
-		S["record_age"]	>> record_age
-		S["saved_head"] >> saved_head
-		fdel("data/npc_saves/Ian.sav")
-	else
-		var/json_file = file("data/npc_saves/Ian.json")
-		if(!fexists(json_file))
-			return
-		var/list/json = list()
-		json = json_decode(file2text(json_file))
-		age = json["age"]
-		record_age = json["record_age"]
-		saved_head = json["saved_head"]
+	var/json_file = file("data/npc_saves/Ian.json")
+	if(!fexists(json_file))
+		return
+	var/list/json = list()
+	json = json_decode(file2text(json_file))
+	age = json["age"]
+	record_age = json["record_age"]
+	saved_head = json["saved_head"]
 	if(isnull(age))
 		age = 0
 	if(isnull(record_age))
@@ -463,13 +455,6 @@
 			back_icon = DF.get_overlay()
 		add_overlay(back_icon)

-	if(facehugger)
-		var/mutable_appearance/facehugger_overlay = mutable_appearance('icons/mob/mask.dmi')
-		if(istype(src, /mob/living/simple_animal/pet/dog/corgi/puppy))
-			facehugger_overlay.icon_state = "facehugger_corgipuppy"
-		else
-			facehugger_overlay.icon_state = "facehugger_corgi"
-		add_overlay(facehugger_overlay)
 	if(pcollar)
 		add_overlay(collar)
 		add_overlay(pettag)
@@ -576,4 +561,4 @@
 				emote("me", 1, "yaps happily!")
 		else
 			if(M && stat != DEAD) // Same check here, even though emote checks it as well (poor form to check it only in the help case)
-				emote("me", 1, "growls!")
+				emote("me", 1, "growls!")
@@ -33,7 +33,7 @@
 	flavortext = null

 /mob/living/simple_animal/drone/syndrone/Initialize()
-	..()
+	. = ..()
 	internal_storage.hidden_uplink.telecrystals = 10

 /mob/living/simple_animal/drone/syndrone/Login()
@@ -46,7 +46,7 @@
 	default_storage = /obj/item/device/radio/uplink/nuclear

 /mob/living/simple_animal/drone/syndrone/badass/Initialize()
-	..()
+	. = ..()
 	internal_storage.hidden_uplink.telecrystals = 30
 	var/obj/item/implant/weapons_auth/W = new/obj/item/implant/weapons_auth(src)
 	W.implant(src)
@@ -55,7 +55,7 @@
 	default_hatmask = /obj/item/clothing/head/chameleon/drone

 /mob/living/simple_animal/drone/snowflake/Initialize()
-	..()
+	. = ..()
 	desc += " This drone appears to have a complex holoprojector built on its 'head'."

 /obj/item/drone_shell/syndrone
@@ -15,6 +15,10 @@
 /mob/living/simple_animal/drone/verb/toggle_light()
 	set category = "Drone"
 	set name = "Toggle drone light"
+	
+	if(stat == DEAD)
+		to_chat(src, "<span class='warning'>There's no light in your life... by that I mean you're dead.</span>")
+		return
 	if(light_on)
 		set_light(0)
 	else
@@ -0,0 +1,65 @@
+#define GONDOLA_HEIGHT pick("gondola_body_long", "gondola_body_medium", "gondola_body_short")
+#define GONDOLA_COLOR pick("A87855", "915E48", "683E2C")
+#define GONDOLA_MOUSTACHE pick("gondola_moustache_large", "gondola_moustache_small")
+#define GONDOLA_EYES pick("gondola_eyes_close", "gondola_eyes_far")
+
+//Gondolas
+
+/mob/living/simple_animal/pet/gondola
+	name = "gondola"
+	real_name = "gondola"
+	desc = "Gondola is the silent walker. Having no hands he embodies the Taoist principle of wu-wei (non-action) while his smiling facial expression shows his utter and complete acceptance of the world as it is. Its hide is extremely valuable."
+	response_help = "pets"
+	response_disarm = "bops"
+	response_harm = "kicks"
+	faction = list("gondola")
+	turns_per_move = 10
+	icon = 'icons/mob/gondolas.dmi'
+	icon_state = "gondola"
+	icon_living = "gondola"
+	loot = list(/obj/effect/decal/cleanable/blood/gibs, /obj/item/stack/sheet/animalhide/gondola = 1)
+	//Gondolas aren't affected by cold.
+	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+	minbodytemp = 0
+	maxbodytemp = 1500
+	maxHealth = 200
+	health = 200
+	del_on_death = TRUE
+
+/mob/living/simple_animal/pet/gondola/Initialize()
+	. = ..()
+	CreateGondola()
+
+/mob/living/simple_animal/pet/gondola/proc/CreateGondola()
+	icon_state = null
+	icon_living = null
+	var/height = GONDOLA_HEIGHT
+	var/mutable_appearance/body_overlay = mutable_appearance(icon, height)
+	var/mutable_appearance/eyes_overlay = mutable_appearance(icon, GONDOLA_EYES)
+	var/mutable_appearance/moustache_overlay = mutable_appearance(icon, GONDOLA_MOUSTACHE)
+	body_overlay.color = ("#[GONDOLA_COLOR]")
+
+	//Offset the face to match the Gondola's height.
+	switch(height)
+		if("gondola_body_medium")
+			eyes_overlay.pixel_y = -4
+			moustache_overlay.pixel_y = -4
+		if("gondola_body_short")
+			eyes_overlay.pixel_y = -8
+			moustache_overlay.pixel_y = -8
+
+	cut_overlays(TRUE)
+	add_overlay(body_overlay)
+	add_overlay(eyes_overlay)
+	add_overlay(moustache_overlay)
+
+/mob/living/simple_animal/pet/gondola/IsVocal() //Gondolas are the silent walker.
+	return FALSE
+
+/mob/living/simple_animal/pet/gondola/emote()
+	return
+
+#undef GONDOLA_HEIGHT
+#undef GONDOLA_COLOR
+#undef GONDOLA_MOUSTACHE
+#undef GONDOLA_EYES
@@ -27,7 +27,7 @@
 	devourable = TRUE

 /mob/living/simple_animal/mouse/Initialize()
-	..()
+	. = ..()
 	if(!body_color)
 		body_color = pick( list("brown","gray","white") )
 	icon_state = "mouse_[body_color]"
@@ -24,11 +24,17 @@
 	butcher_results = list()
 	gold_core_spawnable = 2

+/mob/living/simple_animal/pet/penguin/emperor/shamebrero
+	name = "Shamebrero penguin."
+	desc = "Shameful of all he surveys."
+	icon_state = "penguin_shamebrero"
+	icon_living = "penguin_shamebrero"
+
 /mob/living/simple_animal/pet/penguin/baby
 	speak = list("gah", "noot noot", "noot!", "noot", "squeee!", "noo!")
 	name = "Penguin chick"
 	real_name = "penguin"
-	desc = "Can't fly and can barely waddles, but the prince of all chicks."
+	desc = "Can't fly and barely waddles, yet the prince of all chicks."
 	icon_state = "penguin_baby"
 	icon_living = "penguin_baby"
 	icon_dead = "penguin_baby_dead"
@@ -31,7 +31,7 @@
 		..()

 /mob/living/simple_animal/pet/Initialize()
-	..()
+	. = ..()
 	if(pcollar)
 		pcollar = new(src)
 		regenerate_icons()
@@ -54,10 +54,10 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 	GLOB.parasites += src
 	setthemename(theme)

-	..()
+	. = ..()

 /mob/living/simple_animal/hostile/guardian/med_hud_set_health()
-	if(summoner)
+	if(!QDELETED(summoner))
 		var/image/holder = hud_list[HEALTH_HUD]
 		holder.icon_state = "hud[RoundHealth(summoner)]"

@@ -129,7 +129,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 	update_health_hud() //we need to update all of our health displays to match our summoner and we can't practically give the summoner a hook to do it
 	med_hud_set_health()
 	med_hud_set_status()
-	if(summoner)
+	if(!QDELETED(summoner))
 		if(summoner.stat == DEAD)
 			forceMove(summoner.loc)
 			to_chat(src, "<span class='danger'>Your summoner has died!</span>")
@@ -659,7 +659,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 	name = "holoparasite injector kit"

 /obj/item/storage/box/syndie_kit/guardian/Initialize()
-	..()
+	. = ..()
 	new /obj/item/guardiancreator/tech/choose/traitor(src)
 	new /obj/item/paper/guides/antag/guardian(src)
 	return
@@ -17,7 +17,7 @@
 	var/obj/screen/alert/instealthalert

 /mob/living/simple_animal/hostile/guardian/assassin/Initialize()
-	..()
+	. = ..()
 	stealthcooldown = 0

 /mob/living/simple_animal/hostile/guardian/assassin/Life()
@@ -56,7 +56,7 @@


 /mob/living/simple_animal/hostile/poison/bees/Initialize()
-	..()
+	. = ..()
 	generate_bee_visuals()


@@ -275,7 +275,7 @@


 /obj/item/queen_bee/bought/Initialize()
-	..()
+	. = ..()
 	queen = new(src)


@@ -2,7 +2,7 @@
 	name = "A Perfectly Generic Boss Placeholder"
 	desc = ""
 	robust_searching = 1
-	stat_attack = 1
+	stat_attack = UNCONSCIOUS
 	status_flags = 0
 	a_intent = INTENT_HARM
 	gender = NEUTER
@@ -12,7 +12,7 @@


 /mob/living/simple_animal/hostile/boss/Initialize()
-	..()
+	. = ..()

 	atb = new()
 	atb.point_regen_delay = point_regen_delay
@@ -15,7 +15,7 @@
 	speed = 0
 	maxHealth = 80
 	health = 80
-	stat_attack = 1
+	stat_attack = UNCONSCIOUS
 	robust_searching = 1

 	harm_intent_damage = 10
@@ -15,7 +15,7 @@
 	attack_sound = 'sound/weapons/bite.ogg'
 	faction = list("creature")
 	robust_searching = 1
-	stat_attack = 2
+	stat_attack = DEAD
 	obj_damage = 0
 	environment_smash = ENVIRONMENT_SMASH_NONE
 	speak_emote = list("squeaks")
@@ -28,6 +28,9 @@
 	var/ranged_message = "fires" //Fluff text for ranged mobs
 	var/ranged_cooldown = 0 //What the current cooldown on ranged attacks is, generally world.time + ranged_cooldown_time
 	var/ranged_cooldown_time = 30 //How long, in deciseconds, the cooldown of ranged attacks is
+	var/ranged_telegraph = "prepares to fire at *TARGET*!" //A message shown when the mob prepares to fire; use *TARGET* if you want to show the target's name
+	var/ranged_telegraph_sound //A sound played when the mob prepares to fire
+	var/ranged_telegraph_time = 0 //In deciseconds, how long between the telegraph and ranged shot
 	var/ranged_ignores_vision = FALSE //if it'll fire ranged attacks even if it lacks vision on its target, only works with environment smash
 	var/check_friendly_fire = 0 // Should the ranged mob check for friendlies when shooting
 	var/retreat_distance = null //If our mob runs from players when they're too close, set in tile distance. By default, mobs do not retreat.
@@ -43,8 +46,8 @@
 	var/search_objects_timer_id //Timer for regaining our old search_objects value after being attacked
 	var/search_objects_regain_time = 30 //the delay between being attacked and gaining our old search_objects value back
 	var/list/wanted_objects = list() //A typecache of objects types that will be checked against to attack, should we have search_objects enabled
-	var/stat_attack = 0 //Mobs with stat_attack to 1 will attempt to attack things that are unconscious, Mobs with stat_attack set to 2 will attempt to attack the dead.
-	var/stat_exclusive = 0 //Mobs with this set to 1 will exclusively attack things defined by stat_attack, stat_attack 2 means they will only attack corpses
+	var/stat_attack = CONSCIOUS //Mobs with stat_attack to UNCONSCIOUS will attempt to attack things that are unconscious, Mobs with stat_attack set to 2 will attempt to attack the dead.
+	var/stat_exclusive = FALSE //Mobs with this set to TRUE will exclusively attack things defined by stat_attack, stat_attack 2 means they will only attack corpses
 	var/attack_same = 0 //Set us to 1 to allow us to attack our own faction, or 2, to only ever attack our own faction
 	var/AIStatus = AI_ON //The Status of our AI, can be set to AI_ON (On, usual processing), AI_IDLE (Will not process, but will return to AI_ON if an enemy comes near), AI_OFF (Off, Not processing ever)
 	var/atom/targets_from = null //all range/attack/etc. calculations should be done from this atom, defaults to the mob itself, useful for Vehicles and such
@@ -171,7 +174,7 @@
 			var/mob/living/L = the_target
 			var/faction_check = faction_check_mob(L)
 			if(robust_searching)
-				if(L.stat > stat_attack || L.stat != stat_attack && stat_exclusive == 1)
+				if(L.stat > stat_attack || L.stat != stat_attack && stat_exclusive)
 					return 0
 				if(faction_check && !attack_same || !faction_check && attack_same == 2)
 					return 0
@@ -232,7 +235,14 @@
 		var/target_distance = get_dist(targets_from,target)
 		if(ranged) //We ranged? Shoot at em
 			if(!target.Adjacent(targets_from) && ranged_cooldown <= world.time) //But make sure they're not in range for a melee attack and our range attack is off cooldown
-				OpenFire(target)
+				if(!ranged_telegraph_time || client)
+					OpenFire(target)
+				else
+					if(ranged_telegraph)
+						visible_message("<span class='danger'>[src] [replacetext(ranged_telegraph, "*TARGET*", "[target]")]</span>")
+					if(ranged_telegraph_sound)
+						playsound(src, ranged_telegraph_sound, 75, FALSE)
+					addtimer(CALLBACK(src, .proc/OpenFire, target), ranged_telegraph_time)
 		if(!Process_Spacemove()) //Drifting
 			walk(src,0)
 			return 1
@@ -19,7 +19,7 @@
 	pixel_x = -16
 	layer = LARGE_MOB_LAYER
 	speed = 10
-	stat_attack = 1
+	stat_attack = UNCONSCIOUS
 	robust_searching = 1
 	var/hopping = FALSE
 	var/hop_cooldown = 0 //Strictly for player controlled leapers
@@ -40,7 +40,7 @@
 	search_objects = 2

 /mob/living/simple_animal/hostile/syndicate/mecha_pilot/no_mech/Initialize()
-	..()
+	. = ..()
 	wanted_objects = typecacheof(/obj/mecha/combat, ignore_root_path=TRUE)

 /mob/living/simple_animal/hostile/syndicate/mecha_pilot/nanotrasen //nanotrasen are syndies! no it's just a weird path.
@@ -60,7 +60,7 @@


 /mob/living/simple_animal/hostile/syndicate/mecha_pilot/Initialize()
-	..()
+	. = ..()
 	if(spawn_mecha_type)
 		var/obj/mecha/M = new spawn_mecha_type (get_turf(src))
 		if(istype(M))
@@ -114,7 +114,7 @@ Difficulty: Medium
 		if(L.stat == DEAD)
 			visible_message("<span class='danger'>[src] butchers [L]!</span>",
 			"<span class='userdanger'>You butcher [L], restoring your health!</span>")
-			if(z != ZLEVEL_STATION && !client) //NPC monsters won't heal while on station
+			if(!(z in GLOB.station_z_levels && !client)) //NPC monsters won't heal while on station
 				if(guidance)
 					adjustHealth(-L.maxHealth)
 				else
@@ -105,11 +105,10 @@ Difficulty: Hard


 /mob/living/simple_animal/hostile/megafauna/bubblegum/Initialize()
-	..()
+	. = ..()
 	for(var/mob/living/simple_animal/hostile/megafauna/bubblegum/B in GLOB.mob_list)
 		if(B != src)
-			qdel(src) //There can be only one
-			return
+			return INITIALIZE_HINT_QDEL //There can be only one
 	var/obj/effect/proc_holder/spell/bloodcrawl/bloodspell = new
 	AddSpell(bloodspell)
 	if(istype(loc, /obj/effect/dummy/slaughter))
@@ -93,7 +93,7 @@ Difficulty: Very Hard


 /mob/living/simple_animal/hostile/megafauna/colossus/Initialize()
-	..()
+	. = ..()
 	internal = new/obj/item/device/gps/internal/colossus(src)

 /obj/effect/temp_visual/at_shield
@@ -289,17 +289,12 @@ Difficulty: Very Hard
 	memory_saved = TRUE

 /obj/machinery/smartfridge/black_box/proc/ReadMemory()
-	if(fexists("data/npc_saves/Blackbox.sav")) //legacy compatability to convert old format to new
-		var/savefile/S = new /savefile("data/npc_saves/Blackbox.sav")
-		S["stored_items"] >> stored_items
-		fdel("data/npc_saves/Blackbox.sav")
-	else
-		var/json_file = file("data/npc_saves/Blackbox.json")
-		if(!fexists(json_file))
-			return
-		var/list/json = list()
-		json = json_decode(file2text(json_file))
-		stored_items = json["data"]
+	var/json_file = file("data/npc_saves/Blackbox.json")
+	if(!fexists(json_file))
+		return
+	var/list/json = list()
+	json = json_decode(file2text(json_file))
+	stored_items = json["data"]
 	if(isnull(stored_items))
 		stored_items = list()

@@ -792,4 +787,4 @@ Difficulty: Very Hard
 #undef ACTIVATE_WEAPON
 #undef ACTIVATE_MAGIC

-#undef MEDAL_PREFIX
+#undef MEDAL_PREFIX
@@ -16,7 +16,7 @@
 	movement_type = FLYING
 	robust_searching = 1
 	ranged_ignores_vision = TRUE
-	stat_attack = 2
+	stat_attack = DEAD
 	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
 	damage_coeff = list(BRUTE = 1, BURN = 0.5, TOX = 1, CLONE = 1, STAMINA = 0, OXY = 1)
 	minbodytemp = 0
@@ -101,7 +101,7 @@
 	visible_message(
 		"<span class='danger'>[src] devours [L]!</span>",
 		"<span class='userdanger'>You feast on [L], restoring your health!</span>")
-	if(z != ZLEVEL_STATION && !client) //NPC monsters won't heal while on station
+	if(!(z in GLOB.station_z_levels && !client)) //NPC monsters won't heal while on station
 		adjustBruteLoss(-L.maxHealth/2)
 	L.gib()

@@ -1,268 +1,268 @@
-/mob/living/simple_animal/hostile/mimic
-	name = "crate"
-	desc = "A rectangular steel crate."
-	icon = 'icons/obj/crates.dmi'
-	icon_state = "crate"
-	icon_living = "crate"
-
-	response_help = "touches"
-	response_disarm = "pushes"
-	response_harm = "hits"
-	speed = 0
-	maxHealth = 250
-	health = 250
-	gender = NEUTER
-
-	harm_intent_damage = 5
-	melee_damage_lower = 8
-	melee_damage_upper = 12
-	attacktext = "attacks"
-	attack_sound = 'sound/weapons/punch1.ogg'
-	emote_taunt = list("growls")
-	speak_emote = list("creaks")
-	taunt_chance = 30
-
-	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
-	minbodytemp = 0
-
-	faction = list("mimic")
-	move_to_delay = 9
-	gold_core_spawnable = 1
-	del_on_death = 1
-
-// Aggro when you try to open them. Will also pickup loot when spawns and drop it when dies.
-/mob/living/simple_animal/hostile/mimic/crate
-	attacktext = "bites"
-	speak_emote = list("clatters")
-	stop_automated_movement = 1
-	wander = 0
+/mob/living/simple_animal/hostile/mimic
+	name = "crate"
+	desc = "A rectangular steel crate."
+	icon = 'icons/obj/crates.dmi'
+	icon_state = "crate"
+	icon_living = "crate"
+
+	response_help = "touches"
+	response_disarm = "pushes"
+	response_harm = "hits"
+	speed = 0
+	maxHealth = 250
+	health = 250
+	gender = NEUTER
+
+	harm_intent_damage = 5
+	melee_damage_lower = 8
+	melee_damage_upper = 12
+	attacktext = "attacks"
+	attack_sound = 'sound/weapons/punch1.ogg'
+	emote_taunt = list("growls")
+	speak_emote = list("creaks")
+	taunt_chance = 30
+
+	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+	minbodytemp = 0
+
+	faction = list("mimic")
+	move_to_delay = 9
+	gold_core_spawnable = 1
+	del_on_death = 1
+
+// Aggro when you try to open them. Will also pickup loot when spawns and drop it when dies.
+/mob/living/simple_animal/hostile/mimic/crate
+	attacktext = "bites"
+	speak_emote = list("clatters")
+	stop_automated_movement = 1
+	wander = 0
 	var/attempt_open = FALSE
-
-// Pickup loot
-/mob/living/simple_animal/hostile/mimic/crate/Initialize(mapload)
-	..()
-	if(mapload)	//eat shit
-		for(var/obj/item/I in loc)
-			I.loc = src
-
-/mob/living/simple_animal/hostile/mimic/crate/DestroySurroundings()
-	..()
-	if(prob(90))
-		icon_state = "[initial(icon_state)]open"
-	else
-		icon_state = initial(icon_state)
-
-/mob/living/simple_animal/hostile/mimic/crate/ListTargets()
-	if(attempt_open)
-		return ..()
-	return ..(1)
-
-/mob/living/simple_animal/hostile/mimic/crate/FindTarget()
-	. = ..()
-	if(.)
-		trigger()
-
-/mob/living/simple_animal/hostile/mimic/crate/AttackingTarget()
-	. = ..()
-	if(.)
-		icon_state = initial(icon_state)
-		if(prob(15) && iscarbon(target))
-			var/mob/living/carbon/C = target
-			C.Knockdown(40)
-			C.visible_message("<span class='danger'>\The [src] knocks down \the [C]!</span>", \
-					"<span class='userdanger'>\The [src] knocks you down!</span>")
-
-/mob/living/simple_animal/hostile/mimic/crate/proc/trigger()
-	if(!attempt_open)
-		visible_message("<b>[src]</b> starts to move!")
+
+// Pickup loot
+/mob/living/simple_animal/hostile/mimic/crate/Initialize(mapload)
+	. = ..()
+	if(mapload)	//eat shit
+		for(var/obj/item/I in loc)
+			I.loc = src
+
+/mob/living/simple_animal/hostile/mimic/crate/DestroySurroundings()
+	..()
+	if(prob(90))
+		icon_state = "[initial(icon_state)]open"
+	else
+		icon_state = initial(icon_state)
+
+/mob/living/simple_animal/hostile/mimic/crate/ListTargets()
+	if(attempt_open)
+		return ..()
+	return ..(1)
+
+/mob/living/simple_animal/hostile/mimic/crate/FindTarget()
+	. = ..()
+	if(.)
+		trigger()
+
+/mob/living/simple_animal/hostile/mimic/crate/AttackingTarget()
+	. = ..()
+	if(.)
+		icon_state = initial(icon_state)
+		if(prob(15) && iscarbon(target))
+			var/mob/living/carbon/C = target
+			C.Knockdown(40)
+			C.visible_message("<span class='danger'>\The [src] knocks down \the [C]!</span>", \
+					"<span class='userdanger'>\The [src] knocks you down!</span>")
+
+/mob/living/simple_animal/hostile/mimic/crate/proc/trigger()
+	if(!attempt_open)
+		visible_message("<b>[src]</b> starts to move!")
 		attempt_open = TRUE
-
-/mob/living/simple_animal/hostile/mimic/crate/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
-	trigger()
-	. = ..()
-
-/mob/living/simple_animal/hostile/mimic/crate/LoseTarget()
-	..()
-	icon_state = initial(icon_state)
-
-/mob/living/simple_animal/hostile/mimic/crate/death()
-	var/obj/structure/closet/crate/C = new(get_turf(src))
-	// Put loot in crate
-	for(var/obj/O in src)
-		O.loc = C
-	..()
-
-GLOBAL_LIST_INIT(protected_objects, list(/obj/structure/table, /obj/structure/cable, /obj/structure/window))
-
-/mob/living/simple_animal/hostile/mimic/copy
-	health = 100
-	maxHealth = 100
-	var/mob/living/creator = null // the creator
-	var/destroy_objects = 0
-	var/knockdown_people = 0
-	var/static/mutable_appearance/googly_eyes = mutable_appearance('icons/mob/mob.dmi', "googly_eyes")
-	gold_core_spawnable = 0
-
-/mob/living/simple_animal/hostile/mimic/copy/Initialize(mapload, obj/copy, mob/living/creator, destroy_original = 0)
-	..()
-	CopyObject(copy, creator, destroy_original)
-
-/mob/living/simple_animal/hostile/mimic/copy/Life()
-	..()
-	if(!target && !ckey) //Objects eventually revert to normal if no one is around to terrorize
-		adjustBruteLoss(1)
-	for(var/mob/living/M in contents) //a fix for animated statues from the flesh to stone spell
-		death()
-
-/mob/living/simple_animal/hostile/mimic/copy/death()
-	for(var/atom/movable/M in src)
-		M.loc = get_turf(src)
-	..()
-
-/mob/living/simple_animal/hostile/mimic/copy/ListTargets()
-	. = ..()
-	return . - creator
-
-/mob/living/simple_animal/hostile/mimic/copy/proc/ChangeOwner(mob/owner)
-	if(owner != creator)
-		LoseTarget()
-		creator = owner
-		faction |= "\ref[owner]"
-
-/mob/living/simple_animal/hostile/mimic/copy/proc/CheckObject(obj/O)
-	if((isitem(O) || istype(O, /obj/structure)) && !is_type_in_list(O, GLOB.protected_objects))
-		return 1
-	return 0
-
-/mob/living/simple_animal/hostile/mimic/copy/proc/CopyObject(obj/O, mob/living/user, destroy_original = 0)
-	if(destroy_original || CheckObject(O))
-		O.loc = src
-		name = O.name
-		desc = O.desc
-		icon = O.icon
-		icon_state = O.icon_state
-		icon_living = icon_state
-		copy_overlays(O)
-		add_overlay(googly_eyes)
-		if(istype(O, /obj/structure) || istype(O, /obj/machinery))
-			health = (anchored * 50) + 50
-			destroy_objects = 1
-			if(O.density && O.anchored)
-				knockdown_people = 1
-				melee_damage_lower *= 2
-				melee_damage_upper *= 2
-		else if(isitem(O))
-			var/obj/item/I = O
-			health = 15 * I.w_class
-			melee_damage_lower = 2 + I.force
-			melee_damage_upper = 2 + I.force
-			move_to_delay = 2 * I.w_class + 1
-		maxHealth = health
-		if(user)
-			creator = user
-			faction += "\ref[creator]" // very unique
-		if(destroy_original)
-			qdel(O)
-		return 1
-
-/mob/living/simple_animal/hostile/mimic/copy/DestroySurroundings()
-	if(destroy_objects)
-		..()
-
-/mob/living/simple_animal/hostile/mimic/copy/AttackingTarget()
-	. = ..()
-	if(knockdown_people && . && prob(15) && iscarbon(target))
-		var/mob/living/carbon/C = target
-		C.Knockdown(40)
-		C.visible_message("<span class='danger'>\The [src] knocks down \the [C]!</span>", \
-				"<span class='userdanger'>\The [src] knocks you down!</span>")
-
-/mob/living/simple_animal/hostile/mimic/copy/machine
-	speak = list("HUMANS ARE IMPERFECT!", "YOU SHALL BE ASSIMILATED!", "YOU ARE HARMING YOURSELF", "You have been deemed hazardous. Will you comply?", \
-				 "My logic is undeniable.", "One of us.", "FLESH IS WEAK", "THIS ISN'T WAR, THIS IS EXTERMINATION!")
-	speak_chance = 7
-
-/mob/living/simple_animal/hostile/mimic/copy/machine/CanAttack(atom/the_target)
-	if(the_target == creator) // Don't attack our creator AI.
-		return 0
-	if(iscyborg(the_target))
-		var/mob/living/silicon/robot/R = the_target
-		if(R.connected_ai == creator) // Only attack robots that aren't synced to our creator AI.
-			return 0
-	return ..()
-
-
-
-/mob/living/simple_animal/hostile/mimic/copy/ranged
-	var/obj/item/gun/TrueGun = null
-	var/obj/item/gun/magic/Zapstick
-	var/obj/item/gun/ballistic/Pewgun
-	var/obj/item/gun/energy/Zapgun
-
-/mob/living/simple_animal/hostile/mimic/copy/ranged/CopyObject(obj/O, mob/living/creator, destroy_original = 0)
-	if(..())
-		emote_see = list("aims menacingly")
-		obj_damage = 0
-		environment_smash = ENVIRONMENT_SMASH_NONE //needed? seems weird for them to do so
-		ranged = 1
-		retreat_distance = 1 //just enough to shoot
-		minimum_distance = 6
-		var/obj/item/gun/G = O
-		melee_damage_upper = G.force
-		melee_damage_lower = G.force - max(0, (G.force / 2))
-		move_to_delay = 2 * G.w_class + 1
-		projectilesound = G.fire_sound
-		TrueGun = G
-		if(istype(G, /obj/item/gun/magic))
-			Zapstick = G
-			var/obj/item/ammo_casing/magic/M = Zapstick.ammo_type
-			projectiletype = initial(M.projectile_type)
-		if(istype(G, /obj/item/gun/ballistic))
-			Pewgun = G
-			var/obj/item/ammo_box/magazine/M = Pewgun.mag_type
-			casingtype = initial(M.ammo_type)
-		if(istype(G, /obj/item/gun/energy))
-			Zapgun = G
-			var/selectfiresetting = Zapgun.select
-			var/obj/item/ammo_casing/energy/E = Zapgun.ammo_type[selectfiresetting]
-			projectiletype = initial(E.projectile_type)
-
-/mob/living/simple_animal/hostile/mimic/copy/ranged/OpenFire(the_target)
-	if(Zapgun)
-		if(Zapgun.cell)
-			var/obj/item/ammo_casing/energy/shot = Zapgun.ammo_type[Zapgun.select]
-			if(Zapgun.cell.charge >= shot.e_cost)
-				Zapgun.cell.use(shot.e_cost)
-				Zapgun.update_icon()
-				..()
-	else if(Zapstick)
-		if(Zapstick.charges)
-			Zapstick.charges--
-			Zapstick.update_icon()
-			..()
-	else if(Pewgun)
-		if(Pewgun.chambered)
-			if(Pewgun.chambered.BB)
-				qdel(Pewgun.chambered.BB)
-				Pewgun.chambered.BB = null //because qdel takes too long, ensures icon update
-				Pewgun.chambered.update_icon()
-				..()
-			else
-				visible_message("<span class='danger'>The <b>[src]</b> clears a jam!</span>")
-			Pewgun.chambered.loc = loc //rip revolver immersions, blame shotgun snowflake procs
-			Pewgun.chambered = null
-			if(Pewgun.magazine && Pewgun.magazine.stored_ammo.len)
-				Pewgun.chambered = Pewgun.magazine.get_round(0)
-				Pewgun.chambered.loc = Pewgun
-			Pewgun.update_icon()
-		else if(Pewgun.magazine && Pewgun.magazine.stored_ammo.len) //only true for pumpguns i think
-			Pewgun.chambered = Pewgun.magazine.get_round(0)
-			Pewgun.chambered.loc = Pewgun
-			visible_message("<span class='danger'>The <b>[src]</b> cocks itself!</span>")
-	else
-		ranged = 0 //BANZAIIII
-		retreat_distance = 0
-		minimum_distance = 1
-		return
-	icon_state = TrueGun.icon_state
-	icon_living = TrueGun.icon_state
+
+/mob/living/simple_animal/hostile/mimic/crate/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
+	trigger()
+	. = ..()
+
+/mob/living/simple_animal/hostile/mimic/crate/LoseTarget()
+	..()
+	icon_state = initial(icon_state)
+
+/mob/living/simple_animal/hostile/mimic/crate/death()
+	var/obj/structure/closet/crate/C = new(get_turf(src))
+	// Put loot in crate
+	for(var/obj/O in src)
+		O.loc = C
+	..()
+
+GLOBAL_LIST_INIT(protected_objects, list(/obj/structure/table, /obj/structure/cable, /obj/structure/window))
+
+/mob/living/simple_animal/hostile/mimic/copy
+	health = 100
+	maxHealth = 100
+	var/mob/living/creator = null // the creator
+	var/destroy_objects = 0
+	var/knockdown_people = 0
+	var/static/mutable_appearance/googly_eyes = mutable_appearance('icons/mob/mob.dmi', "googly_eyes")
+	gold_core_spawnable = 0
+
+/mob/living/simple_animal/hostile/mimic/copy/Initialize(mapload, obj/copy, mob/living/creator, destroy_original = 0)
+	. = ..()
+	CopyObject(copy, creator, destroy_original)
+
+/mob/living/simple_animal/hostile/mimic/copy/Life()
+	..()
+	if(!target && !ckey) //Objects eventually revert to normal if no one is around to terrorize
+		adjustBruteLoss(1)
+	for(var/mob/living/M in contents) //a fix for animated statues from the flesh to stone spell
+		death()
+
+/mob/living/simple_animal/hostile/mimic/copy/death()
+	for(var/atom/movable/M in src)
+		M.loc = get_turf(src)
+	..()
+
+/mob/living/simple_animal/hostile/mimic/copy/ListTargets()
+	. = ..()
+	return . - creator
+
+/mob/living/simple_animal/hostile/mimic/copy/proc/ChangeOwner(mob/owner)
+	if(owner != creator)
+		LoseTarget()
+		creator = owner
+		faction |= "\ref[owner]"
+
+/mob/living/simple_animal/hostile/mimic/copy/proc/CheckObject(obj/O)
+	if((isitem(O) || istype(O, /obj/structure)) && !is_type_in_list(O, GLOB.protected_objects))
+		return 1
+	return 0
+
+/mob/living/simple_animal/hostile/mimic/copy/proc/CopyObject(obj/O, mob/living/user, destroy_original = 0)
+	if(destroy_original || CheckObject(O))
+		O.loc = src
+		name = O.name
+		desc = O.desc
+		icon = O.icon
+		icon_state = O.icon_state
+		icon_living = icon_state
+		copy_overlays(O)
+		add_overlay(googly_eyes)
+		if(istype(O, /obj/structure) || istype(O, /obj/machinery))
+			health = (anchored * 50) + 50
+			destroy_objects = 1
+			if(O.density && O.anchored)
+				knockdown_people = 1
+				melee_damage_lower *= 2
+				melee_damage_upper *= 2
+		else if(isitem(O))
+			var/obj/item/I = O
+			health = 15 * I.w_class
+			melee_damage_lower = 2 + I.force
+			melee_damage_upper = 2 + I.force
+			move_to_delay = 2 * I.w_class + 1
+		maxHealth = health
+		if(user)
+			creator = user
+			faction += "\ref[creator]" // very unique
+		if(destroy_original)
+			qdel(O)
+		return 1
+
+/mob/living/simple_animal/hostile/mimic/copy/DestroySurroundings()
+	if(destroy_objects)
+		..()
+
+/mob/living/simple_animal/hostile/mimic/copy/AttackingTarget()
+	. = ..()
+	if(knockdown_people && . && prob(15) && iscarbon(target))
+		var/mob/living/carbon/C = target
+		C.Knockdown(40)
+		C.visible_message("<span class='danger'>\The [src] knocks down \the [C]!</span>", \
+				"<span class='userdanger'>\The [src] knocks you down!</span>")
+
+/mob/living/simple_animal/hostile/mimic/copy/machine
+	speak = list("HUMANS ARE IMPERFECT!", "YOU SHALL BE ASSIMILATED!", "YOU ARE HARMING YOURSELF", "You have been deemed hazardous. Will you comply?", \
+				 "My logic is undeniable.", "One of us.", "FLESH IS WEAK", "THIS ISN'T WAR, THIS IS EXTERMINATION!")
+	speak_chance = 7
+
+/mob/living/simple_animal/hostile/mimic/copy/machine/CanAttack(atom/the_target)
+	if(the_target == creator) // Don't attack our creator AI.
+		return 0
+	if(iscyborg(the_target))
+		var/mob/living/silicon/robot/R = the_target
+		if(R.connected_ai == creator) // Only attack robots that aren't synced to our creator AI.
+			return 0
+	return ..()
+
+
+
+/mob/living/simple_animal/hostile/mimic/copy/ranged
+	var/obj/item/gun/TrueGun = null
+	var/obj/item/gun/magic/Zapstick
+	var/obj/item/gun/ballistic/Pewgun
+	var/obj/item/gun/energy/Zapgun
+
+/mob/living/simple_animal/hostile/mimic/copy/ranged/CopyObject(obj/O, mob/living/creator, destroy_original = 0)
+	if(..())
+		emote_see = list("aims menacingly")
+		obj_damage = 0
+		environment_smash = ENVIRONMENT_SMASH_NONE //needed? seems weird for them to do so
+		ranged = 1
+		retreat_distance = 1 //just enough to shoot
+		minimum_distance = 6
+		var/obj/item/gun/G = O
+		melee_damage_upper = G.force
+		melee_damage_lower = G.force - max(0, (G.force / 2))
+		move_to_delay = 2 * G.w_class + 1
+		projectilesound = G.fire_sound
+		TrueGun = G
+		if(istype(G, /obj/item/gun/magic))
+			Zapstick = G
+			var/obj/item/ammo_casing/magic/M = Zapstick.ammo_type
+			projectiletype = initial(M.projectile_type)
+		if(istype(G, /obj/item/gun/ballistic))
+			Pewgun = G
+			var/obj/item/ammo_box/magazine/M = Pewgun.mag_type
+			casingtype = initial(M.ammo_type)
+		if(istype(G, /obj/item/gun/energy))
+			Zapgun = G
+			var/selectfiresetting = Zapgun.select
+			var/obj/item/ammo_casing/energy/E = Zapgun.ammo_type[selectfiresetting]
+			projectiletype = initial(E.projectile_type)
+
+/mob/living/simple_animal/hostile/mimic/copy/ranged/OpenFire(the_target)
+	if(Zapgun)
+		if(Zapgun.cell)
+			var/obj/item/ammo_casing/energy/shot = Zapgun.ammo_type[Zapgun.select]
+			if(Zapgun.cell.charge >= shot.e_cost)
+				Zapgun.cell.use(shot.e_cost)
+				Zapgun.update_icon()
+				..()
+	else if(Zapstick)
+		if(Zapstick.charges)
+			Zapstick.charges--
+			Zapstick.update_icon()
+			..()
+	else if(Pewgun)
+		if(Pewgun.chambered)
+			if(Pewgun.chambered.BB)
+				qdel(Pewgun.chambered.BB)
+				Pewgun.chambered.BB = null //because qdel takes too long, ensures icon update
+				Pewgun.chambered.update_icon()
+				..()
+			else
+				visible_message("<span class='danger'>The <b>[src]</b> clears a jam!</span>")
+			Pewgun.chambered.loc = loc //rip revolver immersions, blame shotgun snowflake procs
+			Pewgun.chambered = null
+			if(Pewgun.magazine && Pewgun.magazine.stored_ammo.len)
+				Pewgun.chambered = Pewgun.magazine.get_round(0)
+				Pewgun.chambered.loc = Pewgun
+			Pewgun.update_icon()
+		else if(Pewgun.magazine && Pewgun.magazine.stored_ammo.len) //only true for pumpguns i think
+			Pewgun.chambered = Pewgun.magazine.get_round(0)
+			Pewgun.chambered.loc = Pewgun
+			visible_message("<span class='danger'>The <b>[src]</b> cocks itself!</span>")
+	else
+		ranged = 0 //BANZAIIII
+		retreat_distance = 0
+		minimum_distance = 1
+		return
+	icon_state = TrueGun.icon_state
+	icon_living = TrueGun.icon_state
@@ -14,6 +14,9 @@
 	ranged = 1
 	ranged_message = "stares"
 	ranged_cooldown_time = 30
+	ranged_telegraph = "gathers energy and stares at *TARGET*!"
+	ranged_telegraph_sound = 'sound/magic/magic_missile.ogg'
+	ranged_telegraph_time = 7
 	throw_message = "does nothing against the hard shell of"
 	vision_range = 2
 	speed = 3
@@ -70,9 +73,11 @@
 	melee_damage_lower = 15
 	melee_damage_upper = 15
 	attacktext = "impales"
+	ranged_telegraph = "fixates on *TARGET* as its eye shines blue!"
+	ranged_telegraph_sound = 'sound/magic/tail_swing.ogg'
+	ranged_telegraph_time = 5
 	a_intent = INTENT_HARM
 	speak_emote = list("telepathically cries")
-	attack_sound = 'sound/weapons/bladeslice.ogg'
 	stat_attack = UNCONSCIOUS
 	movement_type = FLYING
 	robust_searching = 1
@@ -80,5 +85,70 @@
 	loot = list()
 	butcher_results = list(/obj/item/ore/diamond = 2, /obj/item/stack/sheet/sinew = 2, /obj/item/stack/sheet/bone = 1)

+/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/random/Initialize()
+	. = ..()
+	if(prob(1))
+		if(prob(75))
+			new /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/magmawing(loc)
+		else
+			new /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/icewing(loc)
+		return INITIALIZE_HINT_QDEL
+
+/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/magmawing
+	name = "magmawing watcher"
+	desc = "When raised very close to lava, some watchers adapt to the extreme heat and use lava as both a weapon and wings."
+	icon_state = "watcher_magmawing"
+	icon_living = "watcher_magmawing"
+	icon_aggro = "watcher_magmawing"
+	icon_dead = "watcher_magmawing_dead"
+	maxHealth = 215 //Compensate for the lack of slowdown on projectiles with a bit of extra health
+	health = 215
+	light_range = 3
+	light_power = 2.5
+	light_color = LIGHT_COLOR_LAVA
+	projectiletype = /obj/item/projectile/temp/basilisk/magmawing
+	crusher_loot = /obj/item/crusher_trophy/blaster_tubes/magma_wing
+	crusher_drop_mod = 60
+
+/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/icewing
+	name = "icewing watcher"
+	desc = "Very rarely, some watchers will eke out an existence far from heat sources. In the absence of warmth, they become icy and fragile but fire much stronger freezing blasts."
+	icon_state = "watcher_icewing"
+	icon_living = "watcher_icewing"
+	icon_aggro = "watcher_icewing"
+	icon_dead = "watcher_icewing_dead"
+	maxHealth = 170
+	health = 170
+	projectiletype = /obj/item/projectile/temp/basilisk/icewing
+	butcher_results = list(/obj/item/ore/diamond = 5, /obj/item/stack/sheet/bone = 1) //No sinew; the wings are too fragile to be usable
+	crusher_loot = /obj/item/crusher_trophy/watcher_wing/ice_wing
+	crusher_drop_mod = 30
+
+/obj/item/projectile/temp/basilisk/magmawing
+	name = "scorching blast"
+	icon_state = "lava"
+	damage = 5
+	damage_type = BURN
+	nodamage = FALSE
+	temperature = 500 //Heats you up!
+
+/obj/item/projectile/temp/basilisk/magmawing/on_hit(atom/target, blocked = FALSE)
+	. = ..()
+	if(.)
+		var/mob/living/L = target
+		L.adjust_fire_stacks(0.1)
+		L.IgniteMob()
+
+/obj/item/projectile/temp/basilisk/icewing
+	damage = 5
+	damage_type = BURN
+	nodamage = FALSE
+
+/obj/item/projectile/temp/basilisk/icewing/on_hit(atom/target, blocked = FALSE)
+	. = ..()
+	if(.)
+		var/mob/living/L = target
+		L.apply_status_effect(/datum/status_effect/freon/watcher)
+
 /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/tendril
 	fromtendril = TRUE
@@ -33,7 +33,7 @@
 	var/will_burrow = TRUE

 /mob/living/simple_animal/hostile/asteroid/goldgrub/Initialize()
-	..()
+	. = ..()
 	var/i = rand(1,3)
 	while(i)
 		loot += pick(/obj/item/ore/silver, /obj/item/ore/gold, /obj/item/ore/uranium, /obj/item/ore/diamond)
@@ -33,7 +33,7 @@
 	loot = list(/obj/item/stack/sheet/animalhide/goliath_hide)

 /mob/living/simple_animal/hostile/asteroid/goliath/Life()
-	..()
+	. = ..()
 	handle_preattack()

 /mob/living/simple_animal/hostile/asteroid/goliath/proc/handle_preattack()
@@ -57,8 +57,8 @@
 	if(!isturf(tturf))
 		return
 	if(get_dist(src, target) <= 7)//Screen range check, so you can't get tentacle'd offscreen
-		visible_message("<span class='warning'>The [src.name] digs its tentacles under [target.name]!</span>")
-		new /obj/effect/goliath_tentacle/original(tturf)
+		visible_message("<span class='warning'>[src] digs its tentacles under [target]!</span>")
+		new /obj/effect/temp_visual/goliath_tentacle/original(tturf, src)
 		ranged_cooldown = world.time + ranged_cooldown_time
 		icon_state = icon_aggro
 		pre_attack = 0
@@ -91,43 +91,102 @@
 	stat_attack = UNCONSCIOUS
 	robust_searching = 1

+/mob/living/simple_animal/hostile/asteroid/goliath/beast/random/Initialize()
+	. = ..()
+	if(prob(1))
+		new /mob/living/simple_animal/hostile/asteroid/goliath/beast/ancient(loc)
+		return INITIALIZE_HINT_QDEL
+
+/mob/living/simple_animal/hostile/asteroid/goliath/beast/ancient
+	name = "ancient goliath"
+	desc = "Goliaths are biologically immortal, and rare specimens have survived for centuries. This one is clearly ancient, and its tentacles constantly churn the earth around it."
+	icon_state = "Goliath"
+	icon_living = "Goliath"
+	icon_aggro = "Goliath_alert"
+	icon_dead = "Goliath_dead"
+	maxHealth = 400
+	health = 400
+	speed = 4
+	pre_attack_icon = "Goliath_preattack"
+	throw_message = "does nothing to the rocky hide of the"
+	loot = list(/obj/item/stack/sheet/animalhide/goliath_hide) //A throwback to the asteroid days
+	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/goliath = 2, /obj/item/stack/sheet/bone = 2)
+	crusher_drop_mod = 30
+	wander = FALSE
+	var/list/cached_tentacle_turfs
+	var/turf/last_location
+	var/tentacle_recheck_cooldown = 100
+
+/mob/living/simple_animal/hostile/asteroid/goliath/beast/ancient/Life()
+	. = ..()
+	if(isturf(loc))
+		if(!LAZYLEN(cached_tentacle_turfs) || loc != last_location || tentacle_recheck_cooldown <= world.time)
+			LAZYCLEARLIST(cached_tentacle_turfs)
+			last_location = loc
+			tentacle_recheck_cooldown = world.time + initial(tentacle_recheck_cooldown)
+			for(var/turf/open/T in orange(4, loc))
+				LAZYADD(cached_tentacle_turfs, T)
+		for(var/t in cached_tentacle_turfs)
+			if(isopenturf(t))
+				if(prob(10))
+					new /obj/effect/temp_visual/goliath_tentacle(t, src)
+			else
+				cached_tentacle_turfs -= t
+
 /mob/living/simple_animal/hostile/asteroid/goliath/beast/tendril
 	fromtendril = TRUE

 //tentacles
-/obj/effect/goliath_tentacle
-	name = "Goliath tentacle"
+/obj/effect/temp_visual/goliath_tentacle
+	name = "goliath tentacle"
 	icon = 'icons/mob/lavaland/lavaland_monsters.dmi'
-	icon_state = "Goliath_tentacle"
-	var/latched = FALSE
-	anchored = TRUE
+	icon_state = "Goliath_tentacle_spawn"
+	layer = BELOW_MOB_LAYER
+	var/mob/living/spawner

-/obj/effect/goliath_tentacle/Initialize()
+/obj/effect/temp_visual/goliath_tentacle/Initialize(mapload, mob/living/new_spawner)
 	. = ..()
+	for(var/obj/effect/temp_visual/goliath_tentacle/T in loc)
+		if(T != src)
+			return INITIALIZE_HINT_QDEL
+	if(!QDELETED(new_spawner))
+		spawner = new_spawner
 	if(ismineralturf(loc))
 		var/turf/closed/mineral/M = loc
 		M.gets_drilled()
-	addtimer(CALLBACK(src, .proc/Trip), 10)
+	deltimer(timerid)
+	timerid = addtimer(CALLBACK(src, .proc/tripanim), 7, TIMER_STOPPABLE)

-/obj/effect/goliath_tentacle/original/Initialize()
+/obj/effect/temp_visual/goliath_tentacle/original/Initialize(mapload, new_spawner)
 	. = ..()
-	for(var/obj/effect/goliath_tentacle/original/O in loc)//No more GG NO RE from 2+ goliaths simultaneously tentacling you
-		if(O != src)
-			qdel(src)
 	var/list/directions = GLOB.cardinals.Copy()
 	for(var/i in 1 to 3)
 		var/spawndir = pick_n_take(directions)
-		var/turf/T = get_step(src,spawndir)
+		var/turf/T = get_step(src, spawndir)
 		if(T)
-			new /obj/effect/goliath_tentacle(T)
+			new /obj/effect/temp_visual/goliath_tentacle(T, spawner)

-/obj/effect/goliath_tentacle/proc/Trip()
-	for(var/mob/living/M in src.loc)
-		visible_message("<span class='danger'>The [src.name] grabs hold of [M.name]!</span>")
-		M.Stun(100)
-		M.adjustBruteLoss(rand(10,15))
+/obj/effect/temp_visual/goliath_tentacle/proc/tripanim()
+	icon_state = "Goliath_tentacle_wiggle"
+	deltimer(timerid)
+	timerid = addtimer(CALLBACK(src, .proc/trip), 3, TIMER_STOPPABLE)
+
+/obj/effect/temp_visual/goliath_tentacle/proc/trip()
+	var/latched = FALSE
+	for(var/mob/living/L in loc)
+		if((!QDELETED(spawner) && spawner.faction_check_mob(L)) || L.stat == DEAD)
+			continue
+		visible_message("<span class='danger'>[src] grabs hold of [L]!</span>")
+		L.Stun(100)
+		L.adjustBruteLoss(rand(10,15))
 		latched = TRUE
 	if(!latched)
-		qdel(src)
+		retract()
 	else
-		QDEL_IN(src, 50)
+		deltimer(timerid)
+		timerid = addtimer(CALLBACK(src, .proc/retract), 10, TIMER_STOPPABLE)
+
+/obj/effect/temp_visual/goliath_tentacle/proc/retract()
+	icon_state = "Goliath_tentacle_retract"
+	deltimer(timerid)
+	timerid = QDEL_IN(src, 7)
@@ -76,7 +76,7 @@
 	gender = MALE

 /mob/living/simple_animal/hostile/asteroid/gutlunch/gubbuck/Initialize()
-	..()
+	. = ..()
 	add_atom_colour(pick("#E39FBB", "#D97D64", "#CF8C4A"), FIXED_COLOUR_PRIORITY)
 	resize = 0.85
 	update_transform()
@@ -84,7 +84,7 @@
 	del_on_death = 1

 /mob/living/simple_animal/hostile/asteroid/hivelordbrood/Initialize()
-	..()
+	. = ..()
 	addtimer(CALLBACK(src, .proc/death), 100)

 //Legion
@@ -110,8 +110,28 @@
 	del_on_death = 1
 	stat_attack = UNCONSCIOUS
 	robust_searching = 1
+	var/dwarf_mob = FALSE
 	var/mob/living/carbon/human/stored_mob

+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/random/Initialize()
+	. = ..()
+	if(prob(5))
+		new /mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf(loc)
+		return INITIALIZE_HINT_QDEL
+
+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf
+	name = "dwarf legion"
+	desc = "You can still see what was once a rather small human under the shifting mass of corruption."
+	icon_state = "dwarf_legion"
+	icon_living = "dwarf_legion"
+	icon_aggro = "dwarf_legion"
+	icon_dead = "dwarf_legion"
+	maxHealth = 60
+	health = 60
+	speed = 2 //faster!
+	crusher_drop_mod = 20
+	dwarf_mob = TRUE
+
 /mob/living/simple_animal/hostile/asteroid/hivelord/legion/death(gibbed)
 	visible_message("<span class='warning'>The skulls on [src] wail in anger as they flee from their dying host!</span>")
 	var/turf/T = get_turf(src)
@@ -121,6 +141,8 @@
 			stored_mob = null
 		else if(fromtendril)
 			new /obj/effect/mob_spawn/human/corpse/charredskeleton(T)
+		else if(dwarf_mob)
+			new /obj/effect/mob_spawn/human/corpse/damaged/legioninfested/dwarf(T)
 		else
 			new /obj/effect/mob_spawn/human/corpse/damaged/legioninfested(T)
 	..(gibbed)
@@ -164,7 +186,11 @@

 /mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/proc/infest(mob/living/carbon/human/H)
 	visible_message("<span class='warning'>[name] burrows into the flesh of [H]!</span>")
-	var/mob/living/simple_animal/hostile/asteroid/hivelord/legion/L = new(H.loc)
+	var/mob/living/simple_animal/hostile/asteroid/hivelord/legion/L
+	if(H.dna.check_mutation(DWARFISM)) //dwarf legions aren't just fluff!
+		L = new /mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf(H.loc)
+	else
+		L = new(H.loc)
 	visible_message("<span class='warning'>[L] staggers to their feet!</span>")
 	H.death()
 	H.adjustBruteLoss(1000)
@@ -174,7 +200,7 @@

 //Advanced Legion is slightly tougher to kill and can raise corpses (revive other legions)
 /mob/living/simple_animal/hostile/asteroid/hivelord/legion/advanced
-	stat_attack = 2
+	stat_attack = DEAD
 	maxHealth = 120
 	health = 120
 	brood_type = /mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/advanced
@@ -184,7 +210,7 @@
 	icon_dead = "dwarf_legion"

 /mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/advanced
-	stat_attack = 2
+	stat_attack = DEAD
 	can_infest_dead = TRUE

 //Legion that spawns Legions
@@ -236,6 +262,10 @@

 //Legion infested mobs

+/obj/effect/mob_spawn/human/corpse/damaged/legioninfested/dwarf/equip(mob/living/carbon/human/H)
+	. = ..()
+	H.dna.add_mutation(DWARFISM)
+
 /obj/effect/mob_spawn/human/corpse/damaged/legioninfested/Initialize()
 	var/type = pickweight(list("Miner" = 66, "Ashwalker" = 10, "Golem" = 10,"Clown" = 10, pick(list("Shadow", "YeOlde","Operative", "Cultist")) = 4))
 	switch(type)
@@ -15,11 +15,12 @@
 	a_intent = INTENT_HARM
 	var/crusher_loot
 	var/throw_message = "bounces off of"
-	var/icon_aggro = null // for swapping to when we get aggressive
 	var/fromtendril = FALSE
 	see_in_dark = 8
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 	mob_size = MOB_SIZE_LARGE
+	var/icon_aggro = null
+	var/crusher_drop_mod = 5

 /mob/living/simple_animal/hostile/asteroid/Initialize(mapload)
 	. = ..()
@@ -57,7 +58,7 @@
 /mob/living/simple_animal/hostile/asteroid/death(gibbed)
 	SSblackbox.add_details("mobs_killed_mining","[src.type]")
 	var/datum/status_effect/crusher_damage/C = has_status_effect(STATUS_EFFECT_CRUSHERDAMAGETRACKING)
-	if(C && crusher_loot && prob((C.total_damage/maxHealth)) * 5) //on average, you'll need to kill 20 creatures before getting the item
+	if(C && crusher_loot && prob((C.total_damage/maxHealth) * crusher_drop_mod)) //on average, you'll need to kill 20 creatures before getting the item
 		spawn_crusher_loot()
 	..(gibbed)

@@ -21,7 +21,7 @@
 	attack_sound = 'sound/weapons/bite.ogg'
 	faction = list("mushroom")
 	environment_smash = ENVIRONMENT_SMASH_NONE
-	stat_attack = 2
+	stat_attack = DEAD
 	mouse_opacity = MOUSE_OPACITY_ICON
 	speed = 1
 	ventcrawler = VENTCRAWLER_ALWAYS
@@ -12,7 +12,7 @@
 	response_disarm = "shoves"
 	response_harm = "hits"
 	speed = 0
-	stat_attack = 1
+	stat_attack = UNCONSCIOUS
 	robust_searching = 1
 	maxHealth = 100
 	health = 100
@@ -36,7 +36,7 @@
 	response_disarm = "shoves"
 	response_harm = "hits"
 	speed = 0
-	stat_attack = 1
+	stat_attack = UNCONSCIOUS
 	robust_searching = 1
 	vision_range = 3
 	maxHealth = 100
@@ -24,7 +24,7 @@
 	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
 	unsuitable_atmos_damage = 10
 	robust_searching = 1
-	stat_attack = 1
+	stat_attack = UNCONSCIOUS
 	gold_core_spawnable = 1
 	faction = list("skeleton")
 	see_in_dark = 8
@@ -55,7 +55,7 @@
 // No movement while seen code.

 /mob/living/simple_animal/hostile/statue/Initialize(mapload, var/mob/living/creator)
-	..()
+	. = ..()
 	// Give spells
 	mob_spell_list += new /obj/effect/proc_holder/spell/aoe_turf/flicker_lights(src)
 	mob_spell_list += new /obj/effect/proc_holder/spell/aoe_turf/blindness(src)
@@ -12,7 +12,7 @@
 	response_disarm = "shoves"
 	response_harm = "hits"
 	speed = 0
-	stat_attack = 1
+	stat_attack = UNCONSCIOUS
 	robust_searching = 1
 	environment_smash = ENVIRONMENT_SMASH_NONE
 	maxHealth = 100
@@ -23,7 +23,7 @@
 	response_disarm = "shoves"
 	response_harm = "hits"
 	speed = 0
-	stat_attack = 1
+	stat_attack = UNCONSCIOUS
 	robust_searching = 1
 	maxHealth = 100
 	health = 100
@@ -37,7 +37,7 @@
 	var/next_cast = 0

 /mob/living/simple_animal/hostile/wizard/Initialize()
-	..()
+	. = ..()
 	fireball = new /obj/effect/proc_holder/spell/aimed/fireball
 	fireball.clothes_req = 0
 	fireball.human_req = 0
@@ -734,7 +734,7 @@
 			visible_message("[src] grabs [held_item] out of [C]'s hand!", "<span class='notice'>You snag [held_item] out of [C]'s hand!</span>", "<span class='italics'>You hear the sounds of wings flapping furiously.</span>")
 			return held_item

-	to_chat(src, "<span class='warning'>There is nothing of interest to take!</spawn>")
+	to_chat(src, "<span class='warning'>There is nothing of interest to take!</span>")
 	return 0

 /mob/living/simple_animal/parrot/verb/drop_held_item_player()
@@ -896,7 +896,7 @@
 	else
 		speak += pick("...alive?", "This isn't parrot heaven!", "I live, I die, I live again!", "The void fades!")

-	..()
+	. = ..()

 /mob/living/simple_animal/parrot/Poly/Life()
 	if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved)
@@ -924,28 +924,20 @@
 	..(gibbed)

 /mob/living/simple_animal/parrot/Poly/proc/Read_Memory()
-	if(fexists("data/npc_saves/Poly.sav")) //legacy compatability to convert old format to new
-		var/savefile/S = new /savefile("data/npc_saves/Poly.sav")
-		S["phrases"] 			>> speech_buffer
-		S["roundssurvived"]		>> rounds_survived
-		S["longestsurvival"]	>> longest_survival
-		S["longestdeathstreak"] >> longest_deathstreak
-		fdel("data/npc_saves/Poly.sav")
-	else
-		var/json_file = file("data/npc_saves/Poly.json")
-		if(!fexists(json_file))
-			return
-		var/list/json = list()
-		json = json_decode(file2text(json_file))
-		speech_buffer = json["phrases"]
-		rounds_survived = json["roundssurvived"]
-		longest_survival = json["longestsurvival"]
-		longest_deathstreak = json["longestdeathstreak"]
+	var/json_file = file("data/npc_saves/Poly.json")
+	if(!fexists(json_file))
+		return
+	var/list/json = list()
+	json = json_decode(file2text(json_file))
+	speech_buffer = json["phrases"]
+	rounds_survived = json["roundssurvived"]
+	longest_survival = json["longestsurvival"]
+	longest_deathstreak = json["longestdeathstreak"]
 	if(!islist(speech_buffer))
 		speech_buffer = list()

 /mob/living/simple_animal/parrot/Poly/proc/Write_Memory()
-	var/json_file = file("data/npc_saves/Punpun.json")
+	var/json_file = file("data/npc_saves/Poly.json")
 	var/list/file_data = list()
 	if(islist(speech_buffer))
 		file_data["phrases"] = speech_buffer
@@ -99,6 +99,11 @@
 			K = apply_status_effect(STATUS_EFFECT_KNOCKDOWN, amount, updating)
 		return K

+///////////////////////////////// FROZEN /////////////////////////////////////
+
+/mob/living/proc/IsFrozen()
+	return has_status_effect(/datum/status_effect/freon)
+
 ///////////////////////////////////// STUN ABSORPTION /////////////////////////////////////

 /mob/living/proc/add_stun_absorption(key, duration, priority, message, self_message, examine_message)
@@ -438,7 +438,7 @@

 	if (!( GLOB.abandon_allowed ))
 		return
-	if ((stat != 2 || !( SSticker )))
+	if ((stat != DEAD || !( SSticker )))
 		to_chat(usr, "<span class='boldnotice'>You must be dead to use this!</span>")
 		return

@@ -491,7 +491,7 @@
 		var/t1 = text("window=[href_list["mach_close"]]")
 		unset_machine()
 		src << browse(null, t1)
-		
+
 	if(href_list["flavor_more"])
 		usr << browse(text("<HTML><HEAD><TITLE>[]</TITLE></HEAD><BODY><TT>[]</TT></BODY></HTML>", name, replacetext(flavor_text, "\n", "<BR>")), text("window=[];size=500x200", name))
 		onclose(usr, "[name]")
@@ -587,7 +587,7 @@
 			var/turf/T = get_turf(client.eye)
 			stat("Location:", COORD(T))
 			stat("CPU:", "[world.cpu]")
-			stat("Instances:", "[world.contents.len]")
+			stat("Instances:", "[num2text(world.contents.len, 10)]")
 			GLOB.stat_entry()
 			config.stat_entry()
 			stat(null)
@@ -950,18 +950,18 @@
 /mob/vv_get_dropdown()
 	. = ..()
 	. += "---"
-	.["Gib"] = "?_src_=vars;gib=\ref[src]"
-	.["Give Spell"] = "?_src_=vars;give_spell=\ref[src]"
-	.["Remove Spell"] = "?_src_=vars;remove_spell=\ref[src]"
-	.["Give Disease"] = "?_src_=vars;give_disease=\ref[src]"
-	.["Toggle Godmode"] = "?_src_=vars;godmode=\ref[src]"
-	.["Drop Everything"] = "?_src_=vars;drop_everything=\ref[src]"
-	.["Regenerate Icons"] = "?_src_=vars;regenerateicons=\ref[src]"
-	.["Make Space Ninja"] = "?_src_=vars;ninja=\ref[src]"
-	.["Show player panel"] = "?_src_=vars;mob_player_panel=\ref[src]"
-	.["Toggle Build Mode"] = "?_src_=vars;build_mode=\ref[src]"
-	.["Assume Direct Control"] = "?_src_=vars;direct_control=\ref[src]"
-	.["Offer Control to Ghosts"] = "?_src_=vars;offer_control=\ref[src]"
+	.["Gib"] = "?_src_=vars;[HrefToken()];gib=\ref[src]"
+	.["Give Spell"] = "?_src_=vars;[HrefToken()];give_spell=\ref[src]"
+	.["Remove Spell"] = "?_src_=vars;[HrefToken()];remove_spell=\ref[src]"
+	.["Give Disease"] = "?_src_=vars;[HrefToken()];give_disease=\ref[src]"
+	.["Toggle Godmode"] = "?_src_=vars;[HrefToken()];godmode=\ref[src]"
+	.["Drop Everything"] = "?_src_=vars;[HrefToken()];drop_everything=\ref[src]"
+	.["Regenerate Icons"] = "?_src_=vars;[HrefToken()];regenerateicons=\ref[src]"
+	.["Make Space Ninja"] = "?_src_=vars;[HrefToken()];ninja=\ref[src]"
+	.["Show player panel"] = "?_src_=vars;[HrefToken()];mob_player_panel=\ref[src]"
+	.["Toggle Build Mode"] = "?_src_=vars;[HrefToken()];build_mode=\ref[src]"
+	.["Assume Direct Control"] = "?_src_=vars;[HrefToken()];direct_control=\ref[src]"
+	.["Offer Control to Ghosts"] = "?_src_=vars;[HrefToken()];offer_control=\ref[src]"

 /mob/vv_get_var(var_name)
 	switch(var_name)
@@ -385,7 +385,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
 		return
 	for(var/mob/dead/observer/O in GLOB.player_list)
 		if(O.client)
-			to_chat(O, "<span class='ghostalert'>[message][(enter_link) ? " [enter_link]" : ""]<span>")
+			to_chat(O, "<span class='ghostalert'>[message][(enter_link) ? " [enter_link]" : ""]</span>")
 			if(ghost_sound)
 				SEND_SOUND(O, sound(ghost_sound))
 			if(flashwindow)
@@ -146,7 +146,7 @@
 		var/old_eye_blind = eye_blind
 		eye_blind = max(eye_blind, amount)
 		if(!old_eye_blind)
-			if(stat == CONSCIOUS)
+			if(stat == CONSCIOUS || stat == SOFT_CRIT)
 				throw_alert("blind", /obj/screen/alert/blind)
 			overlay_fullscreen("blind", /obj/screen/fullscreen/blind)

@@ -155,12 +155,12 @@
 		var/old_eye_blind = eye_blind
 		eye_blind += amount
 		if(!old_eye_blind)
-			if(stat == CONSCIOUS)
+			if(stat == CONSCIOUS || stat == SOFT_CRIT)
 				throw_alert("blind", /obj/screen/alert/blind)
 			overlay_fullscreen("blind", /obj/screen/fullscreen/blind)
 	else if(eye_blind)
 		var/blind_minimum = 0
-		if(stat != CONSCIOUS || (disabilities & BLIND))
+		if((stat != CONSCIOUS && stat != SOFT_CRIT) || (disabilities & BLIND))
 			blind_minimum = 1
 		eye_blind = max(eye_blind+amount, blind_minimum)
 		if(!eye_blind)
@@ -172,12 +172,12 @@
 		var/old_eye_blind = eye_blind
 		eye_blind = amount
 		if(client && !old_eye_blind)
-			if(stat == CONSCIOUS)
+			if(stat == CONSCIOUS || stat == SOFT_CRIT)
 				throw_alert("blind", /obj/screen/alert/blind)
 			overlay_fullscreen("blind", /obj/screen/fullscreen/blind)
 	else if(eye_blind)
 		var/blind_minimum = 0
-		if(stat != CONSCIOUS || (disabilities & BLIND))
+		if((stat != CONSCIOUS && stat != SOFT_CRIT) || (disabilities & BLIND))
 			blind_minimum = 1
 		eye_blind = blind_minimum
 		if(!eye_blind)