MERGE SHIT REEEEE IMMAH PUNCH A WALL

code/modules/mob/living/autohiss.dm

@@ -58,6 +58,16 @@
 		)
 	autohiss_exempt = list("Chittin")
 
+/datum/species/drask
+	autohiss_basic_map = list(
+			"o" = list ("oo", "ooo"),
+			"u" = list ("uu", "uuu")			
+		)
+	autohiss_extra_map = list(
+			"m" = list ("mm", "mmm")
+		)
+	autohiss_exempt = list("Orluum")
+
 
 /datum/species/proc/handle_autohiss(message, datum/language/lang, mode)
 	if(!autohiss_basic_map)

code/modules/mob/living/carbon/human/examine.dm

@@ -363,8 +363,8 @@
 					for(var/datum/data/record/R in data_core.security)
 						if(R.fields["id"] == E.fields["id"])
 							criminal = R.fields["criminal"]
-
-			msg += "<span class = 'deptradio'>Criminal status:</span> <a href='?src=[UID()];criminal=1'>\[[criminal]\]</a>\n"
+			var/criminal_status = hasHUD(user, "read_only_security") ? "\[[criminal]\]" : "<a href='?src=[UID()];criminal=[glasses]'>\[[criminal]\]</a>"
+			msg += "<span class = 'deptradio'>Criminal status:</span> [criminal_status]\n"
 			msg += "<span class = 'deptradio'>Security records:</span> <a href='?src=[UID()];secrecord=`'>\[View\]</a>  <a href='?src=[UID()];secrecordadd=`'>\[Add comment\]</a>\n"
 
 	if(hasHUD(user,"medical"))
@@ -408,7 +408,12 @@
 		var/obj/item/organ/internal/cyberimp/eyes/hud/CIH = H.get_int_organ(/obj/item/organ/internal/cyberimp/eyes/hud)
 		switch(hudtype)
 			if("security")
-				return istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.glasses, /obj/item/clothing/glasses/hud/security/sunglasses) || istype(CIH,/obj/item/organ/internal/cyberimp/eyes/hud/security)
+				return istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(CIH,/obj/item/organ/internal/cyberimp/eyes/hud/security)
+			if("read_only_security")
+				var/obj/item/clothing/glasses/hud/security/S
+				if(istype(H.glasses, /obj/item/clothing/glasses/hud/security))
+					S = H.glasses
+				return !istype(CIH,/obj/item/organ/internal/cyberimp/eyes/hud/security) && S && S.read_only
 			if("medical")
 				return istype(H.glasses, /obj/item/clothing/glasses/hud/health) || istype(H.glasses, /obj/item/clothing/glasses/hud/health/health_advanced) ||  istype(CIH,/obj/item/organ/internal/cyberimp/eyes/hud/medical)
 			else

code/modules/mob/living/carbon/human/human_movement.dm

@@ -85,6 +85,13 @@
 					if(!(step_count % 2)) //every other turf makes a sound
 						return 0
 
+				if(istype(shoes, /obj/item/clothing/shoes))
+					var/obj/item/clothing/shoes/shooess = shoes
+					if(shooess.silence_steps)
+						return 0 //silent
+					if(shooess.shoe_sound)
+						return //Handle it on the shoe
+
 				var/range = -(world.view - 2)
 				if(m_intent == MOVE_INTENT_WALK)
 					range -= 0.333
@@ -104,11 +111,6 @@
 				if(!shoes)
 					volume -= 4
 
-				if(istype(shoes, /obj/item/clothing/shoes))
-					var/obj/item/clothing/shoes/shooess = shoes
-					if(shooess.silence_steps)
-						return 0 //silent
-
 				if(!has_organ("l_foot") && !has_organ("r_foot"))
 					return 0 //no feet no footsteps
 

code/modules/mob/living/carbon/human/species/_species.dm

@@ -156,6 +156,9 @@
 	// Mutant pieces
 	var/obj/item/organ/internal/ears/mutantears = /obj/item/organ/internal/ears
 
+	// Species specific boxes
+	var/speciesbox
+
 /datum/species/New()
 	//If the species has eyes, they are the default vision organ
 	if(!vision_organ && has_organ["eyes"])

code/modules/mob/living/carbon/human/species/human.dm

@@ -17,4 +17,5 @@
 	worlds tumultous at best."
 
 	reagent_tag = PROCESS_ORG
-	//Has standard darksight of 2.
+	//Has standard darksight of 2.
+	

code/modules/mob/living/carbon/human/species/plasmaman.dm

@@ -39,6 +39,8 @@
 		"eyes" =     /obj/item/organ/internal/eyes
 		)
 
+	speciesbox = /obj/item/storage/box/survival_plasmaman
+
 /datum/species/plasmaman/say_filter(mob/M, message, datum/language/speaking)
 	if(copytext(message, 1, 2) != "*")
 		message = replacetext(message, "s", stutter("ss"))

code/modules/mob/living/carbon/human/species/vox.dm

@@ -78,6 +78,8 @@
 		"is holding their breath!",
 		"is deeply inhaling oxygen!")
 
+	speciesbox = /obj/item/storage/box/survival_vox
+
 /datum/species/vox/handle_death(mob/living/carbon/human/H)
 	H.stop_tail_wagging(1)
 

code/modules/mob/living/carbon/superheroes.dm

@@ -9,13 +9,15 @@
 	var/class
 	var/list/default_genes = list(REGEN, BREATHLESS, COLDRES)
 	var/list/default_spells = list()
-
+	var/activated = FALSE //for wishgranters to not give an option if someone already has it.
+	
 /datum/superheroes/proc/create(var/mob/living/carbon/human/H)
 	assign_genes(H)
 	assign_spells(H)
 	equip(H)
 	fixflags(H)
 	assign_id(H)
+	H.mind.special_role = SPECIAL_ROLE_SUPER
 
 /datum/superheroes/proc/equip(var/mob/living/carbon/human/H)
 	H.rename_character(H.real_name, name)

code/modules/mob/living/silicon/ai/ai.dm

@@ -656,7 +656,21 @@ var/list/ai_verbs_default = list(
 		return
 
 	if(href_list["ai_take_control"]) //Mech domination
+
 		var/obj/mecha/M = locate(href_list["ai_take_control"])
+
+		if(!M)
+			return
+
+		var/mech_has_controlbeacon = FALSE
+		for(var/obj/item/mecha_parts/mecha_tracking/ai_control/A in M.trackers)
+			mech_has_controlbeacon = TRUE
+			break
+		if(!can_dominate_mechs && !mech_has_controlbeacon)
+			message_admins("Warning: possible href exploit by [key_name(usr)] - attempted control of a mecha without can_dominate_mechs or a control beacon in the mech.")
+			log_debug("Warning: possible href exploit by [key_name(usr)] - attempted control of a mecha without can_dominate_mechs or a control beacon in the mech.")
+			return
+
 		if(controlled_mech)
 			to_chat(src, "<span class='warning'>You are already loaded into an onboard computer!</span>")
 			return
@@ -670,7 +684,7 @@ var/list/ai_verbs_default = list(
 			to_chat(src, "<span class='warning'>You aren't in your core!</span>")
 			return
 		if(M)
-			M.transfer_ai(AI_MECH_HACK,src, usr) //Called om the mech itself.
+			M.transfer_ai(AI_MECH_HACK, src, usr) //Called om the mech itself.
 
 	else if(href_list["faketrack"])
 		var/mob/target = locate(href_list["track"]) in GLOB.mob_list

code/modules/mob/living/silicon/pai/recruit.dm

@@ -23,24 +23,22 @@ var/datum/paiController/paiController			// Global handler for pAI candidates
 	var/askDelay = 10 * 60 * 1	// One minute [ms * sec * min]
 
 /datum/paiController/Topic(href, href_list[])
-	if("signup" in href_list)
-		var/mob/dead/observer/O = locate(href_list["signup"])
-		if(!O) return
-		if(!(O in GLOB.respawnable_list))
-			to_chat(O, "You've given up your ability to respawn!")
+
+	var/datum/paiCandidate/candidate = locateUID(href_list["candidate"])
+
+	if(candidate)
+		if(!istype(candidate))
+			message_admins("Warning: possible href exploit by [key_name(usr)] (paiController/Topic, candidate is not a pAI)")
+			log_debug("Warning: possible href exploit by [key_name(usr)] (paiController/Topic, candidate is not a pAI)")
 			return
-		if(!check_recruit(O)) return
-		recruitWindow(O)
-		return
 
 	if(href_list["download"])
-		var/datum/paiCandidate/candidate = locate(href_list["candidate"])
 		var/obj/item/paicard/card = locate(href_list["device"])
 		if(card.pai)
 			return
 		if(usr.incapacitated() || isobserver(usr) || !card.Adjacent(usr))
 			return
-		if(istype(card,/obj/item/paicard) && istype(candidate,/datum/paiCandidate))
+		if(istype(card, /obj/item/paicard) && istype(candidate, /datum/paiCandidate))
 			var/mob/living/silicon/pai/pai = new(card)
 			if(!candidate.name)
 				pai.name = pick(GLOB.ninja_names)
@@ -58,8 +56,27 @@ var/datum/paiController/paiController			// Global handler for pAI candidates
 			pai_candidates -= candidate
 			usr << browse(null, "window=findPai")
 
+
+	if(candidate)
+		if(candidate.key && usr.key && candidate.key != usr.key)
+			message_admins("Warning: possible href exploit by [key_name(usr)] (paiController/Topic, candidate and usr are different mobs)")
+			log_debug("Warning: possible href exploit by [key_name(usr)] (paiController/Topic, candidate and usr are different mobs)")
+			return
+
+	if("signup" in href_list)
+		var/mob/dead/observer/O = locate(href_list["signup"])
+		if(!O)
+			return
+		if(!(O in GLOB.respawnable_list))
+			to_chat(O, "You've given up your ability to respawn!")
+			return
+		if(!check_recruit(O))
+			return
+		recruitWindow(O)
+		return
+
+
 	if(href_list["new"])
-		var/datum/paiCandidate/candidate = locate(href_list["candidate"])
 		var/option = href_list["option"]
 		var/t = ""
 
@@ -183,28 +200,28 @@ var/datum/paiController/paiController			// Global handler for pAI candidates
 
 		<table>
 			<tr class="d0">
-				<th rowspan="2"><a href='byond://?src=[UID()];option=name;new=1;candidate=\ref[candidate]'>Name</a>:</th>
+				<th rowspan="2"><a href='byond://?src=[UID()];option=name;new=1;candidate=[candidate.UID()]'>Name</a>:</th>
 				<td class="desc">[candidate.name]&nbsp;</td>
 			</tr>
 			<tr class="d1">
 				<td>What you plan to call yourself. Suggestions: Any character name you would choose for a station character OR an AI.</td>
 			</tr>
 			<tr class="d0">
-				<th rowspan="2"><a href='byond://?src=[UID()];option=desc;new=1;candidate=\ref[candidate]'>Description</a>:</th>
+				<th rowspan="2"><a href='byond://?src=[UID()];option=desc;new=1;candidate=[candidate.UID()]'>Description</a>:</th>
 				<td class="desc">[candidate.description]&nbsp;</td>
 			</tr>
 			<tr class="d1">
 				<td>What sort of pAI you typically play; your mannerisms, your quirks, etc. This can be as sparse or as detailed as you like.</td>
 			</tr>
 			<tr class="d0">
-				<th rowspan="2"><a href='byond://?src=[UID()];option=role;new=1;candidate=\ref[candidate]'>Preferred Role</a>:</th>
+				<th rowspan="2"><a href='byond://?src=[UID()];option=role;new=1;candidate=[candidate.UID()]'>Preferred Role</a>:</th>
 				<td class="desc">[candidate.role]&nbsp;</td>
 			</tr>
 			<tr class="d1">
 				<td>Do you like to partner with sneaky social ninjas? Like to help security hunt down thugs? Enjoy watching an engineer's back while he saves the station yet again? This doesn't have to be limited to just station jobs. Pretty much any general descriptor for what you'd like to be doing works here.</td>
 			</tr>
 			<tr class="d0">
-				<th rowspan="2"><a href='byond://?src=[UID()];option=ooc;new=1;candidate=\ref[candidate]'>OOC Comments</a>:</th>
+				<th rowspan="2"><a href='byond://?src=[UID()];option=ooc;new=1;candidate=[candidate.UID()]'>OOC Comments</a>:</th>
 				<td class="desc">[candidate.comments]&nbsp;</td>
 			</tr>
 			<tr class="d1">
@@ -215,17 +232,17 @@ var/datum/paiController/paiController			// Global handler for pAI candidates
 		<table>
 			<tr>
 				<td class="button">
-					<a href='byond://?src=[UID()];option=save;new=1;candidate=\ref[candidate]' class="button">Save Personality</a>
+					<a href='byond://?src=[UID()];option=save;new=1;candidate=[candidate.UID()]' class="button">Save Personality</a>
 				</td>
 			</tr>
 			<tr>
 				<td class="button">
-					<a href='byond://?src=[UID()];option=load;new=1;candidate=\ref[candidate]' class="button">Load Personality</a>
+					<a href='byond://?src=[UID()];option=load;new=1;candidate=[candidate.UID()]' class="button">Load Personality</a>
 				</td>
 			</tr>
 		</table><br>
 		<table>
-			<td class="button"><a href='byond://?src=[UID()];option=submit;new=1;candidate=\ref[candidate]' class="button"><b><font size="4px">Submit Personality</font></b></a></td>
+			<td class="button"><a href='byond://?src=[UID()];option=submit;new=1;candidate=[candidate.UID()]' class="button"><b><font size="4px">Submit Personality</font></b></a></td>
 		</table><br>
 
 	</body>
@@ -336,7 +353,7 @@ var/datum/paiController/paiController			// Global handler for pAI candidates
 					</tr>
 				</table>
 				<table class="download">
-					<td class="download"><a href='byond://?src=[UID()];download=1;candidate=\ref[c];device=\ref[p]' class="button"><b>Download [c.name]</b></a>
+					<td class="download"><a href='byond://?src=[UID()];download=1;candidate=[c.UID()];device=\ref[p]' class="button"><b>Download [c.name]</b></a>
 					</td>
 				</table>
 				<br>

code/modules/mob/living/simple_animal/bot/ed209bot.dm

@@ -23,12 +23,13 @@
 	path_image_color = "#FF0000"
 	data_hud_type = DATA_HUD_SECURITY_ADVANCED
 
+	allow_pai = 0
+
 	var/lastfired = 0
 	var/shot_delay = 3 //.3 seconds between shots
 	var/lasercolor = ""
 	var/disabled = 0//A holder for if it needs to be disabled, if true it will not seach for targets, shoot at targets, or move, currently only used for lasertag
 
-
 	var/mob/living/carbon/target
 	var/oldtarget_name
 	var/threatlevel = 0
@@ -41,10 +42,9 @@
 	var/arrest_type = 0 //If true, don't handcuff
 	var/projectile = /obj/item/projectile/energy/electrode //Holder for projectile type
 	var/shoot_sound = 'sound/weapons/Taser.ogg'
-	allow_pai = 0
 
 
-/mob/living/simple_animal/bot/ed209/New(loc,created_name,created_lasercolor)
+/mob/living/simple_animal/bot/ed209/New(loc, created_name, created_lasercolor)
 	..()
 	if(created_name)
 		name = created_name
@@ -52,29 +52,33 @@
 		lasercolor = created_lasercolor
 	icon_state = "[lasercolor]ed209[on]"
 	set_weapon() //giving it the right projectile and firing sound.
-	spawn(3)
-		var/datum/job/detective/J = new/datum/job/detective
-		access_card.access += J.get_access()
-		prev_access = access_card.access
+	setup_access()
 
-		if(lasercolor)
-			shot_delay = 6//Longer shot delay because JESUS CHRIST
-			check_records = 0//Don't actively target people set to arrest
-			arrest_type = 1//Don't even try to cuff
-			declare_arrests = 0 // Don't spam sec
-			bot_core.req_access = list(access_maint_tunnels, access_theatre, access_robotics)
+	if(lasercolor)
+		shot_delay = 6//Longer shot delay because JESUS CHRIST
+		check_records = 0//Don't actively target people set to arrest
+		arrest_type = 1//Don't even try to cuff
+		declare_arrests = 0 // Don't spam sec
+		bot_core.req_access = list(access_maint_tunnels, access_theatre, access_robotics)
 
-			if(created_name == initial(name) || !created_name)
-				if(lasercolor == "b")
-					name = pick("BLUE BALLER","SANIC","BLUE KILLDEATH MURDERBOT")
-				else if (lasercolor == "r")
-					name = pick("RED RAMPAGE","RED ROVER","RED KILLDEATH MURDERBOT")
+		if(created_name == initial(name) || !created_name)
+			if(lasercolor == "b")
+				name = pick("BLUE BALLER","SANIC","BLUE KILLDEATH MURDERBOT")
+			else if (lasercolor == "r")
+				name = pick("RED RAMPAGE","RED ROVER","RED KILLDEATH MURDERBOT")
 
 	//SECHUD
 	var/datum/atom_hud/secsensor = huds[DATA_HUD_SECURITY_ADVANCED]
 	secsensor.add_hud_to(src)
 	permanent_huds |= secsensor
 
+
+/mob/living/simple_animal/bot/ed209/proc/setup_access()
+	if(access_card)
+		var/datum/job/detective/J = new/datum/job/detective
+		access_card.access += J.get_access()
+		prev_access = access_card.access
+
 /mob/living/simple_animal/bot/ed209/turn_on()
 	. = ..()
 	icon_state = "[lasercolor]ed209[on]"
@@ -412,7 +416,7 @@
 	..()
 
 /mob/living/simple_animal/bot/ed209/proc/set_weapon()  //used to update the projectile type and firing sound
-	shoot_sound = 'sound/weapons/laser.ogg'
+	shoot_sound = 'sound/weapons/Laser.ogg'
 	if(emagged == 2)
 		if(lasercolor)
 			projectile = /obj/item/projectile/beam/disabler

code/modules/mob/living/simple_animal/bot/syndicate.dm

@@ -29,12 +29,14 @@
 
 /mob/living/simple_animal/bot/ed209/syndicate/New()
 	..()
-	if(access_card)
-		access_card.access = list(access_syndicate, access_syndicate_leader)
 	set_weapon()
 	update_icon()
 	spawn_turf = get_turf(src)
 
+/mob/living/simple_animal/bot/ed209/syndicate/setup_access()
+	if(access_card)
+		access_card.access = list(access_syndicate, access_syndicate_leader)
+		prev_access = access_card.access
 
 /mob/living/simple_animal/bot/ed209/syndicate/update_icon()
 	icon_state = initial(icon_state)
@@ -160,7 +162,7 @@
 	P.fire()
 
 /mob/living/simple_animal/bot/ed209/syndicate/explode()
-	if (!QDELETED(src))
+	if(!QDELETED(src))
 		if(depotarea)
 			depotarea.list_remove(src, depotarea.guard_list)
 		walk_to(src,0)

code/modules/mob/living/simple_animal/hostile/floorcluwne.dm

@@ -71,15 +71,18 @@
 
 
 /mob/living/simple_animal/hostile/floor_cluwne/Life(seconds, times_fired)
+	if(current_victim && !ishuman(current_victim)) //Just in case a nonhuman is accidentally chosen. A human will then be chosen later on in Acquire_Victim()
+		current_victim = null
+
 	do_jitter_animation(1000)
 	pixel_y = 8
 
-	if(is_type_in_typecache(get_area(src.loc), invalid_area_typecache))
+	if(is_type_in_typecache(get_area(loc), invalid_area_typecache))
 		var/area = pick(teleportlocs)
 		var/area/tp = teleportlocs[area]
 		forceMove(pick(get_area_turfs(tp.type)))
 
-	if(!current_victim && !admincluwne)
+	if((!current_victim && !admincluwne) || QDELETED(current_victim))
 		Acquire_Victim()
 
 	if(stage && !manifested)
@@ -147,24 +150,25 @@
 	var/list/players_copy = GLOB.player_list.Copy()
 	while(players_copy.len)
 		var/mob/living/carbon/human/H = pick_n_take(players_copy)
+		if(!ishuman(H))
+			continue
 
 		if(specific)
 			H = specific
 			if((!H || H.stat == DEAD) && smiting)//safety check, target somehow DIED after we sent a smite
-				message_admins("Smiting Floor Cluwne was deleted due to a lack of valid target. Someone killed them first, or they ceased to exist.")
+				message_admins("Smiting floor cluwne was deleted due to a lack of valid target. Someone killed them first, or they ceased to exist.")
 				qdel(src)
 				return
 			if(H.stat != DEAD && !isLivingSSD(H) &&  H.client && !H.get_int_organ(/obj/item/organ/internal/honktumor/cursed) && !is_type_in_typecache(get_area(H.loc), invalid_area_typecache))
 				current_victim = H
 				return target = current_victim
 
-		if(H && ishuman(H) && H.stat != DEAD && H != current_victim && !isLivingSSD(H) &&  H.client && !H.get_int_organ(/obj/item/organ/internal/honktumor/cursed) && !is_type_in_typecache(get_area(H.loc), invalid_area_typecache))
+		if(H && H.stat != DEAD && H != current_victim && !isLivingSSD(H) &&  H.client && !H.get_int_organ(/obj/item/organ/internal/honktumor/cursed) && !is_type_in_typecache(get_area(H.loc), invalid_area_typecache))
 			current_victim = H
 			interest = 0
 			return target = current_victim
 
-
-	message_admins("Floor Cluwne was deleted due to a lack of valid targets, if this was a manually targeted instance please re-evaluate your choice.")
+	message_admins("Floor cluwne was deleted due to a lack of valid targets[specific ? ", if you spawned this with a specific target please choose another person" : null].")
 	qdel(src)
 
 /mob/living/simple_animal/hostile/floor_cluwne/proc/Manifest()//handles disappearing and appearance anim
@@ -195,6 +199,8 @@
 
 /mob/living/simple_animal/hostile/floor_cluwne/proc/On_Stage()
 	var/mob/living/carbon/human/H = current_victim
+	if(!H)
+		Acquire_Victim()
 	switch(stage)
 
 		if(STAGE_HAUNT)

code/modules/mob/living/simple_animal/hostile/giant_spider.dm

@@ -10,7 +10,7 @@
 
 /mob/living/simple_animal/hostile/poison/AttackingTarget()
 	..()
-	if(isliving(target))
+	if(isliving(target) && (!client || a_intent == INTENT_HARM))
 		var/mob/living/L = target
 		if(L.reagents)
 			L.reagents.add_reagent("spidertoxin", poison_per_bite)

code/modules/mob/living/simple_animal/hostile/hostile.dm

@@ -18,7 +18,7 @@
 	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.
 	var/minimum_distance = 1 //Minimum approach distance, so ranged mobs chase targets down, but still keep their distance set in tiles to the target, set higher to make mobs keep distance
-	
+
 //These vars are related to how mobs locate and target
 	var/robust_searching = 0 //By default, mobs have a simple searching method, set this to 1 for the more scrutinous searching (stat_attack, stat_exclusive, etc), should be disabled on most mobs
 	var/vision_range = 9 //How big of an area to search for targets in, a vision of 9 attempts to find targets as soon as they walk into screen view
@@ -41,6 +41,8 @@
 	/obj/structure/grille,
 	/obj/structure/girder,
 	/obj/structure/rack,
+	/obj/structure/computerframe,
+	/obj/machinery/constructable_frame,
 	/obj/structure/barricade) //turned into a typecache in New()
 	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
 	var/list/emote_taunt = list()

code/modules/mob/living/simple_animal/hostile/pirate.dm

@@ -34,7 +34,7 @@
 	icon_state = "pirateranged"
 	icon_living = "pirateranged"
 	icon_dead = "piratemelee_dead"
-	projectilesound = 'sound/weapons/laser.ogg'
+	projectilesound = 'sound/weapons/Laser.ogg'
 	ranged = 1
 	rapid = 1
 	retreat_distance = 5

code/modules/mob/living/simple_animal/hostile/syndicate.dm

@@ -85,7 +85,7 @@
 	var/area/syndicate_depot/core/depotarea
 	var/raised_alert = FALSE
 	var/alert_on_death = FALSE
-	var/alert_on_timeout = FALSE
+	var/alert_on_timeout = TRUE
 	var/alert_on_spacing = TRUE
 	var/alert_on_shield_breach = FALSE
 	var/seen_enemy = FALSE
@@ -99,6 +99,7 @@
 /mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/New()
 	..()
 	name = "[name] [pick(GLOB.last_names)]"
+	// Do not attempt to move this code to Initialize() or LateInitialize(). Doing so with other objects has caused bugs in the past, because assigning "depotarea" may not work there.
 	depotarea = areaMaster
 	spawn_turf = get_turf(src)
 
@@ -197,7 +198,6 @@
 /mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/officer
 	name = "Syndicate Officer"
 	alert_on_death = TRUE
-	alert_on_timeout = TRUE
 	melee_block_chance = 60
 
 /mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/armory
@@ -209,7 +209,6 @@
 	maxHealth = 250
 	health = 250
 	melee_block_chance = 80
-	alert_on_timeout = TRUE
 	alert_on_shield_breach = TRUE
 
 /mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/armory/Initialize()

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -561,17 +561,16 @@
 /mob/living/simple_animal/proc/sentience_act() //Called when a simple animal gains sentience via gold slime potion
 	return
 
-/mob/living/simple_animal/update_sight(reset_sight = FALSE)
+/mob/living/simple_animal/update_sight()
 	if(!client)
 		return
 	if(stat == DEAD)
 		grant_death_vision()
 		return
 
-	if(reset_sight)
-		see_invisible = initial(see_invisible)
-		see_in_dark = initial(see_in_dark)
-		sight = initial(sight)
+	see_invisible = initial(see_invisible)
+	see_in_dark = initial(see_in_dark)
+	sight = initial(sight)
 
 	if(client.eye != src)
 		var/atom/A = client.eye

code/modules/mob/new_player/sprite_accessories/ipc/ipc_face.dm

@@ -122,13 +122,13 @@
 /datum/sprite_accessory/hair/ipc/fluff
 	fluff = 1
 
-/datum/sprite_accessory/hair/ipc/fluff/lumi_face //Lumi Fluff hair
-	name = "Lumi Face"
-	icon_state = "lumi_face"
+/datum/sprite_accessory/hair/ipc/fluff/lumi_eyes //Lumi Fluff hair
+	name = "Lumi Eyes"
+	icon_state = "lumi_eyes"
 
-/datum/sprite_accessory/hair/ipc/fluff/lumi_blush //Lumi Fluff hair
-	name = "Lumi Blush"
-	icon_state = "lumi_blush"
+/datum/sprite_accessory/hair/ipc/fluff/lumi_music //Lumi Fluff hair
+	name = "Lumi Music"
+	icon_state = "lumi_music"
 
 /datum/sprite_accessory/hair/ipc/fluff/lumi_waiting //Lumi Fluff hair
 	name = "Lumi Waiting"