Merge branch 'master' into upstream-merge-34105

code/modules/mob/dead/dead.dm

@@ -2,6 +2,9 @@
 
 INITIALIZE_IMMEDIATE(/mob/dead)
 
+/mob/dead
+	sight = SEE_TURFS | SEE_MOBS | SEE_OBJS | SEE_SELF
+
 /mob/dead/Initialize()
 	if(initialized)
 		stack_trace("Warning: [src]([type]) initialized multiple times!")
@@ -11,8 +14,9 @@ INITIALIZE_IMMEDIATE(/mob/dead)
 
 	prepare_huds()
 
-	if(CONFIG_GET(string/cross_server_address))
+	if(length(CONFIG_GET(keyed_string_list/cross_server)))
 		verbs += /mob/dead/proc/server_hop
+	set_focus(src)
 	return INITIALIZE_HINT_NORMAL
 
 /mob/dead/dust()	//ghosts can't be vaporised.
@@ -45,26 +49,46 @@ INITIALIZE_IMMEDIATE(/mob/dead)
 	else
 		stat(null, "Time To Start: SOON")
 
+	stat(null, "Players: [SSticker.totalPlayers]")
+	if(client.holder)
+		stat(null, "Players Ready: [SSticker.totalPlayersReady]")
+
 /mob/dead/proc/server_hop()
 	set category = "OOC"
 	set name = "Server Hop!"
 	set desc= "Jump to the other server"
 	if(notransform)
 		return
-	var/csa = CONFIG_GET(string/cross_server_address)
-	if(csa)
-		verbs -= /mob/dead/proc/server_hop
-		to_chat(src, "<span class='notice'>Server Hop has been disabled.</span>")
+	var/list/csa = CONFIG_GET(keyed_string_list/cross_server)
+	var/pick
+	switch(csa.len)
+		if(0)
+			verbs -= /mob/dead/proc/server_hop
+			to_chat(src, "<span class='notice'>Server Hop has been disabled.</span>")
+		if(1)
+			pick = csa[0]
+		else
+			pick = input(src, "Pick a server to jump to", "Server Hop") as null|anything in csa
+
+	if(!pick)
 		return
-	if (alert(src, "Jump to server running at [csa]?", "Server Hop", "Yes", "No") != "Yes")
-		return 0
-	if (client && csa)
-		to_chat(src, "<span class='notice'>Sending you to [csa].</span>")
-		new /obj/screen/splash(client)
-		notransform = TRUE
-		sleep(29)	//let the animation play
-		notransform = FALSE
-		winset(src, null, "command=.options") //other wise the user never knows if byond is downloading resources
-		client << link(csa + "?server_hop=[key]")
-	else
-		to_chat(src, "<span class='error'>There is no other server configured!</span>")
+	
+	var/addr = csa[pick]
+
+	if(alert(src, "Jump to server [pick] ([addr])?", "Server Hop", "Yes", "No") != "Yes")
+		return
+
+	var/client/C = client
+	to_chat(C, "<span class='notice'>Sending you to [pick].</span>")
+	new /obj/screen/splash(C)
+
+	notransform = TRUE
+	sleep(29)	//let the animation play
+	notransform = FALSE
+
+	if(!C)
+		return
+
+	winset(src, null, "command=.options") //other wise the user never knows if byond is downloading resources
+
+	C << link("[addr]?server_hop=[key]")

code/modules/mob/dead/new_player/new_player.dm

@@ -73,26 +73,6 @@
 	popup.open(0)
 	return
 
-/mob/dead/new_player/Stat()
-	..()
-
-	if(statpanel("Lobby"))
-		stat("Game Mode:", (SSticker.hide_mode) ? "Secret" : "[GLOB.master_mode]")
-		stat("Map:", SSmapping.config.map_name)
-
-		if(SSticker.current_state == GAME_STATE_PREGAME)
-			var/time_remaining = SSticker.GetTimeLeft()
-			if(time_remaining > 0)
-				stat("Time To Start:", "[round(time_remaining/10)]s")
-			else if(time_remaining == -10)
-				stat("Time To Start:", "DELAYED")
-			else
-				stat("Time To Start:", "SOON")
-
-			stat("Players:", "[SSticker.totalPlayers]")
-			if(client.holder)
-				stat("Players Ready:", "[SSticker.totalPlayersReady]")
-
 
 /mob/dead/new_player/Topic(href, href_list[])
 	if(src != usr)
@@ -317,15 +297,13 @@
 		return 0
 	if(job.required_playtime_remaining(client))
 		return 0
-	if(CONFIG_GET(flag/enforce_human_authority) && !client.prefs.pref_species.qualifies_for_rank(rank, client.prefs.features))
-		return 0
 	return 1
 
 
 /mob/dead/new_player/proc/AttemptLateSpawn(rank)
 	if(!IsJobAvailable(rank))
 		alert(src, "[rank] is not available. Please try another.")
-		return 0
+		return FALSE
 
 	if(SSticker.late_join_disabled)
 		alert(src, "An administrator has disabled late join spawning.")

code/modules/mob/dead/new_player/preferences_setup.dm

@@ -1,4 +1,5 @@
-//The mob should have a gender you want before running this proc. Will run fine without H
+
+	//The mob should have a gender you want before running this proc. Will run fine without H
 /datum/preferences/proc/random_character(gender_override)
 	if(gender_override)
 		gender = gender_override
@@ -19,7 +20,7 @@
 	features = random_features()
 	age = rand(AGE_MIN,AGE_MAX)
 
-/datum/preferences/proc/update_preview_icon(nude = 0)
+/datum/preferences/proc/update_preview_icon(nude = FALSE)
 	// Silicons only need a very basic preview since there is no customization for them.
 	if(job_engsec_high)
 		switch(job_engsec_high)

code/modules/mob/dead/observer/observer.dm

@@ -13,7 +13,6 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
 	density = FALSE
 	canmove = 0
 	anchored = TRUE	//  don't get pushed around
-	sight = SEE_TURFS | SEE_MOBS | SEE_OBJS | SEE_SELF
 	see_invisible = SEE_INVISIBLE_OBSERVER
 	see_in_dark = 100
 	invisibility = INVISIBILITY_OBSERVER
@@ -136,13 +135,13 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
 /mob/dead/observer/narsie_act()
 	var/old_color = color
 	color = "#960000"
-	animate(src, color = old_color, time = 10, flags_1 = ANIMATION_PARALLEL)
+	animate(src, color = old_color, time = 10, flags = ANIMATION_PARALLEL)
 	addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 10)
 
 /mob/dead/observer/ratvar_act()
 	var/old_color = color
 	color = "#FAE48C"
-	animate(src, color = old_color, time = 10, flags_1 = ANIMATION_PARALLEL)
+	animate(src, color = old_color, time = 10, flags = ANIMATION_PARALLEL)
 	addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 10)
 
 /mob/dead/observer/Destroy()
@@ -767,8 +766,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	//Istype so we filter out points of interest that are not mobs
 	if(client && mob_eye && istype(mob_eye))
 		client.eye = mob_eye
-		client.screen = list()
 		if(mob_eye.hud_used)
+			client.screen = list()
 			LAZYINITLIST(mob_eye.observers)
 			mob_eye.observers |= src
 			mob_eye.hud_used.show_hud(mob_eye.hud_used.hud_version, src)

code/modules/mob/dead/observer/say.dm

@@ -1,25 +1,28 @@
-/mob/dead/observer/say(message)
-	message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
-
-	if (!message)
-		return
-
+/mob/dead/observer/say(message)
+	message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
+
+	if (!message)
+		return
+
 	log_talk(src,"Ghost/[src.key] : [message]", LOGSAY)
-
-	. = src.say_dead(message)
-
-/mob/dead/observer/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode)
-	var/atom/movable/to_follow = speaker
-	if(radio_freq)
-		var/atom/movable/virtualspeaker/V = speaker
-
-		if(isAI(V.source))
-			var/mob/living/silicon/ai/S = V.source
-			to_follow = S.eyeobj
-		else
-			to_follow = V.source
-	var/link = FOLLOW_LINK(src, to_follow)
-	// Recompose the message, because it's scrambled by default
-	message = compose_message(speaker, message_language, raw_message, radio_freq, spans, message_mode)
-	to_chat(src, "[link] [message]")
-
+
+	if(check_emote(message))
+		return
+
+	. = say_dead(message)
+
+/mob/dead/observer/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode)
+	var/atom/movable/to_follow = speaker
+	if(radio_freq)
+		var/atom/movable/virtualspeaker/V = speaker
+
+		if(isAI(V.source))
+			var/mob/living/silicon/ai/S = V.source
+			to_follow = S.eyeobj
+		else
+			to_follow = V.source
+	var/link = FOLLOW_LINK(src, to_follow)
+	// Recompose the message, because it's scrambled by default
+	message = compose_message(speaker, message_language, raw_message, radio_freq, spans, message_mode)
+	to_chat(src, "[link] [message]")
+

code/modules/mob/inventory.dm

@@ -205,8 +205,26 @@
 /mob/proc/put_in_hands(obj/item/I, del_on_fail = FALSE)
 	if(!I)
 		return FALSE
+
+	// If the item is a stack and we're already holding a stack then merge
+	if (istype(I, /obj/item/stack))
+		var/obj/item/stack/I_stack = I
+		var/obj/item/stack/active_stack = get_active_held_item()
+
+		if (istype(active_stack) && istype(I_stack, active_stack.merge_type))
+			if (I_stack.merge(active_stack))
+				to_chat(usr, "<span class='notice'>Your [active_stack.name] stack now contains [active_stack.get_amount()] [active_stack.singular_name]\s.</span>")
+				return TRUE
+		else
+			var/obj/item/stack/inactive_stack = get_inactive_held_item()
+			if (istype(inactive_stack) && istype(I_stack, inactive_stack.merge_type))
+				if (I_stack.merge(inactive_stack))
+					to_chat(usr, "<span class='notice'>Your [inactive_stack.name] stack now contains [inactive_stack.get_amount()] [inactive_stack.singular_name]\s.</span>")
+					return TRUE
+
 	if(put_in_active_hand(I))
 		return TRUE
+
 	var/hand = get_empty_held_index_for_side("l")
 	if(!hand)
 		hand =  get_empty_held_index_for_side("r")

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

@@ -30,7 +30,6 @@
 	unique_name = 1
 
 	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

code/modules/mob/living/carbon/alien/alien_defense.dm

@@ -1,126 +1,126 @@
-
-/mob/living/carbon/alien/get_eye_protection()
-	return ..() + 2 //potential cyber implants + natural eye protection
-
-/mob/living/carbon/alien/get_ear_protection()
-	return 2 //no ears
-
-/mob/living/carbon/alien/hitby(atom/movable/AM, skipcatch, hitpush)
+
+/mob/living/carbon/alien/get_eye_protection()
+	return ..() + 2 //potential cyber implants + natural eye protection
+
+/mob/living/carbon/alien/get_ear_protection()
+	return 2 //no ears
+
+/mob/living/carbon/alien/hitby(atom/movable/AM, skipcatch, hitpush)
 	..(AM, skipcatch = TRUE, hitpush = FALSE)
-
-
-/*Code for aliens attacking aliens. Because aliens act on a hivemind, I don't see them as very aggressive with each other.
-As such, they can either help or harm other aliens. Help works like the human help command while harm is a simple nibble.
-In all, this is a lot like the monkey code. /N
-*/
-/mob/living/carbon/alien/attack_alien(mob/living/carbon/alien/M)
-	if(isturf(loc) && istype(loc.loc, /area/start))
-		to_chat(M, "No attacking people at spawn, you jackass.")
-		return
-
-	switch(M.a_intent)
-
-		if ("help")
-			resting = 0
-			AdjustStun(-60)
-			AdjustKnockdown(-60)
-			AdjustUnconscious(-60)
-			AdjustSleeping(-100)
-			visible_message("<span class='notice'>[M.name] nuzzles [src] trying to wake [p_them()] up!</span>")
-
-		if ("grab")
-			grabbedby(M)
-
-		else
-			if(health > 0)
-				M.do_attack_animation(src, ATTACK_EFFECT_BITE)
-				playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
-				visible_message("<span class='danger'>[M.name] bites [src]!</span>", \
-						"<span class='userdanger'>[M.name] bites [src]!</span>", null, COMBAT_MESSAGE_RANGE)
-				adjustBruteLoss(1)
-				add_logs(M, src, "attacked")
-				updatehealth()
-			else
-				to_chat(M, "<span class='warning'>[name] is too injured for that.</span>")
-
-
-/mob/living/carbon/alien/attack_larva(mob/living/carbon/alien/larva/L)
-	return attack_alien(L)
-
-
-/mob/living/carbon/alien/attack_hand(mob/living/carbon/human/M)
-	if(..())	//to allow surgery to return properly.
-		return 0
-
-	switch(M.a_intent)
-		if("help")
-			help_shake_act(M)
-		if("grab")
-			grabbedby(M)
-		if ("harm")
-			M.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
-			return 1
-		if("disarm")
-			M.do_attack_animation(src, ATTACK_EFFECT_DISARM)
-			return 1
-	return 0
-
-
-/mob/living/carbon/alien/attack_paw(mob/living/carbon/monkey/M)
-	if(..())
-		if (stat != DEAD)
-			var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
-			apply_damage(rand(1, 3), BRUTE, affecting)
-
-
-/mob/living/carbon/alien/attack_animal(mob/living/simple_animal/M)
-	. = ..()
-	if(.)
-		var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
-		switch(M.melee_damage_type)
-			if(BRUTE)
-				adjustBruteLoss(damage)
-			if(BURN)
-				adjustFireLoss(damage)
-			if(TOX)
-				adjustToxLoss(damage)
-			if(OXY)
-				adjustOxyLoss(damage)
-			if(CLONE)
-				adjustCloneLoss(damage)
-			if(STAMINA)
-				adjustStaminaLoss(damage)
-
-/mob/living/carbon/alien/attack_slime(mob/living/simple_animal/slime/M)
-	if(..()) //successful slime attack
-		var/damage = rand(5, 35)
-		if(M.is_adult)
-			damage = rand(10, 40)
-		adjustBruteLoss(damage)
-		add_logs(M, src, "attacked")
-		updatehealth()
-
-/mob/living/carbon/alien/ex_act(severity, target, origin)
-	if(origin && istype(origin, /datum/spacevine_mutation) && isvineimmune(src))
-		return
-	..()
-	switch (severity)
-		if (1)
-			gib()
-			return
-
-		if (2)
-			take_overall_damage(60, 60)
-			adjustEarDamage(30,120)
-
-		if(3)
-			take_overall_damage(30,0)
-			if(prob(50))
-				Unconscious(20)
-			adjustEarDamage(15,60)
-
-/mob/living/carbon/alien/soundbang_act(intensity = 1, stun_pwr = 20, damage_pwr = 5, deafen_pwr = 15)
-	return 0
-
-/mob/living/carbon/alien/acid_act(acidpwr, acid_volume)
-	return 0//aliens are immune to acid.
+
+
+/*Code for aliens attacking aliens. Because aliens act on a hivemind, I don't see them as very aggressive with each other.
+As such, they can either help or harm other aliens. Help works like the human help command while harm is a simple nibble.
+In all, this is a lot like the monkey code. /N
+*/
+/mob/living/carbon/alien/attack_alien(mob/living/carbon/alien/M)
+	if(isturf(loc) && istype(loc.loc, /area/start))
+		to_chat(M, "No attacking people at spawn, you jackass.")
+		return
+
+	switch(M.a_intent)
+
+		if ("help")
+			resting = 0
+			AdjustStun(-60)
+			AdjustKnockdown(-60)
+			AdjustUnconscious(-60)
+			AdjustSleeping(-100)
+			visible_message("<span class='notice'>[M.name] nuzzles [src] trying to wake [p_them()] up!</span>")
+
+		if ("grab")
+			grabbedby(M)
+
+		else
+			if(health > 0)
+				M.do_attack_animation(src, ATTACK_EFFECT_BITE)
+				playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
+				visible_message("<span class='danger'>[M.name] bites [src]!</span>", \
+						"<span class='userdanger'>[M.name] bites [src]!</span>", null, COMBAT_MESSAGE_RANGE)
+				adjustBruteLoss(1)
+				add_logs(M, src, "attacked")
+				updatehealth()
+			else
+				to_chat(M, "<span class='warning'>[name] is too injured for that.</span>")
+
+
+/mob/living/carbon/alien/attack_larva(mob/living/carbon/alien/larva/L)
+	return attack_alien(L)
+
+
+/mob/living/carbon/alien/attack_hand(mob/living/carbon/human/M)
+	if(..())	//to allow surgery to return properly.
+		return 0
+
+	switch(M.a_intent)
+		if("help")
+			help_shake_act(M)
+		if("grab")
+			grabbedby(M)
+		if ("harm")
+			M.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
+			return 1
+		if("disarm")
+			M.do_attack_animation(src, ATTACK_EFFECT_DISARM)
+			return 1
+	return 0
+
+
+/mob/living/carbon/alien/attack_paw(mob/living/carbon/monkey/M)
+	if(..())
+		if (stat != DEAD)
+			var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
+			apply_damage(rand(1, 3), BRUTE, affecting)
+
+
+/mob/living/carbon/alien/attack_animal(mob/living/simple_animal/M)
+	. = ..()
+	if(.)
+		var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
+		switch(M.melee_damage_type)
+			if(BRUTE)
+				adjustBruteLoss(damage)
+			if(BURN)
+				adjustFireLoss(damage)
+			if(TOX)
+				adjustToxLoss(damage)
+			if(OXY)
+				adjustOxyLoss(damage)
+			if(CLONE)
+				adjustCloneLoss(damage)
+			if(STAMINA)
+				adjustStaminaLoss(damage)
+
+/mob/living/carbon/alien/attack_slime(mob/living/simple_animal/slime/M)
+	if(..()) //successful slime attack
+		var/damage = rand(5, 35)
+		if(M.is_adult)
+			damage = rand(10, 40)
+		adjustBruteLoss(damage)
+		add_logs(M, src, "attacked")
+		updatehealth()
+
+/mob/living/carbon/alien/ex_act(severity, target, origin)
+	if(origin && istype(origin, /datum/spacevine_mutation) && isvineimmune(src))
+		return
+	..()
+	switch (severity)
+		if (1)
+			gib()
+			return
+
+		if (2)
+			take_overall_damage(60, 60)
+			adjustEarDamage(30,120)
+
+		if(3)
+			take_overall_damage(30,0)
+			if(prob(50))
+				Unconscious(20)
+			adjustEarDamage(15,60)
+
+/mob/living/carbon/alien/soundbang_act(intensity = 1, stun_pwr = 20, damage_pwr = 5, deafen_pwr = 15)
+	return 0
+
+/mob/living/carbon/alien/acid_act(acidpwr, acid_volume)
+	return 0//aliens are immune to acid.

code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm

@@ -11,7 +11,7 @@
 	..()
 
 /mob/living/carbon/alien/humanoid/hunter/movement_delay()
-	. = -1		//hunters are sanic
+	. = -1	//hunters are sanic
 	. += ..()	//but they still need to slow down on stun
 
 

code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm

@@ -48,4 +48,4 @@
 		return 1
 	else
 		to_chat(user, "<span class='notice'>We already have an alive queen.</span>")
-		return 0
+		return 0

code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm

@@ -18,4 +18,4 @@
 
 
 /mob/living/carbon/alien/humanoid/sentinel/movement_delay()
-	. = ..()
+	. = ..()

code/modules/mob/living/carbon/alien/humanoid/death.dm

@@ -20,4 +20,4 @@
 		if(istype(node)) // just in case someone would ever add a diffirent node to hivenode slot
 			node.queen_death()
 
-	return ..()
+	return ..()

code/modules/mob/living/carbon/alien/humanoid/humanoid.dm

@@ -41,7 +41,7 @@
 	var/list/dat = list()
 	dat += {"
 	<HR>
-	<B><FONT size=3>[name]</FONT></B>
+	<span class='big bold'>[name]</span>
 	<HR>"}
 	for(var/i in 1 to held_items.len)
 		var/obj/item/I = get_item_for_held_index(i)

code/modules/mob/living/carbon/alien/larva/larva.dm

@@ -65,4 +65,4 @@
 
 /mob/living/carbon/alien/larva/stripPanelEquip(obj/item/what, mob/who)
 	to_chat(src, "<span class='warning'>You don't have the dexterity to do this!</span>")
-	return
+	return

code/modules/mob/living/carbon/alien/organs.dm

@@ -2,12 +2,12 @@
 	icon_state = "xgibmid2"
 	var/list/alien_powers = list()
 
-/obj/item/organ/alien/New()
+/obj/item/organ/alien/Initialize()
+	. = ..()
 	for(var/A in alien_powers)
 		if(ispath(A))
 			alien_powers -= A
 			alien_powers += new A(src)
-	..()
 
 /obj/item/organ/alien/Insert(mob/living/carbon/M, special = 0)
 	..()

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

@@ -8,7 +8,7 @@
 	GLOB.carbon_list += src
 
 /mob/living/carbon/Destroy()
-//This must be done first, so the mob ghosts correctly before DNA etc is nulled
+	//This must be done first, so the mob ghosts correctly before DNA etc is nulled
 	. =  ..()
 
 	QDEL_LIST(internal_organs)
@@ -365,16 +365,9 @@
 	to_chat(src, "<span class='notice'>You successfully [cuff_break ? "break" : "remove"] [I].</span>")
 
 	if(cuff_break)
+		. = !((I == handcuffed) || (I == legcuffed))
 		qdel(I)
-		if(I == handcuffed)
-			handcuffed = null
-			update_handcuffed()
-			return
-		else if(I == legcuffed)
-			legcuffed = null
-			update_inv_legcuffed()
-			return
-		return TRUE
+		return
 
 	else
 		if(I == handcuffed)
@@ -518,7 +511,7 @@
 	health = maxHealth - getOxyLoss() - getToxLoss() - getCloneLoss() - total_burn - total_brute
 	update_stat()
 	if(((maxHealth - total_burn) < HEALTH_THRESHOLD_DEAD) && stat == DEAD )
-		become_husk()
+		become_husk("burn")
 	med_hud_set_health()
 
 /mob/living/carbon/update_sight()

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

@@ -78,7 +78,6 @@
 	send_item_attack_message(I, user, affecting.name)
 	if(I.force)
 		apply_damage(I.force, I.damtype, affecting)
-		damage_clothes(I.force, I.damtype, "melee", affecting.body_zone)
 		if(I.damtype == BRUTE && affecting.status == BODYPART_ORGANIC)
 			if(prob(33))
 				I.add_mob_blood(src)
@@ -308,9 +307,13 @@
 				if(prob(eyes.eye_damage - 20))
 					if(!has_disability(DISABILITY_NEARSIGHT))
 						to_chat(src, "<span class='warning'>Your eyes start to burn badly!</span>")
+					become_nearsighted(EYE_DAMAGE)
+
 				else if(prob(eyes.eye_damage - 25))
 					if(!has_disability(DISABILITY_BLIND))
 						to_chat(src, "<span class='warning'>You can't see anything!</span>")
+					become_blind(EYE_DAMAGE)
+
 			else
 				to_chat(src, "<span class='warning'>Your eyes are really starting to hurt. This can't be good for you!</span>")
 		if(has_bane(BANE_LIGHT))

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

@@ -19,7 +19,7 @@
 
 	if(stat == SOFT_CRIT)
 		. += SOFTCRIT_ADD_SLOWDOWN
- 
+
 /mob/living/carbon/slip(knockdown_amount, obj/O, lube)
 	if(movement_type & FLYING)
 		return 0

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

@@ -151,7 +151,7 @@
 	var/mob/living/carbon/human/H = user
 	if(H.dna && H.dna.species && (H.dna.features["wings"] != "None"))
 		return TRUE
-		
+
 /mob/living/carbon/human/proc/OpenWings()
 	if(!dna || !dna.species)
 		return

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

@@ -198,14 +198,13 @@
 			msg += "[t_He] [t_is] plump and delicious looking - Like a fat little piggy. A tasty piggy.\n"
 		else
 			msg += "[t_He] [t_is] quite chubby.\n"
-
 	switch(disgust)
 		if(DISGUST_LEVEL_GROSS to DISGUST_LEVEL_VERYGROSS)
-			msg += "[t_He] looks a bit grossed out.\n"
+			msg += "[t_He] look[p_s()] a bit grossed out.\n"
 		if(DISGUST_LEVEL_VERYGROSS to DISGUST_LEVEL_DISGUSTED)
-			msg += "[t_He] looks really grossed out.\n"
+			msg += "[t_He] look[p_s()] really grossed out.\n"
 		if(DISGUST_LEVEL_DISGUSTED to INFINITY)
-			msg += "[t_He] looks disgusted.\n"
+			msg += "[t_He] look[p_s()] extremely disgusted.\n"
 
 	if(blood_volume < BLOOD_VOLUME_SAFE)
 		msg += "[t_He] [t_has] pale skin.\n"
@@ -310,6 +309,7 @@
 						R = find_record("name", perpname, GLOB.data_core.security)
 						if(R)
 							criminal = R.fields["criminal"]
+
 						msg += "<span class='deptradio'>Criminal status:</span> <a href='?src=[REF(src)];hud=s;status=1'>\[[criminal]\]</a>\n"
 						msg += "<span class='deptradio'>Security record:</span> <a href='?src=[REF(src)];hud=s;view=1'>\[View\]</a> "
 						msg += "<a href='?src=[REF(src)];hud=s;add_crime=1'>\[Add crime\]</a> "

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

@@ -264,7 +264,7 @@
 				// Display a warning if the user mocks up
 				to_chat(src, "<span class='warning'>You feel your [pocket_side] pocket being fumbled with!</span>")
 
-	..()
+		..()
 
 
 ///////HUDs///////
@@ -577,8 +577,8 @@
 					threatcount += 2
 
 	//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 += 6
+	if(istype(head, /obj/item/clothing/head/wizard) || istype(head, /obj/item/clothing/head/helmet/space/hardsuit/wizard))
+		threatcount += 2
 
 	//Check for nonhuman scum
 	if(dna && dna.species.id && !(dna.species.id in list("human" , "lizard", "mammal", "avian", "aquatic", "insect")))
@@ -590,7 +590,7 @@
 
 	//Agent cards lower threatlevel.
 	if(istype(idcard, /obj/item/card/id/syndicate))
-		threatcount -= 2
+		threatcount -= 5
 
 	return threatcount
 
@@ -847,7 +847,8 @@
 	return TRUE
 
 /mob/living/carbon/human/update_gravity(has_gravity,override = 0)
-	override = dna.species.override_float
+	if(dna && dna.species) //prevents a runtime while a human is being monkeyfied
+		override = dna.species.override_float
 	..()
 
 /mob/living/carbon/human/vomit(lost_nutrition = 10, blood = 0, stun = 1, distance = 0, message = 1, toxic = 0)

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

@@ -44,7 +44,10 @@
 		if(mind.martial_art && mind.martial_art.deflection_chance) //Some martial arts users can deflect projectiles!
 			if(prob(mind.martial_art.deflection_chance))
 				if(!lying && dna && !dna.check_mutation(HULK)) //But only if they're not lying down, and hulks can't do it
-					visible_message("<span class='danger'>[src] deflects the projectile; [p_they()] can't be hit with ranged weapons!</span>", "<span class='userdanger'>You deflect the projectile!</span>")
+					if(mind.martial_art.deflection_chance >= 100) //if they can NEVER be hit, lets clue sec in ;)
+						visible_message("<span class='danger'>[src] deflects the projectile; [p_they()] can't be hit with ranged weapons!</span>", "<span class='userdanger'>You deflect the projectile!</span>")
+					else
+						visible_message("<span class='danger'>[src] deflects the projectile!</span>", "<span class='userdanger'>You deflect the projectile!</span>")
 					playsound(src, pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, 1)
 					return 0
 
@@ -180,7 +183,6 @@
 		visible_message("<span class='danger'>[message]</span>", \
 								"<span class='userdanger'>[message]</span>")
 		adjustBruteLoss(15)
-		damage_clothes(15, BRUTE, "melee")
 		return 1
 
 /mob/living/carbon/human/attack_hand(mob/user)
@@ -200,7 +202,8 @@
 		return 0
 
 	if(M.a_intent == INTENT_DISARM) //Always drop item in hand, if no item, get stunned instead.
-		if(dropItemToGround(get_active_held_item()))
+		var/obj/item/I = get_active_held_item()
+		if(I && dropItemToGround(I))
 			playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1)
 			visible_message("<span class='danger'>[M] disarmed [src]!</span>", \
 					"<span class='userdanger'>[M] disarmed [src]!</span>")
@@ -221,7 +224,6 @@
 				return 0
 			if(stat != DEAD)
 				apply_damage(damage, BRUTE, affecting, run_armor_check(affecting, "melee"))
-				damage_clothes(damage, BRUTE, "melee", affecting.body_zone)
 		return 1
 
 /mob/living/carbon/human/attack_alien(mob/living/carbon/alien/humanoid/M)
@@ -251,10 +253,10 @@
 			if(!dismembering_strike(M, M.zone_selected)) //Dismemberment successful
 				return 1
 			apply_damage(damage, BRUTE, affecting, armor_block)
-			damage_clothes(damage, BRUTE, "melee", affecting.body_zone)
 
 		if(M.a_intent == INTENT_DISARM) //Always drop item in hand, if no item, get stun instead.
-			if(dropItemToGround(get_active_held_item()))
+			var/obj/item/I = get_active_held_item()
+			if(I && dropItemToGround(I))
 				playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1)
 				visible_message("<span class='danger'>[M] disarmed [src]!</span>", \
 						"<span class='userdanger'>[M] disarmed [src]!</span>")
@@ -279,7 +281,6 @@
 				affecting = get_bodypart("chest")
 			var/armor_block = run_armor_check(affecting, "melee")
 			apply_damage(damage, BRUTE, affecting, armor_block)
-			damage_clothes(damage, BRUTE, "melee", affecting.body_zone)
 
 
 /mob/living/carbon/human/attack_animal(mob/living/simple_animal/M)
@@ -296,7 +297,6 @@
 			affecting = get_bodypart("chest")
 		var/armor = run_armor_check(affecting, "melee", armour_penetration = M.armour_penetration)
 		apply_damage(damage, M.melee_damage_type, affecting, armor)
-		damage_clothes(damage, M.melee_damage_type, "melee", affecting.body_zone)
 
 
 /mob/living/carbon/human/attack_slime(mob/living/simple_animal/slime/M)
@@ -317,7 +317,6 @@
 			affecting = get_bodypart("chest")
 		var/armor_block = run_armor_check(affecting, "melee")
 		apply_damage(damage, BRUTE, affecting, armor_block)
-		damage_clothes(damage, BRUTE, "melee", affecting.body_zone)
 
 /mob/living/carbon/human/mech_melee_attack(obj/mecha/M)
 
@@ -335,11 +334,9 @@
 						Unconscious(20)
 					update |= temp.receive_damage(dmg, 0)
 					playsound(src, 'sound/weapons/punch4.ogg', 50, 1)
-					damage_clothes(dmg, BRUTE, "melee", temp.body_zone)
 				if("fire")
 					update |= temp.receive_damage(0, dmg)
 					playsound(src, 'sound/items/welder.ogg', 50, 1)
-					damage_clothes(dmg, BURN, "melee", temp.body_zone)
 				if("tox")
 					M.mech_toxin_damage(src)
 				else
@@ -374,6 +371,9 @@
 				throw_at(throw_target, 200, 4)
 				damage_clothes(400 - bomb_armor, BRUTE, "bomb")
 			else
+				for(var/I in contents)
+					var/atom/A = I
+					A.ex_act(severity)
 				gib()
 				return
 

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

@@ -91,17 +91,6 @@
 		return wear_id.GetID()
 
 
-/mob/living/carbon/human/abiotic(full_body = 0)
-	var/abiotic_hands = FALSE
-	for(var/obj/item/I in held_items)
-		if(!(I.flags_1 & NODROP_1))
-			abiotic_hands = TRUE
-			break
-	if(full_body && abiotic_hands && ((back && !(back.flags_1&NODROP_1)) || (wear_mask && !(wear_mask.flags_1&NODROP_1)) || (head && !(head.flags_1&NODROP_1)) || (shoes && !(shoes.flags_1&NODROP_1)) || (w_uniform && !(w_uniform.flags_1&NODROP_1)) || (wear_suit && !(wear_suit.flags_1&NODROP_1)) || (glasses && !(glasses.flags_1&NODROP_1)) || (ears && !(ears.flags_1&NODROP_1)) || (gloves && !(gloves.flags_1&NODROP_1)) ) )
-		return TRUE
-	return abiotic_hands
-
-
 /mob/living/carbon/human/IsAdvancedToolUser()
 	if(has_disability(DISABILITY_MONKEYLIKE))
 		return FALSE

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

@@ -23,7 +23,7 @@
 			. = 1
 
 /mob/living/carbon/human/mob_negates_gravity()
-	return ((shoes && shoes.negates_gravity()) || dna.species.negates_gravity(src))
+	return ((shoes && shoes.negates_gravity()) || (dna.species.negates_gravity(src)))
 
 /mob/living/carbon/human/Move(NewLoc, direct)
 	. = ..()

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

@@ -1622,4 +1622,4 @@
 	TRAITS |= TRAIT_ROBUST
 	TRAITS |= TRAIT_SMART
 	faction += "bot_power"
-	. = ..()
+	. = ..()

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

@@ -32,8 +32,7 @@
 		handle_arousal()
 
 	if(..()) //not dead
-		for(var/datum/mutation/human/HM in dna.mutations)
-			HM.on_life(src)
+		handle_active_genes()
 
 	if(stat != DEAD)
 		//heart attack stuff
@@ -97,19 +96,18 @@
 
 		failed_last_breath = 1
 
-		if(dna && dna.species)
-			var/datum/species/S = dna.species
+		var/datum/species/S = dna.species
 
-			if(S.breathid == "o2")
-				throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy)
-			else if(S.breathid == "tox")
-				throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox)
-			else if(S.breathid == "co2")
-				throw_alert("not_enough_co2", /obj/screen/alert/not_enough_co2)
-			else if(S.breathid == "n2")
-				throw_alert("not_enough_nitro", /obj/screen/alert/not_enough_nitro)
+		if(S.breathid == "o2")
+			throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy)
+		else if(S.breathid == "tox")
+			throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox)
+		else if(S.breathid == "co2")
+			throw_alert("not_enough_co2", /obj/screen/alert/not_enough_co2)
+		else if(S.breathid == "n2")
+			throw_alert("not_enough_nitro", /obj/screen/alert/not_enough_nitro)
 
-		return 0
+		return FALSE
 	else
 		if(istype(L, /obj/item/organ/lungs))
 			var/obj/item/organ/lungs/lun = L
@@ -157,7 +155,7 @@
 //END FIRE CODE
 
 
-//This proc returns a number made up of the flags_1 for body parts which you are protected on. (such as HEAD, CHEST, GROIN, etc. See setup.dm for the full list)
+//This proc returns a number made up of the flags for body parts which you are protected on. (such as HEAD, CHEST, GROIN, etc. See setup.dm for the full list)
 /mob/living/carbon/human/proc/get_heat_protection_flags(temperature) //Temperature is the temperature you're being exposed to.
 	var/thermal_protection_flags = 0
 	//Handle normal clothing
@@ -242,15 +240,14 @@
 /mob/living/carbon/human/proc/get_cold_protection(temperature)
 
 	if(dna.check_mutation(COLDRES))
-		return 1 //Fully protected from the cold.
-
-	if(dna && (RESISTCOLD in dna.species.species_traits))
-		return 1
+		return TRUE //Fully protected from the cold.
 
 	if(istype(loc, /obj/item/device/dogborg/sleeper))
 		return 1 //freezing to death in sleepers ruins fun.
 	if(ismob(loc))
 		return 1 //because lazy and being inside somemone insulates you from space
+	if(RESISTCOLD in dna.species.species_traits)
+		return TRUE
 
 	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)
@@ -347,6 +344,9 @@
 
 	heart.beating = !status
 
+/mob/living/carbon/human/proc/handle_active_genes()
+	for(var/datum/mutation/human/HM in dna.mutations)
+		HM.on_life(src)
 
 /mob/living/carbon/human/proc/handle_heart()
 	if(!can_heartattack())
@@ -386,12 +386,22 @@ All effects don't start immediately, but rather get worse over time; the rate is
 81-90: Extremely high alcohol content - light brain damage, passing out
 91-100: Dangerously toxic - swift death
 */
-
+#define BALLMER_POINTS 5
+GLOBAL_LIST_INIT(ballmer_good_msg, list("Hey guys, what if we rolled out a bluespace wiring system so mice can't destroy the powergrid anymore?",
+										"Hear me out here. What if, and this is just a theory, we made R&D controllable from our PDAs?",
+										"I'm thinking we should roll out a git repository for our research under the AGPLv3 license so that we can share it among the other stations freely.",
+										"I dunno about you guys, but IDs and PDAs being separate is clunky as fuck. Maybe we should merge them into a chip in our arms? That way they can't be stolen easily.",
+										"Why the fuck aren't we just making every pair of shoes into galoshes? We have the technology."))
+GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put a webserver that's automatically turned on with default admin passwords into every PDA?",
+												"So like, you know how we separate our codebase from the master copy that runs on our consumer boxes? What if we merged the two and undid the separation between codebase and server?",
+												"Dude, radical idea: H.O.N.K mechs but with no bananium required.",
+												"Best idea ever: Disposal pipes instead of hallways."))
 /mob/living/carbon/human/handle_status_effects()
 	..()
+
+
 	if(drunkenness)
 		drunkenness = max(drunkenness - (drunkenness * 0.04), 0)
-
 		if(drunkenness >= 6)
 			if(prob(25))
 				slurring += 2
@@ -399,7 +409,22 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 		if(drunkenness >= 11 && slurring < 5)
 			slurring += 1.2
-
+		if(mind && (mind.assigned_role == "Scientist" || mind.assigned_role == "Research Director"))
+			if(SSresearch.science_tech)
+				if(drunkenness >= 12.9 && drunkenness <= 13.8)
+					drunkenness = round(drunkenness, 0.01)
+					var/ballmer_percent = 0
+					if(drunkenness == 13.35) // why run math if I dont have to
+						ballmer_percent = 1
+					else
+						ballmer_percent = (-abs(drunkenness - 13.35) / 0.9) + 1
+					if(prob(5))
+						say(pick(GLOB.ballmer_good_msg))
+					SSresearch.science_tech.research_points += (BALLMER_POINTS * ballmer_percent)
+				if(drunkenness > 26) // by this point you're into windows ME territory
+					if(prob(5))
+						SSresearch.science_tech.research_points -= BALLMER_POINTS
+						say(pick(GLOB.ballmer_windows_me_msg))
 		if(drunkenness >= 41)
 			if(prob(25))
 				confused += 2

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

@@ -29,8 +29,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 	var/meat = /obj/item/reagent_containers/food/snacks/meat/slab/human //What the species drops on gibbing
 	var/skinned_type
 	var/liked_food = NONE
-	var/disliked_food = NONE
-	var/toxic_food = NONE
+	var/disliked_food = GROSS
+	var/toxic_food = TOXIC
 	var/list/no_equip = list()	// slots the race can't equip stuff to
 	var/nojumpsuit = 0	// this is sorta... weird. it basically lets you equip stuff that usually needs jumpsuits without one, like belts and pockets and ids
 	var/blacklisted = 0 //Flag to exclude from green slime core species.
@@ -53,7 +53,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 	var/damage_overlay_type = "human" //what kind of damage overlays (if any) appear on our species when wounded?
 	var/fixed_mut_color = "" //to use MUTCOLOR with a fixed color that's independent of dna.feature["mcolor"]
 
-	// species flags_1. these can be found in flags_1.dm
+	// species flags. these can be found in flags.dm
 	var/list/species_traits = list()
 
 	var/attack_verb = "punch"	// punch-specific attack verb
@@ -130,7 +130,6 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 /datum/species/proc/copy_properties_from(datum/species/old_species)
 	return
 
-
 //Please override this locally if you want to define when what species qualifies for what rank if human authority is enforced.
 /datum/species/proc/qualifies_for_rank(rank, list/features)
 	if(rank in GLOB.command_positions)
@@ -452,6 +451,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 	var/list/standing = list()
 
 	var/obj/item/bodypart/head/HD = H.get_bodypart("head")
+
 	if(HD && !(H.has_disability(DISABILITY_HUSK)))
 		// lipstick
 		if(H.lip_style && (LIPS in species_traits))
@@ -1092,7 +1092,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 /datum/species/proc/get_spans()
 	return list()
 
-/datum/species/proc/check_weakness(obj/item/weapon, mob/living/attacker)
+/datum/species/proc/check_weakness(obj/item, mob/living/attacker)
 	return 0
 
 ////////
@@ -1100,6 +1100,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 	////////
 
 /datum/species/proc/handle_digestion(mob/living/carbon/human/H)
+
 	//The fucking DISABILITY_FAT mutation is the dumbest shit ever. It makes the code so difficult to work with
 	if(H.has_disability(DISABILITY_FAT))//I share your pain, past coder.
 		if(H.overeatduration < 100)
@@ -1477,7 +1478,6 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 
 	var/weakness = H.check_weakness(I, user)
 	apply_damage(I.force * weakness, I.damtype, def_zone, armor_block, H)
-	H.damage_clothes(I.force, I.damtype, "melee", affecting.body_zone)
 
 	H.send_item_attack_message(I, user, hit_area)
 

code/modules/mob/living/carbon/human/species_types/angel.dm

@@ -136,4 +136,4 @@
 		H.movement_type &= ~FLYING
 		override_float = FALSE
 		H.pass_flags &= ~PASSTABLE
-		H.CloseWings()
+		H.CloseWings()

code/modules/mob/living/carbon/human/species_types/corporate.dm

@@ -16,4 +16,4 @@
 	blacklisted = 1
 	use_skintones = 0
 	species_traits = list(SPECIES_ORGANIC,RADIMMUNE,VIRUSIMMUNE,NOBLOOD,PIERCEIMMUNE,EYECOLOR,NODISMEMBER,NOHUNGER)
-	sexes = 0
+	sexes = 0

code/modules/mob/living/carbon/human/species_types/golems.dm

@@ -595,6 +595,7 @@
 		H.adjustFireLoss(-4)
 		H.reagents.remove_reagent(chem.id, REAGENTS_METABOLISM)
 
+
 /datum/species/golem/clockwork
 	name = "Clockwork Golem"
 	id = "clockwork golem"
@@ -647,6 +648,7 @@
 	dangerous_existence = TRUE
 	random_eligible = FALSE
 
+
 /datum/species/golem/cloth
 	name = "Cloth Golem"
 	id = "cloth golem"

code/modules/mob/living/carbon/human/species_types/shadowpeople.dm

@@ -182,7 +182,9 @@
 		var/mob/living/L = AM
 		if(iscyborg(AM))
 			var/mob/living/silicon/robot/borg = AM
-			borg.update_headlamp(TRUE, 100)
+			if(!borg.lamp_cooldown)
+				borg.update_headlamp(TRUE, INFINITY)
+				to_chat(borg, "<span class='danger'>Your headlamp is fried! You'll need a human to help replace it.</span>")
 		else
 			for(var/obj/item/O in AM)
 				if(O.light_range && O.light_power)

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

@@ -11,12 +11,12 @@
 	amount = dna.species.spec_stun(src,amount)
 	return ..()
 
-/mob/living/carbon/human/cure_husk()
+/mob/living/carbon/human/cure_husk(list/sources)
 	. = ..()
 	if(.)
 		update_hair()
 
-/mob/living/carbon/human/become_husk()
+/mob/living/carbon/human/become_husk(source)
 	if(istype(dna.species, /datum/species/skeleton)) //skeletons shouldn't be husks.
 		cure_husk()
 		return

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

@@ -1,142 +1,142 @@
-/mob/living/carbon/get_item_by_slot(slot_id)
-	switch(slot_id)
-		if(slot_back)
-			return back
-		if(slot_wear_mask)
-			return wear_mask
-		if(slot_neck)
-			return wear_neck
-		if(slot_head)
-			return head
-		if(slot_handcuffed)
-			return handcuffed
-		if(slot_legcuffed)
-			return legcuffed
-	return null
-
-/mob/living/carbon/proc/equip_in_one_of_slots(obj/item/I, list/slots, qdel_on_fail = 1)
-	for(var/slot in slots)
-		if(equip_to_slot_if_possible(I, slots[slot], qdel_on_fail = 0, disable_warning = TRUE))
-			return slot
-	if(qdel_on_fail)
-		qdel(I)
-	return null
-
-//This is an UNSAFE proc. Use mob_can_equip() before calling this one! Or rather use equip_to_slot_if_possible() or advanced_equip_to_slot_if_possible()
-/mob/living/carbon/equip_to_slot(obj/item/I, slot)
-	if(!slot)
-		return
-	if(!istype(I))
-		return
-
-	var/index = get_held_index_of_item(I)
-	if(index)
-		held_items[index] = null
-
-	if(I.pulledby)
-		I.pulledby.stop_pulling()
-
-	I.screen_loc = null
-	if(client)
-		client.screen -= I
-	if(observers && observers.len)
-		for(var/M in observers)
-			var/mob/dead/observe = M
-			if(observe.client)
-				observe.client.screen -= I
+/mob/living/carbon/get_item_by_slot(slot_id)
+	switch(slot_id)
+		if(slot_back)
+			return back
+		if(slot_wear_mask)
+			return wear_mask
+		if(slot_neck)
+			return wear_neck
+		if(slot_head)
+			return head
+		if(slot_handcuffed)
+			return handcuffed
+		if(slot_legcuffed)
+			return legcuffed
+	return null
+
+/mob/living/carbon/proc/equip_in_one_of_slots(obj/item/I, list/slots, qdel_on_fail = 1)
+	for(var/slot in slots)
+		if(equip_to_slot_if_possible(I, slots[slot], qdel_on_fail = 0, disable_warning = TRUE))
+			return slot
+	if(qdel_on_fail)
+		qdel(I)
+	return null
+
+//This is an UNSAFE proc. Use mob_can_equip() before calling this one! Or rather use equip_to_slot_if_possible() or advanced_equip_to_slot_if_possible()
+/mob/living/carbon/equip_to_slot(obj/item/I, slot)
+	if(!slot)
+		return
+	if(!istype(I))
+		return
+
+	var/index = get_held_index_of_item(I)
+	if(index)
+		held_items[index] = null
+
+	if(I.pulledby)
+		I.pulledby.stop_pulling()
+
+	I.screen_loc = null
+	if(client)
+		client.screen -= I
+	if(observers && observers.len)
+		for(var/M in observers)
+			var/mob/dead/observe = M
+			if(observe.client)
+				observe.client.screen -= I
 	I.forceMove(src)
-	I.layer = ABOVE_HUD_LAYER
-	I.plane = ABOVE_HUD_PLANE
-	I.appearance_flags |= NO_CLIENT_COLOR
-	var/not_handled = FALSE
-	switch(slot)
-		if(slot_back)
-			back = I
-			update_inv_back()
-		if(slot_wear_mask)
-			wear_mask = I
-			wear_mask_update(I, toggle_off = 0)
-		if(slot_head)
-			head = I
-			head_update(I)
-		if(slot_neck)
-			wear_neck = I
-			update_inv_neck(I)
-		if(slot_handcuffed)
-			handcuffed = I
-			update_handcuffed()
-		if(slot_legcuffed)
-			legcuffed = I
-			update_inv_legcuffed()
-		if(slot_hands)
-			put_in_hands(I)
-			update_inv_hands()
-		if(slot_in_backpack)
-			var/obj/item/storage/B = back
-			var/prev_jimmies = B.rustle_jimmies
-			B.rustle_jimmies = FALSE //don't conspicously rustle
-			B.handle_item_insertion(I, 1, src)
-			B.rustle_jimmies = prev_jimmies
-		else
-			not_handled = TRUE
-
-	//Item has been handled at this point and equipped callback can be safely called
-	//We cannot call it for items that have not been handled as they are not yet correctly
-	//in a slot (handled further down inheritance chain, probably living/carbon/human/equip_to_slot
-	if(!not_handled)
-		I.equipped(src, slot)
-
-	return not_handled
-
-/mob/living/carbon/doUnEquip(obj/item/I)
-	. = ..() //Sets the default return value to what the parent returns.
-	if(!. || !I) //We don't want to set anything to null if the parent returned 0.
-		return
-
-	if(I == head)
-		head = null
+	I.layer = ABOVE_HUD_LAYER
+	I.plane = ABOVE_HUD_PLANE
+	I.appearance_flags |= NO_CLIENT_COLOR
+	var/not_handled = FALSE
+	switch(slot)
+		if(slot_back)
+			back = I
+			update_inv_back()
+		if(slot_wear_mask)
+			wear_mask = I
+			wear_mask_update(I, toggle_off = 0)
+		if(slot_head)
+			head = I
+			head_update(I)
+		if(slot_neck)
+			wear_neck = I
+			update_inv_neck(I)
+		if(slot_handcuffed)
+			handcuffed = I
+			update_handcuffed()
+		if(slot_legcuffed)
+			legcuffed = I
+			update_inv_legcuffed()
+		if(slot_hands)
+			put_in_hands(I)
+			update_inv_hands()
+		if(slot_in_backpack)
+			var/obj/item/storage/B = back
+			var/prev_jimmies = B.rustle_jimmies
+			B.rustle_jimmies = FALSE //don't conspicously rustle
+			B.handle_item_insertion(I, 1, src)
+			B.rustle_jimmies = prev_jimmies
+		else
+			not_handled = TRUE
+
+	//Item has been handled at this point and equipped callback can be safely called
+	//We cannot call it for items that have not been handled as they are not yet correctly
+	//in a slot (handled further down inheritance chain, probably living/carbon/human/equip_to_slot
+	if(!not_handled)
+		I.equipped(src, slot)
+
+	return not_handled
+
+/mob/living/carbon/doUnEquip(obj/item/I)
+	. = ..() //Sets the default return value to what the parent returns.
+	if(!. || !I) //We don't want to set anything to null if the parent returned 0.
+		return
+
+	if(I == head)
+		head = null
 		if(!QDELETED(src))
 			head_update(I)
-	else if(I == back)
-		back = null
+	else if(I == back)
+		back = null
 		if(!QDELETED(src))
 			update_inv_back()
-	else if(I == wear_mask)
-		wear_mask = null
+	else if(I == wear_mask)
+		wear_mask = null
 		if(!QDELETED(src))
 			wear_mask_update(I, toggle_off = 1)
-	if(I == wear_neck)
-		wear_neck = null
+	if(I == wear_neck)
+		wear_neck = null
 		if(!QDELETED(src))
 			update_inv_neck(I)
-	else if(I == handcuffed)
-		handcuffed = null
-		if(buckled && buckled.buckle_requires_restraints)
-			buckled.unbuckle_mob(src)
+	else if(I == handcuffed)
+		handcuffed = null
+		if(buckled && buckled.buckle_requires_restraints)
+			buckled.unbuckle_mob(src)
 		if(!QDELETED(src))
 			update_handcuffed()
-	else if(I == legcuffed)
-		legcuffed = null
+	else if(I == legcuffed)
+		legcuffed = null
 		if(!QDELETED(src))
 			update_inv_legcuffed()
-
-//handle stuff to update when a mob equips/unequips a mask.
-/mob/living/proc/wear_mask_update(obj/item/clothing/C, toggle_off = 1)
-	update_inv_wear_mask()
-
-/mob/living/carbon/wear_mask_update(obj/item/clothing/C, toggle_off = 1)
-	if(C.tint || initial(C.tint))
-		update_tint()
-	update_inv_wear_mask()
-
-//handle stuff to update when a mob equips/unequips a headgear.
-/mob/living/carbon/proc/head_update(obj/item/I, forced)
-	if(istype(I, /obj/item/clothing))
-		var/obj/item/clothing/C = I
-		if(C.tint || initial(C.tint))
-			update_tint()
-		update_sight()
-	if(I.flags_inv & HIDEMASK || forced)
-		update_inv_wear_mask()
-	update_inv_head()
-
+
+//handle stuff to update when a mob equips/unequips a mask.
+/mob/living/proc/wear_mask_update(obj/item/clothing/C, toggle_off = 1)
+	update_inv_wear_mask()
+
+/mob/living/carbon/wear_mask_update(obj/item/clothing/C, toggle_off = 1)
+	if(C.tint || initial(C.tint))
+		update_tint()
+	update_inv_wear_mask()
+
+//handle stuff to update when a mob equips/unequips a headgear.
+/mob/living/carbon/proc/head_update(obj/item/I, forced)
+	if(istype(I, /obj/item/clothing))
+		var/obj/item/clothing/C = I
+		if(C.tint || initial(C.tint))
+			update_tint()
+		update_sight()
+	if(I.flags_inv & HIDEMASK || forced)
+		update_inv_wear_mask()
+	update_inv_head()
+

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

@@ -460,4 +460,4 @@
 		death()
 		var/obj/item/organ/brain/B = getorganslot(ORGAN_SLOT_BRAIN)
 		if(B)
-			B.damaged_brain = TRUE
+			B.damaged_brain = TRUE

code/modules/mob/living/carbon/monkey/combat.dm

@@ -77,7 +77,7 @@
 		return FALSE
 
 	// WEAPONS
-	if(istype(I, /obj/item/weapon))
+	if(istype(I, /obj/item))
 		var/obj/item/W = I
 		if(W.force >= best_force)
 			put_in_hands(W)
@@ -153,7 +153,7 @@
 		return TRUE
 
 	// have we been disarmed
-	if(!locate(/obj/item/weapon) in held_items)
+	if(!locate(/obj/item) in held_items)
 		best_force = 0
 
 	if(restrained() || blacklistItems[pickupTarget] || (pickupTarget && (pickupTarget.flags_1 & NODROP_1)))
@@ -391,7 +391,7 @@
 
 // attack using a held weapon otherwise bite the enemy, then if we are angry there is a chance we might calm down a little
 /mob/living/carbon/monkey/proc/monkey_attack(mob/living/L)
-	var/obj/item/Weapon = locate(/obj/item/weapon) in held_items
+	var/obj/item/Weapon = locate(/obj/item) in held_items
 
 	// attack with weapon if we have one
 	if(Weapon)

code/modules/mob/living/carbon/monkey/life.dm

@@ -133,7 +133,6 @@
 
 /mob/living/carbon/monkey/has_smoke_protection()
 	if(wear_mask)
-
 		if(wear_mask.flags_1 & BLOCK_GAS_SMOKE_EFFECT_1)
 			return 1
 

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

@@ -11,10 +11,10 @@
 	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/monkey = 5, /obj/item/stack/sheet/animalhide/monkey = 1)
 	type_of_meat = /obj/item/reagent_containers/food/snacks/meat/slab/monkey
 	gib_type = /obj/effect/decal/cleanable/blood/gibs
-	unique_name = 1
+	unique_name = TRUE
 	bodyparts = list(/obj/item/bodypart/chest/monkey, /obj/item/bodypart/head/monkey, /obj/item/bodypart/l_arm/monkey,
 					 /obj/item/bodypart/r_arm/monkey, /obj/item/bodypart/r_leg/monkey, /obj/item/bodypart/l_leg/monkey)
-	devourable = TRUE
+
 
 
 /mob/living/carbon/monkey/Initialize()
@@ -62,7 +62,7 @@
 
 	if (bodytemperature < 283.222)
 		. += (283.222 - bodytemperature) / 10 * 1.75
-		
+
 	var/static/config_monkey_delay
 	if(isnull(config_monkey_delay))
 		config_monkey_delay = CONFIG_GET(number/monkey_delay)
@@ -89,13 +89,15 @@
 
 
 /mob/living/carbon/monkey/IsAdvancedToolUser()//Unless its monkey mode monkeys cant use advanced tools
-	return 0
+	if(mind && is_monkey(mind))
+		return TRUE
+	return FALSE
 
 /mob/living/carbon/monkey/reagent_check(datum/reagent/R) //can metabolize all reagents
-	return 0
+	return FALSE
 
 /mob/living/carbon/monkey/canBeHandcuffed()
-	return 1
+	return TRUE
 
 /mob/living/carbon/monkey/assess_threat(judgement_criteria, lasercolor = "", datum/callback/weaponcheck=null)
 	if(judgement_criteria & JUDGE_EMAGGED)

code/modules/mob/living/carbon/monkey/monkey_defense.dm

@@ -16,9 +16,6 @@
 		if(stat != DEAD)
 			var/dmg = rand(1, 5)
 			apply_damage(dmg, BRUTE, affecting)
-			damage_clothes(dmg, BRUTE, "melee", affecting.body_zone)
-
-
 
 /mob/living/carbon/monkey/attack_larva(mob/living/carbon/alien/larva/L)
 	if(..()) //successful larva bite.
@@ -29,7 +26,6 @@
 			if(!affecting)
 				affecting = get_bodypart("chest")
 			apply_damage(damage, BRUTE, affecting)
-			damage_clothes(damage, BRUTE, "melee", affecting.body_zone)
 
 /mob/living/carbon/monkey/attack_hand(mob/living/carbon/human/M)
 	if(..())	//To allow surgery to return properly.
@@ -58,7 +54,6 @@
 				if(!affecting)
 					affecting = get_bodypart("chest")
 				apply_damage(damage, BRUTE, affecting)
-				damage_clothes(damage, BRUTE, "melee", affecting.body_zone)
 				add_logs(M, src, "attacked")
 
 			else
@@ -101,7 +96,6 @@
 				if(!dismembering_strike(M, affecting.body_zone)) //Dismemberment successful
 					return 1
 				apply_damage(damage, BRUTE, affecting)
-				damage_clothes(damage, BRUTE, "melee", affecting.body_zone)
 
 			else
 				playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
@@ -136,9 +130,6 @@
 		if(!affecting)
 			affecting = get_bodypart("chest")
 		apply_damage(damage, M.melee_damage_type, affecting)
-		damage_clothes(damage, M.melee_damage_type, "melee", affecting.body_zone)
-
-
 
 /mob/living/carbon/monkey/attack_slime(mob/living/simple_animal/slime/M)
 	if(..()) //successful slime attack
@@ -152,21 +143,19 @@
 		if(!affecting)
 			affecting = get_bodypart("chest")
 		apply_damage(damage, BRUTE, affecting)
-		damage_clothes(damage, BRUTE, "melee", affecting.body_zone)
-
 
 /mob/living/carbon/monkey/acid_act(acidpwr, acid_volume, bodyzone_hit)
 	. = 1
 	if(!bodyzone_hit || bodyzone_hit == "head")
 		if(wear_mask)
 			if(!(wear_mask.resistance_flags & UNACIDABLE))
-				wear_mask.acid_act(acidpwr)
+				wear_mask.acid_act(acidpwr, acid_volume)
 			else
 				to_chat(src, "<span class='warning'>Your mask protects you from the acid.</span>")
 			return
 		if(head)
 			if(!(head.resistance_flags & UNACIDABLE))
-				head.acid_act(acidpwr)
+				head.acid_act(acidpwr, acid_volume)
 			else
 				to_chat(src, "<span class='warning'>Your hat protects you from the acid.</span>")
 			return

code/modules/mob/living/carbon/monkey/punpun.dm

@@ -74,4 +74,4 @@
 		file_data["relic_hat"] = head ? head.type : null
 		file_data["relic_mask"] = wear_mask ? wear_mask.type : null
 	fdel(json_file)
-	WRITE_FILE(json_file, json_encode(file_data))
+	WRITE_FILE(json_file, json_encode(file_data))

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

@@ -36,7 +36,7 @@
 	if(T)
 		. = T.could_speak_in_language(dt)
 	else
-		. = initial(dt.flags_1) & TONGUELESS_SPEECH
+		. = initial(dt.flags) & TONGUELESS_SPEECH
 
 /mob/living/carbon/Hear(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode)
 	if(!client)
@@ -44,4 +44,4 @@
 	for(var/T in get_traumas())
 		var/datum/brain_trauma/trauma = T
 		message = trauma.on_hear(message, speaker, message_language, raw_message, radio_freq)
-	return ..()
+	return ..()

code/modules/mob/living/emote.dm

@@ -1,18 +1,3 @@
-//The code execution of the emote datum is located at code/datums/emotes.dm
-/mob/living/emote(act, m_type = null, message = null)
-	act = lowertext(act)
-	var/param = message
-	var/custom_param = findchar(act, " ")
-	if(custom_param)
-		param = copytext(act, custom_param + 1, length(act) + 1)
-		act = copytext(act, 1, custom_param)
-
-	var/datum/emote/E
-	E = E.emote_list[act]
-	if(!E)
-		to_chat(src, "<span class='notice'>Unusable emote '[act]'. Say *help for a list.</span>")
-		return
-	E.run_emote(src, param, m_type)
 
 /* EMOTE DATUMS */
 /datum/emote/living
@@ -143,16 +128,6 @@
 	restraint_check = TRUE
 	wing_time = 10
 
-/datum/emote/living/flip
-	key = "flip"
-	key_third_person = "flips"
-	restraint_check = TRUE
-
-/datum/emote/living/flip/run_emote(mob/user, params)
-	. = ..()
-	if(.)
-		user.SpinAnimation(7,1)
-
 /datum/emote/living/frown
 	key = "frown"
 	key_third_person = "frowns"
@@ -483,25 +458,6 @@
 	message_param = "beeps at %t."
 	sound = 'sound/machines/twobeep.ogg'
 
-/datum/emote/living/spin
-	key = "spin"
-	key_third_person = "spins"
-	restraint_check = TRUE
-
-/datum/emote/living/spin/run_emote(mob/user)
-	. = ..()
-	if(.)
-		user.spin(20, 1)
-		if(iscyborg(user) && user.has_buckled_mobs())
-			var/mob/living/silicon/robot/R = user
-			GET_COMPONENT_FROM(riding_datum, /datum/component/riding, R)
-			if(riding_datum)
-				for(var/mob/M in R.buckled_mobs)
-					riding_datum.force_dismount(M)
-			else
-				R.unbuckle_all_mobs()
-
-
 /datum/emote/living/circle
 	key = "circle"
 	key_third_person = "circles"

code/modules/mob/living/living.dm

@@ -413,7 +413,6 @@
 	cure_nearsighted()
 	cure_blind()
 	cure_husk()
-	disabilities = 0
 	hallucination = 0
 	heal_overall_damage(100000, 100000, 0, 0, 1) //heal brute and burn dmg on both organic and robotic limbs, and update health right away.
 	ExtinguishMob()
@@ -745,15 +744,6 @@
 		var/obj_temp = oloc.return_temperature()
 		if(obj_temp != null)
 			loc_temp = obj_temp
-/*	if(ismob(loc))
-		var/mob/living/mloc = loc
-		var/mob_temp = mloc.return_temperature()
-		if(mloc == DEAD)
-			loc_temp = get_turf(loc) //wew
-		else
-			loc_temp = mob_temp
-*/
-//just gunna ommit this for now, it's on the 'to figgur out' list.
 	else if(isspaceturf(get_turf(src)))
 		var/turf/heat_turf = get_turf(src)
 		loc_temp = heat_turf.temperature
@@ -989,7 +979,6 @@
 			stop_pulling()
 	else if(has_legs || ignore_legs)
 		lying = 0
-
 	if(buckled)
 		lying = 90*buckle_lying
 	else if(!lying)

code/modules/mob/living/living_defines.dm

@@ -26,6 +26,8 @@
 	var/incorporeal_move = FALSE //FALSE is off, INCORPOREAL_MOVE_BASIC is normal, INCORPOREAL_MOVE_SHADOW is for ninjas
 								 //and INCORPOREAL_MOVE_JAUNT is blocked by holy water/salt
 
+	var/list/disabilities = list()
+
 	var/list/surgeries = list()	//a list of surgery datums. generally empty, they're added when the player wants them.
 
 	var/now_pushing = null //used by living/Collide() and living/PushAM() to prevent potential infinite loop.

code/modules/mob/living/logout.dm

@@ -4,4 +4,4 @@
 		ranged_ability.remove_mousepointer(client)
 	..()
 	if(!key && mind)	//key and mind have become separated.
-		mind.active = 0	//This is to stop say, a mind.transfer_to call on a corpse causing a ghost to re-enter its body.
+		mind.active = 0	//This is to stop say, a mind.transfer_to call on a corpse causing a ghost to re-enter its body.

code/modules/mob/living/say.dm

@@ -284,11 +284,6 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 
 	return 1
 
-/mob/living/proc/check_emote(message)
-	if(copytext(message, 1, 2) == "*")
-		emote(copytext(message, 2))
-		return 1
-
 /mob/living/proc/get_message_mode(message)
 	var/key = copytext(message, 1, 2)
 	if(key == "#")

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

@@ -1,26 +1,26 @@
-/mob/living/silicon/ai/examine(mob/user)
+/mob/living/silicon/ai/examine(mob/user)
 	var/msg = "<span class='info'>*---------*\nThis is [icon2html(src, user)] <EM>[src]</EM>!\n"
-	if (stat == DEAD)
-		msg += "<span class='deadsay'>It appears to be powered-down.</span>\n"
-	else
-		msg += "<span class='warning'>"
-		if (getBruteLoss())
-			if (getBruteLoss() < 30)
-				msg += "It looks slightly dented.\n"
-			else
-				msg += "<B>It looks severely dented!</B>\n"
-		if (getFireLoss())
-			if (getFireLoss() < 30)
-				msg += "It looks slightly charred.\n"
-			else
-				msg += "<B>Its casing is melted and heat-warped!</B>\n"
-		msg += "</span>"
-		if(deployed_shell)
-			msg += "The wireless networking light is blinking.\n"
-		else if (!shunted && !client)
-			msg += "[src]Core.exe has stopped responding! NTOS is searching for a solution to the problem...\n"
-	msg += "*---------*</span>"
-
-	to_chat(user, msg)
-
+	if (stat == DEAD)
+		msg += "<span class='deadsay'>It appears to be powered-down.</span>\n"
+	else
+		msg += "<span class='warning'>"
+		if (getBruteLoss())
+			if (getBruteLoss() < 30)
+				msg += "It looks slightly dented.\n"
+			else
+				msg += "<B>It looks severely dented!</B>\n"
+		if (getFireLoss())
+			if (getFireLoss() < 30)
+				msg += "It looks slightly charred.\n"
+			else
+				msg += "<B>Its casing is melted and heat-warped!</B>\n"
+		msg += "</span>"
+		if(deployed_shell)
+			msg += "The wireless networking light is blinking.\n"
+		else if (!shunted && !client)
+			msg += "[src]Core.exe has stopped responding! NTOS is searching for a solution to the problem...\n"
+	msg += "*---------*</span>"
+
+	to_chat(user, msg)
+
 	..()

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

@@ -173,4 +173,4 @@
 		obscured += t.obscured
 
 #undef UPDATE_BUFFER
-#undef CHUNK_SIZE
+#undef CHUNK_SIZE

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

@@ -16,7 +16,6 @@
 // It will also stream the chunk that the new loc is in.
 
 /mob/camera/aiEye/proc/setLoc(T)
-
 	if(ai)
 		if(!isturf(ai.loc))
 			return
@@ -34,6 +33,8 @@
 		if(istype(ai.current, /obj/machinery/holopad))
 			var/obj/machinery/holopad/H = ai.current
 			H.move_hologram(ai, T)
+		if(ai.camera_light_on)
+			ai.light_cameras()
 
 /mob/camera/aiEye/Move()
 	return 0
@@ -85,11 +86,6 @@
 	if(!user.tracking)
 		user.cameraFollow = null
 
-	//user.unset_machine() //Uncomment this if it causes problems.
-	//user.lightNearbyCamera()
-	if(user.camera_light_on)
-		user.light_cameras()
-
 // Return to the Core.
 /mob/living/silicon/ai/proc/view_core()
 

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

@@ -1,13 +1,13 @@
-/mob/living/silicon/spawn_gibs()
+/mob/living/silicon/spawn_gibs()
 	new /obj/effect/gibspawner/robot(get_turf(src))
-
-/mob/living/silicon/spawn_dust()
-	new /obj/effect/decal/remains/robot(loc)
-
-/mob/living/silicon/death(gibbed)
-	if(!gibbed)
-		emote("deathgasp")
-	diag_hud_set_status()
-	diag_hud_set_health()
-	update_health_hud()
+
+/mob/living/silicon/spawn_dust()
+	new /obj/effect/decal/remains/robot(loc)
+
+/mob/living/silicon/death(gibbed)
+	if(!gibbed)
+		emote("deathgasp")
+	diag_hud_set_status()
+	diag_hud_set_health()
+	update_health_hud()
 	. = ..()

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

@@ -52,7 +52,7 @@
 	var/obj/machinery/door/hackdoor		// The airlock being hacked
 	var/hackprogress = 0				// Possible values: 0 - 100, >= 100 means the hack is complete and will be reset upon next check
 
-	var/obj/item/radio/integrated/signal/sradio // AI's signaller
+	var/obj/item/integrated_signaler/signaler // AI's signaller
 
 	var/holoform = FALSE
 	var/canholo = TRUE
@@ -105,7 +105,7 @@
 		P.setPersonality(src)
 	forceMove(P)
 	card = P
-	sradio = new(src)
+	signaler = new(src)
 	if(!radio)
 		radio = new /obj/item/device/radio(src)
 

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

@@ -169,23 +169,20 @@
 		if("signaller")
 
 			if(href_list["send"])
-
-				sradio.send_signal("ACTIVATE")
+				signaler.send_activation()
 				audible_message("[icon2html(src, world)] *beep* *beep*")
 
 			if(href_list["freq"])
-
-				var/new_frequency = (sradio.frequency + text2num(href_list["freq"]))
-				if(new_frequency < 1200 || new_frequency > 1600)
+				var/new_frequency = (signaler.frequency + text2num(href_list["freq"]))
+				if(new_frequency < MIN_FREE_FREQ || new_frequency > MAX_FREE_FREQ)
 					new_frequency = sanitize_frequency(new_frequency)
-				sradio.set_frequency(new_frequency)
+				signaler.set_frequency(new_frequency)
 
 			if(href_list["code"])
-
-				sradio.code += text2num(href_list["code"])
-				sradio.code = round(sradio.code)
-				sradio.code = min(100, sradio.code)
-				sradio.code = max(1, sradio.code)
+				signaler.code += text2num(href_list["code"])
+				signaler.code = round(signaler.code)
+				signaler.code = min(100, signaler.code)
+				signaler.code = max(1, signaler.code)
 
 
 
@@ -397,14 +394,14 @@
 	Frequency:
 	<A href='byond://?src=[REF(src)];software=signaller;freq=-10;'>-</A>
 	<A href='byond://?src=[REF(src)];software=signaller;freq=-2'>-</A>
-	[format_frequency(sradio.frequency)]
+	[format_frequency(signaler.frequency)]
 	<A href='byond://?src=[REF(src)];software=signaller;freq=2'>+</A>
 	<A href='byond://?src=[REF(src)];software=signaller;freq=10'>+</A><BR>
 
 	Code:
 	<A href='byond://?src=[REF(src)];software=signaller;code=-5'>-</A>
 	<A href='byond://?src=[REF(src)];software=signaller;code=-1'>-</A>
-	[sradio.code]
+	[signaler.code]
 	<A href='byond://?src=[REF(src)];software=signaller;code=1'>+</A>
 	<A href='byond://?src=[REF(src)];software=signaller;code=5'>+</A><BR>
 

code/modules/mob/living/silicon/robot/login.dm

@@ -1,3 +1,4 @@
+
 /mob/living/silicon/robot/Login()
 	..()
 	regenerate_icons()

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

@@ -5,8 +5,6 @@
 	icon_state = "robot"
 	maxHealth = 100
 	health = 100
-	macro_default = "robot-default"
-	macro_hotkeys = "robot-hotkeys"
 	bubble_icon = "robot"
 	designation = "Default" //used for displaying the prefix & getting the current module of cyborg
 	has_limbs = 1
@@ -247,17 +245,6 @@
 		return //won't work if dead
 	robot_alerts()
 
-//for borg hotkeys, here module refers to borg inv slot, not core module
-/mob/living/silicon/robot/verb/cmd_toggle_module(module as num)
-	set name = "Toggle Module"
-	set hidden = 1
-	toggle_module(module)
-
-/mob/living/silicon/robot/verb/cmd_unequip_module()
-	set name = "Unequip Module"
-	set hidden = 1
-	uneq_active()
-
 /mob/living/silicon/robot/proc/robot_alerts()
 	var/dat = ""
 	for (var/cat in alarms)
@@ -536,6 +523,19 @@
 			toner = tonermax
 			qdel(W)
 			to_chat(user, "<span class='notice'>You fill the toner level of [src] to its max capacity.</span>")
+
+	else if(istype(W, /obj/item/device/flashlight))
+		if(!opened)
+			to_chat(user, "<span class='warning'>You need to open the panel to repair the headlamp!</span>")
+		if(lamp_cooldown <= world.time)
+			to_chat(user, "<span class='warning'>The headlamp is already functional!</span>")
+		else
+			if(!user.temporarilyRemoveItemFromInventory(W))
+				to_chat(user, "<span class='warning'>[W] seems to be stuck to your hand. You'll have to find a different light.</span>")
+				return
+			lamp_cooldown = 0
+			qdel(W)
+			to_chat(user, "<span class='notice'>You replace the headlamp bulbs.</span>")
 	else
 		return ..()
 
@@ -812,6 +812,9 @@
 /mob/living/silicon/robot/modules/security
 	set_module = /obj/item/robot_module/security
 
+/mob/living/silicon/robot/modules/clown
+	set_module = /obj/item/robot_module/clown
+
 /mob/living/silicon/robot/modules/peacekeeper
 	set_module = /obj/item/robot_module/peacekeeper
 
@@ -829,7 +832,7 @@
 	lawupdate = FALSE
 	scrambledcodes = TRUE // These are rogue borgs.
 	ionpulse = TRUE
-	var/playstyle_string = "<span class='userdanger'>You are a Syndicate assault cyborg!</span><br>\
+	var/playstyle_string = "<span class='big bold'>You are a Syndicate assault cyborg!</span><br>\
 							<b>You are armed with powerful offensive tools to aid you in your mission: help the operatives secure the nuclear authentication disk. \
 							Your cyborg LMG will slowly produce ammunition from your power supply, and your operative pinpointer will find and locate fellow nuclear operatives. \
 							<i>Help the operatives secure the disk at all costs!</i></b>"
@@ -851,7 +854,7 @@
 
 /mob/living/silicon/robot/modules/syndicate/medical
 	icon_state = "syndi-medi"
-	playstyle_string = "<span class='userdanger'>You are a Syndicate medical cyborg!</span><br>\
+	playstyle_string = "<span class='big bold'>You are a Syndicate medical cyborg!</span><br>\
 						<b>You are armed with powerful medical tools to aid you in your mission: help the operatives secure the nuclear authentication disk. \
 						Your hypospray will produce Restorative Nanites, a wonder-drug that will heal most types of bodily damages, including clone and brain damage. It also produces morphine for offense. \
 						Your defibrillator paddles can revive operatives through their hardsuits, or can be used on harm intent to shock enemies! \
@@ -1015,9 +1018,9 @@
 		status_flags &= ~CANPUSH
 
 	if(module.clean_on_move)
-		flags_1 |= CLEAN_ON_MOVE_1
+		AddComponent(/datum/component/cleaning)
 	else
-		flags_1 &= ~CLEAN_ON_MOVE_1
+		qdel(GetComponent(/datum/component/cleaning))
 
 	hat_offset = module.hat_offset
 

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -33,8 +33,8 @@
 	var/ride_allow_incapacitated = FALSE
 	var/allow_riding = TRUE
 
-/obj/item/robot_module/New()
-	..()
+/obj/item/robot_module/Initialize()
+	. = ..()
 	for(var/i in basic_modules)
 		var/obj/item/I = new i(src)
 		basic_modules += I
@@ -336,17 +336,6 @@
 	can_be_pushed = FALSE
 	hat_offset = 3
 
-/obj/item/robot_module/security/respawn_consumable(mob/living/silicon/robot/R, coeff = 1)
-	..()
-	var/obj/item/gun/energy/e_gun/advtaser/cyborg/T = locate(/obj/item/gun/energy/e_gun/advtaser/cyborg) in basic_modules
-	if(T)
-		if(T.cell.charge < T.cell.maxcharge)
-			var/obj/item/ammo_casing/energy/S = T.ammo_type[T.select]
-			T.cell.give(S.e_cost * coeff)
-			T.update_icon()
-		else
-			T.charge_tick = 0
-
 /obj/item/robot_module/security/do_transform_animation()
 	..()
 	to_chat(loc, "<span class='userdanger'>While you have picked the security module, you still have to follow your laws, NOT Space Law. \
@@ -435,6 +424,37 @@
 	if(CL)
 		CL.reagents.add_reagent("lube", 2 * coeff)
 
+/obj/item/robot_module/clown
+	name = "Clown"
+	basic_modules = list(
+		/obj/item/device/assembly/flash/cyborg,
+		/obj/item/toy/crayon/rainbow,
+		/obj/item/device/instrument/bikehorn,
+		/obj/item/stamp/clown,
+		/obj/item/bikehorn,
+		/obj/item/bikehorn/airhorn,
+		/obj/item/paint/anycolor,
+		/obj/item/soap/nanotrasen,
+		/obj/item/pneumatic_cannon/pie/selfcharge/cyborg,
+		/obj/item/razor,					//killbait material
+		/obj/item/lipstick/purple,
+		/obj/item/reagent_containers/spray/waterflower/cyborg,
+		/obj/item/borg/cyborghug/peacekeeper,
+		/obj/item/borg/lollipop/clown,
+		/obj/item/picket_sign/cyborg,
+		/obj/item/reagent_containers/borghypo/clown,
+		/obj/item/extinguisher/mini)
+	emag_modules = list(
+		/obj/item/reagent_containers/borghypo/clown/hacked,
+		/obj/item/reagent_containers/spray/waterflower/cyborg/hacked)
+	ratvar_modules = list(
+		/obj/item/clockwork/slab/cyborg,
+		/obj/item/clockwork/weapon/ratvarian_spear,
+		/obj/item/clockwork/replica_fabricator/cyborg)
+	moduleselect_icon = "service"
+	cyborg_base_icon = "clown"
+	hat_offset = -2
+
 /obj/item/robot_module/butler
 	name = "Service"
 	basic_modules = list(

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

@@ -72,7 +72,7 @@
 	var/nearest_beacon			// the nearest beacon's tag
 	var/turf/nearest_beacon_loc	// the nearest beacon's location
 
-	var/beacon_freq = 1445		// navigation beacon frequency
+	var/beacon_freq = FREQ_NAV_BEACON
 	var/model = "" //The type of bot it is.
 	var/bot_type = 0 //The type of bot it is, for radio control.
 	var/data_hud_type = DATA_HUD_DIAGNOSTIC_BASIC //The type of data HUD the bot uses. Diagnostic by default.
@@ -108,6 +108,7 @@
 	if(stat)
 		return FALSE
 	on = TRUE
+	canmove = TRUE
 	set_light(initial(light_range))
 	update_icon()
 	diag_hud_set_botstat()
@@ -115,6 +116,7 @@
 
 /mob/living/simple_animal/bot/proc/turn_off()
 	on = FALSE
+	canmove = FALSE
 	set_light(0)
 	bot_reset() //Resets an AI's call, should it exist.
 	update_icon()
@@ -129,7 +131,7 @@
 	Radio = new/obj/item/device/radio(src)
 	if(radio_key)
 		Radio.keyslot = new radio_key
-	Radio.subspace_transmission = 1
+	Radio.subspace_transmission = TRUE
 	Radio.canhear_range = 0 // anything greater will have the bot broadcast the channel as if it were saying it out loud.
 	Radio.recalculateChannels()
 

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

@@ -125,7 +125,7 @@
 
 	if(!target) //Search for decals then.
 		target = scan(/obj/effect/decal/cleanable)
-	
+
 	if(!target) //Checks for remains
 		target = scan(/obj/effect/decal/remains)
 
@@ -242,7 +242,7 @@
 			say(phrase)
 			victim.emote("scream")
 			playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6)
-			victim.acid_act(5, 2, 100)
+			victim.acid_act(5, 100)
 		else if(A == src) // Wets floors and spawns foam randomly
 			if(prob(75))
 				var/turf/open/T = loc

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

@@ -282,8 +282,8 @@
 	var/skin = null //Same as medbot, set to tox or ointment for the respective kits.
 	w_class = WEIGHT_CLASS_NORMAL
 
-/obj/item/firstaid_arm_assembly/New()
-	..()
+/obj/item/firstaid_arm_assembly/Initialize()
+	. = ..()
 	spawn(5)
 		if(skin)
 			add_overlay("kit_skin_[skin]")

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

@@ -32,7 +32,7 @@
 	initial_language_holder = /datum/language_holder/construct
 	deathmessage = "collapses in a shattered heap."
 	var/list/construct_spells = list()
-	var/playstyle_string = "<b>You are a generic construct! Your job is to not exist, and you should probably adminhelp this.</b>"
+	var/playstyle_string = "<span class='big bold'>You are a generic construct!</span><b> Your job is to not exist, and you should probably adminhelp this.</b>"
 	var/master = null
 	var/seeking = FALSE
 	var/can_repair_constructs = FALSE
@@ -119,7 +119,7 @@
 	mob_size = MOB_SIZE_LARGE
 	force_threshold = 11
 	construct_spells = list(/obj/effect/proc_holder/spell/aoe_turf/conjure/lesserforcewall)
-	playstyle_string = "<b>You are a Juggernaut. Though slow, your shell can withstand extreme punishment, \
+	playstyle_string = "<span class='big bold'>You are a Juggernaut.</span><b> Though slow, your shell can withstand extreme punishment, \
 						create shield walls, rip apart enemies and walls alike, and even deflect energy weapons.</b>"
 
 /mob/living/simple_animal/hostile/construct/armored/hostile //actually hostile, will move around, hit things
@@ -168,7 +168,7 @@
 	attacktext = "slashes"
 	attack_sound = 'sound/weapons/bladeslice.ogg'
 	construct_spells = list(/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift)
-	playstyle_string = "<b>You are a Wraith. Though relatively fragile, you are fast, deadly, can phase through walls, and your attacks will lower the cooldown on phasing.</b>"
+	playstyle_string = "<span class='big bold'>You are a Wraith.</span><b> Though relatively fragile, you are fast, deadly, can phase through walls, and your attacks will lower the cooldown on phasing.</b>"
 	var/attack_refund = 10 //1 second per attack
 	var/crit_refund = 50 //5 seconds when putting a target into critical
 	var/kill_refund = 250 //full refund on kills
@@ -222,7 +222,7 @@
 							/obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone,
 							/obj/effect/proc_holder/spell/aoe_turf/conjure/construct/lesser,
 							/obj/effect/proc_holder/spell/targeted/projectile/magic_missile/lesser)
-	playstyle_string = "<b>You are an Artificer. You are incredibly weak and fragile, but you are able to construct fortifications, \
+	playstyle_string = "<span class='big bold'>You are an Artificer.</span><b> You are incredibly weak and fragile, but you are able to construct fortifications, \
 						use magic missile, repair allied constructs, shades, and yourself (by clicking on them), \
 						<i>and, most important of all,</i> create new constructs by producing soulstones to capture souls, \
 						and shells to place those soulstones into.</b>"
@@ -296,8 +296,8 @@
 	attack_sound = 'sound/weapons/bladeslice.ogg'
 	construct_spells = list(/obj/effect/proc_holder/spell/aoe_turf/area_conversion,
 							/obj/effect/proc_holder/spell/aoe_turf/conjure/lesserforcewall)
-	playstyle_string = "<B>You are a Harvester. You are incapable of directly killing humans, but your attacks will remove their limbs: \
-						Bring those who still cling to this world of illusion back to the Geometer so they may know Truth. Your form and any you are pulling can pass through runed walls effortlessly.</B>"
+	playstyle_string = "<span class='big bold'>You are a Harvester.</span><b> You are incapable of directly killing humans, but your attacks will remove their limbs: \
+						Bring those who still cling to this world of illusion back to the Geometer so they may know Truth. Your form and any you are pulling can pass through runed walls effortlessly.</b>"
 	can_repair_constructs = TRUE
 
 
@@ -369,18 +369,18 @@
 		the_construct.master = C.cult_team.blood_target
 	
 	if(!the_construct.master)
-		to_chat(the_construct, "<span class='cultitalic'>You have no master to seek!</span>")
+		to_chat(the_construct, "<span class='cult italic'>You have no master to seek!</span>")
 		the_construct.seeking = FALSE
 		return
 	if(tracking)
 		tracking = FALSE
 		the_construct.seeking = FALSE
-		to_chat(the_construct, "<span class='cultitalic'>You are no longer tracking your master.</span>")
+		to_chat(the_construct, "<span class='cult italic'>You are no longer tracking your master.</span>")
 		return
 	else
 		tracking = TRUE
 		the_construct.seeking = TRUE
-		to_chat(the_construct, "<span class='cultitalic'>You are now tracking your master.</span>")
+		to_chat(the_construct, "<span class='cult italic'>You are now tracking your master.</span>")
 
 
 /datum/action/innate/seek_prey
@@ -403,14 +403,14 @@
 		desc = "None can hide from Nar'Sie, activate to track a survivor attempting to flee the red harvest!"
 		button_icon_state = "cult_mark"
 		the_construct.seeking = FALSE
-		to_chat(the_construct, "<span class='cultitalic'>You are now tracking Nar'Sie, return to reap the harvest!</span>")
+		to_chat(the_construct, "<span class='cult italic'>You are now tracking Nar'Sie, return to reap the harvest!</span>")
 		return
 	else
 		if(LAZYLEN(GLOB.cult_narsie.souls_needed))
 			the_construct.master = pick(GLOB.cult_narsie.souls_needed)
-			to_chat(the_construct, "<span class='cultitalic'>You are now tracking your prey, [the_construct.master] - harvest them!</span>")
+			to_chat(the_construct, "<span class='cult italic'>You are now tracking your prey, [the_construct.master] - harvest them!</span>")
 		else
-			to_chat(the_construct, "<span class='cultitalic'>Nar'Sie has completed her harvest!</span>")
+			to_chat(the_construct, "<span class='cult italic'>Nar'Sie has completed her harvest!</span>")
 			return
 		desc = "Activate to track Nar'Sie!"
 		button_icon_state = "sintouch"

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

@@ -29,8 +29,6 @@
 	var/turns_since_scan = 0
 	var/mob/living/simple_animal/mouse/movement_target
 	gold_core_spawnable = FRIENDLY_SPAWN
-	devourable = TRUE
-	no_vore = FALSE
 
 /mob/living/simple_animal/pet/cat/Initialize()
 	. = ..()
@@ -256,7 +254,7 @@
 	if(!B || !B.brainmob || !B.brainmob.mind)
 		return
 	B.brainmob.mind.transfer_to(src)
-	to_chat(src, "<font size=3><b>Y</b></font><b>ou are a cak! You're a harmless cat/cake hybrid that everyone loves. People can take bites out of you if they're hungry, but you regenerate health \
+	to_chat(src, "<span class='big bold'>You are a cak!</span><b> You're a harmless cat/cake hybrid that everyone loves. People can take bites out of you if they're hungry, but you regenerate health \
 	so quickly that it generally doesn't matter. You're remarkably resilient to any damage besides this and it's hard for you to really die at all. You should go around and bring happiness and \
 	free cake to the station!</b>")
 	var/new_name = stripped_input(src, "Enter your name, or press \"Cancel\" to stick with Keeki.", "Name Change")

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

@@ -20,7 +20,6 @@
 	var/obj/item/inventory_head
 	var/obj/item/inventory_mask
 	gold_core_spawnable = FRIENDLY_SPAWN
-	devourable = TRUE
 
 /mob/living/simple_animal/crab/Life()
 	..()
@@ -75,4 +74,4 @@
 	real_name = "Evil Kreb"
 	icon_state = "evilkreb"
 	icon_living = "evilkreb"
-	icon_dead = "evilkreb_dead"
+	icon_dead = "evilkreb_dead"

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

@@ -12,8 +12,6 @@
 	see_in_dark = 5
 	speak_chance = 1
 	turns_per_move = 10
-	devourable = TRUE
-	no_vore = FALSE
 
 //Corgis and pugs are now under one dog subtype
 
@@ -615,4 +613,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!")

code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm

@@ -12,13 +12,26 @@
 	icon = 'icons/mob/drone.dmi'
 	icon_state = "drone_maint_hat"//yes reuse the _hat state.
 	var/drone_type = /mob/living/simple_animal/drone //Type of drone that will be spawned
+	var/seasonal_hats = TRUE //If TRUE, and there are no default hats, different holidays will grant different hats
+	var/static/list/possible_seasonal_hats //This is built automatically in build_seasonal_hats() but can also be edited by admins!
 
-/obj/item/drone_shell/New()
-	..()
+/obj/item/drone_shell/Initialize()
+	. = ..()
 	var/area/A = get_area(src)
 	if(A)
 		notify_ghosts("A drone shell has been created in \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE)
 	GLOB.poi_list |= src
+	if(isnull(possible_seasonal_hats))
+		build_seasonal_hats()
+
+/obj/item/drone_shell/proc/build_seasonal_hats()
+	possible_seasonal_hats = list()
+	if(!length(SSevents.holidays))
+		return //no holidays, no hats; we'll keep the empty list so we never call this proc again
+	for(var/V in SSevents.holidays)
+		var/datum/holiday/holiday = SSevents.holidays[V]
+		if(holiday.drone_hat)
+			possible_seasonal_hats += holiday.drone_hat
 
 /obj/item/drone_shell/Destroy()
 	GLOB.poi_list -= src
@@ -40,6 +53,10 @@
 	if(be_drone == "No" || QDELETED(src) || !isobserver(user))
 		return
 	var/mob/living/simple_animal/drone/D = new drone_type(get_turf(loc))
+	if(!D.default_hatmask && seasonal_hats && possible_seasonal_hats.len)
+		var/hat_type = pick(possible_seasonal_hats)
+		var/obj/item/new_hat = new hat_type(D)
+		D.equip_to_slot_or_del(new_hat, slot_head)
 	D.admin_spawned = admin_spawned
 	D.key = user.key
-	qdel(src)
+	qdel(src)

code/modules/mob/living/simple_animal/friendly/drone/verbs.dm

@@ -11,7 +11,7 @@
 
 	to_chat(src, "<b>Drone Laws</b>")
 	to_chat(src, laws)
-	
+
 /mob/living/simple_animal/drone/verb/drone_ping()
 	set category = "Drone"
 	set name = "Drone ping"
@@ -24,7 +24,6 @@
 		var/msg = "<span class='boldnotice'>DRONE PING: [name]: [alert_s] priority alert in [A.name]!</span>"
 		alert_drones(msg)
 
-
 /mob/living/simple_animal/drone/verb/toggle_statics()
 	set name = "Change Vision Filter"
 	set desc = "Change the filter on the system used to remove non drone beings from your viewscreen."

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

@@ -28,8 +28,6 @@
 	stop_automated_movement_when_pulled = 1
 	blood_volume = BLOOD_VOLUME_NORMAL
 	var/obj/item/udder/udder = null
-	devourable = TRUE
-	no_vore = FALSE
 
 /mob/living/simple_animal/hostile/retaliate/goat/Initialize()
 	udder = new()
@@ -66,7 +64,7 @@
 	src.visible_message("<span class='danger'>[src] gets an evil-looking gleam in [p_their()] eye.</span>")
 
 /mob/living/simple_animal/hostile/retaliate/goat/Move()
-	..()
+	. = ..()
 	if(!stat)
 		eat_plants()
 
@@ -119,8 +117,6 @@
 	var/obj/item/udder/udder = null
 	gold_core_spawnable = FRIENDLY_SPAWN
 	blood_volume = BLOOD_VOLUME_NORMAL
-	devourable = TRUE
-	no_vore = FALSE
 
 /mob/living/simple_animal/cow/Initialize()
 	udder = new()
@@ -196,7 +192,6 @@
 	pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
 	mob_size = MOB_SIZE_TINY
 	gold_core_spawnable = FRIENDLY_SPAWN
-	devourable = TRUE
 
 /mob/living/simple_animal/chick/Initialize()
 	. = ..()
@@ -252,8 +247,6 @@
 	var/list/validColors = list("brown","black","white")
 	gold_core_spawnable = FRIENDLY_SPAWN
 	var/static/chicken_count = 0
-	devourable = TRUE
-	no_vore = FALSE
 
 /mob/living/simple_animal/chicken/Initialize()
 	. = ..()

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

@@ -18,47 +18,6 @@
 	response_disarm = "gently pushes aside"
 	response_harm = "kicks"
 	gold_core_spawnable = FRIENDLY_SPAWN
-	devourable = TRUE
-	var/mob/living/simple_animal/mouse/movement_target
-	var/turns_since_scan = 0
-	no_vore = FALSE
-
-/mob/living/simple_animal/pet/fox/Life()
-	//MICE!
-	if((src.loc) && isturf(src.loc))
-		if(!stat && !resting && !buckled)
-			for(var/mob/living/simple_animal/mouse/M in view(1,src))
-				if(!M.stat && Adjacent(M))
-					emote("me", 1, "splats \the [M]!")
-					M.splat()
-					movement_target = null
-					stop_automated_movement = 0
-					break
-			for(var/obj/item/toy/cattoy/T in view(1,src))
-				if (T.cooldown < (world.time - 400))
-					emote("me", 1, "bats \the [T] around with its paw!")
-					T.cooldown = world.time
-
-	..()
-
-	if(!stat && !resting && !buckled)
-		turns_since_scan++
-		if(turns_since_scan > 5)
-			walk_to(src,0)
-			turns_since_scan = 0
-			if((movement_target) && !(isturf(movement_target.loc) || ishuman(movement_target.loc) ))
-				movement_target = null
-				stop_automated_movement = 0
-			if( !movement_target || !(movement_target.loc in oview(src, 3)) )
-				movement_target = null
-				stop_automated_movement = 0
-				for(var/mob/living/simple_animal/mouse/snack in oview(src,3))
-					if(isturf(snack.loc) && !snack.stat)
-						movement_target = snack
-						break
-			if(movement_target)
-				stop_automated_movement = 1
-				walk_to(src,movement_target,0,3)
 
 //Captain fox
 /mob/living/simple_animal/pet/fox/Renault

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

@@ -19,7 +19,6 @@
 	pass_flags = PASSTABLE | PASSMOB
 	mob_size = MOB_SIZE_SMALL
 	gold_core_spawnable = FRIENDLY_SPAWN
-	devourable = TRUE
 	obj_damage = 0
 	environment_smash = ENVIRONMENT_SMASH_NONE
 	var/static/list/edibles = typecacheof(list(/mob/living/simple_animal/butterfly, /mob/living/simple_animal/cockroach)) //list of atoms, however turfs won't affect AI, but will affect consumption.

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

@@ -24,7 +24,6 @@
 	var/body_color //brown, gray and white, leave blank for random
 	gold_core_spawnable = FRIENDLY_SPAWN
 	var/chew_probability = 1
-	devourable = TRUE
 
 /mob/living/simple_animal/mouse/Initialize()
 	. = ..()

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

@@ -13,7 +13,6 @@
 	speak_chance = 1
 	turns_per_move = 10
 	icon = 'icons/mob/penguins.dmi'
-	no_vore = FALSE
 
 /mob/living/simple_animal/pet/penguin/emperor
 	name = "Emperor penguin"

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

@@ -5,21 +5,23 @@
 	var/collar = ""
 	var/pettag = ""
 	blood_volume = BLOOD_VOLUME_NORMAL
-	devourable = TRUE
 
 /mob/living/simple_animal/pet/attackby(obj/item/O, mob/user, params)
 	if(istype(O, /obj/item/clothing/neck/petcollar) && !pcollar)
-		var/obj/item/clothing/neck/petcollar/P = O
-		pcollar = P
-		collar = "[icon_state]collar"
-		pettag = "[icon_state]tag"
-		regenerate_icons()
-		to_chat(user, "<span class='notice'>You put the [P] around [src]'s neck.</span>")
-		if(P.tagname)
-			real_name = "\proper [P.tagname]"
-			name = real_name
-		qdel(P)
-		return
+		var/pet_icon_states = icon_states("[icon]")
+		if("[icon_state]collar" in pet_icon_states)
+			var/obj/item/clothing/neck/petcollar/P = O
+			pcollar = P
+			collar = "[icon_state]collar"
+			pettag = "[icon_state]tag"
+			regenerate_icons()
+			to_chat(user, "<span class='notice'>You put the [P] around [src]'s neck.</span>")
+			if(P.tagname)
+				real_name = "\proper [P.tagname]"
+				name = real_name
+			qdel(P)
+			return
+
 	if(istype(O, /obj/item/newspaper))
 		if(!stat)
 			user.visible_message("[user] baps [name] on the nose with the rolled up [O].")
@@ -51,3 +53,4 @@
 		add_overlay(collar)
 	if(pettag)
 		add_overlay(pettag)
+

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

@@ -21,7 +21,7 @@
 	maxHealth = 50
 	speed = 10
 	glide_size = 2
-	devourable = TRUE
+
 
 //Cargo Sloth
 /mob/living/simple_animal/sloth/paperwork

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

@@ -45,7 +45,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 	var/range = 10 //how far from the user the spirit can be
 	var/toggle_button_type = /obj/screen/guardian/ToggleMode/Inactive //what sort of toggle button the hud uses
 	var/datum/guardianname/namedatum = new/datum/guardianname()
-	var/playstyle_string = "<span class='holoparasite'>You are a standard Guardian. You shouldn't exist!</span>"
+	var/playstyle_string = "<span class='holoparasite bold'>You are a standard Guardian. You shouldn't exist!</span>"
 	var/magic_fluff_string = "<span class='holoparasite'>You draw the Coder, symbolizing bugs and errors. This shouldn't happen! Submit a bug report!</span>"
 	var/tech_fluff_string = "<span class='holoparasite'>BOOT SEQUENCE COMPLETE. ERROR MODULE LOADED. THIS SHOULDN'T HAPPEN. Submit a bug report!</span>"
 	var/carp_fluff_string = "<span class='holoparasite'>CARP CARP CARP SOME SORT OF HORRIFIC BUG BLAME THE CODERS CARP CARP CARP</span>"
@@ -57,7 +57,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 	. = ..()
 
 /mob/living/simple_animal/hostile/guardian/med_hud_set_health()
-	if(!QDELETED(summoner))
+	if(summoner)
 		var/image/holder = hud_list[HEALTH_HUD]
 		holder.icon_state = "hud[RoundHealth(summoner)]"
 
@@ -117,7 +117,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 	if(mind)
 		mind.name = "[real_name]"
 	if(!summoner)
-		to_chat(src, "<span class='holoparasitebold'>For some reason, somehow, you have no summoner. Please report this bug immediately.</span>")
+		to_chat(src, "<span class='holoparasite bold'>For some reason, somehow, you have no summoner. Please report this bug immediately.</span>")
 		return
 	to_chat(src, "<span class='holoparasite'>You are <font color=\"[namedatum.colour]\"><b>[real_name]</b></font>, bound to serve [summoner.real_name].</span>")
 	to_chat(src, "<span class='holoparasite'>You are capable of manifesting or recalling to your master with the buttons on your HUD. You will also find a button to communicate with them privately there.</span>")
@@ -358,7 +358,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 		if(!input)
 			return
 
-		var/preliminary_message = "<span class='holoparasitebold'>[input]</span>" //apply basic color/bolding
+		var/preliminary_message = "<span class='holoparasite bold'>[input]</span>" //apply basic color/bolding
 		var/my_message = "<font color=\"[namedatum.colour]\"><b><i>[src]:</i></b></font> [preliminary_message]" //add source, color source with the guardian's color
 
 		to_chat(summoner, my_message)
@@ -379,8 +379,8 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 	if(!input)
 		return
 
-	var/preliminary_message = "<span class='holoparasitebold'>[input]</span>" //apply basic color/bolding
-	var/my_message = "<span class='holoparasitebold'><i>[src]:</i> [preliminary_message]</span>" //add source, color source with default grey...
+	var/preliminary_message = "<span class='holoparasite bold'>[input]</span>" //apply basic color/bolding
+	var/my_message = "<span class='holoparasite bold'><i>[src]:</i> [preliminary_message]</span>" //add source, color source with default grey...
 
 	to_chat(src, my_message)
 	var/list/guardians = hasparasites()
@@ -423,7 +423,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 			if(candidates.len)
 				new_stand = pick(candidates)
 				to_chat(G, "<span class='holoparasite'>Your user reset you, and your body was taken over by a ghost. Looks like they weren't happy with your performance.</span>")
-				to_chat(src, "<span class='holoparasitebold'>Your <font color=\"[G.namedatum.colour]\">[G.real_name]</font> has been successfully reset.</span>")
+				to_chat(src, "<span class='holoparasite bold'>Your <font color=\"[G.namedatum.colour]\">[G.real_name]</font> has been successfully reset.</span>")
 				message_admins("[key_name_admin(new_stand)] has taken control of ([key_name_admin(G)])")
 				G.ghostize(0)
 				G.setthemename(G.namedatum.theme) //give it a new color, to show it's a new person
@@ -469,9 +469,8 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 	var/mob_name = "Guardian Spirit"
 	var/use_message = "<span class='holoparasite'>You shuffle the deck...</span>"
 	var/used_message = "<span class='holoparasite'>All the cards seem to be blank now.</span>"
-	var/failure_message = "<span class='holoparasitebold'>..And draw a card! It's...blank? Maybe you should try again later.</span>"
-	var/ling_failure = "<span class='holoparasitebold'>The deck refuses to respond to a souless creature such as you.</span>"
-	var/activation_message = "<span class='holoparasite'>The rest of the deck rapidly flashes to ash!</span>"
+	var/failure_message = "<span class='holoparasite bold'>..And draw a card! It's...blank? Maybe you should try again later.</span>"
+	var/ling_failure = "<span class='holoparasite bold'>The deck refuses to respond to a souless creature such as you.</span>"
 	var/list/possible_guardians = list("Assassin", "Chaos", "Charger", "Explosive", "Lightning", "Protector", "Ranged", "Standard", "Support")
 	var/random = TRUE
 	var/allowmultiple = FALSE
@@ -500,8 +499,6 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 	if(candidates.len)
 		theghost = pick(candidates)
 		spawn_guardian(user, theghost.key)
-		to_chat(user, "[activation_message]")
-		qdel(src)
 	else
 		to_chat(user, "[failure_message]")
 		used = FALSE
@@ -593,9 +590,8 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 	mob_name = "Holoparasite"
 	use_message = "<span class='holoparasite'>You start to power on the injector...</span>"
 	used_message = "<span class='holoparasite'>The injector has already been used.</span>"
-	failure_message = "<span class='holoparasitebold'>...ERROR. BOOT SEQUENCE ABORTED. AI FAILED TO INTIALIZE. PLEASE CONTACT SUPPORT OR TRY AGAIN LATER.</span>"
-	ling_failure = "<span class='holoparasitebold'>The holoparasites recoil in horror. They want nothing to do with a creature like you.</span>"
-	activation_message = "<span class='holoparasite'>The injector self destructs after you inject yourself with it.</span>"
+	failure_message = "<span class='holoparasite bold'>...ERROR. BOOT SEQUENCE ABORTED. AI FAILED TO INTIALIZE. PLEASE CONTACT SUPPORT OR TRY AGAIN LATER.</span>"
+	ling_failure = "<span class='holoparasite bold'>The holoparasites recoil in horror. They want nothing to do with a creature like you.</span>"
 
 /obj/item/guardiancreator/tech/choose/traitor
 	possible_guardians = list("Assassin", "Chaos", "Charger", "Explosive", "Lightning", "Protector", "Ranged", "Standard", "Support")
@@ -608,7 +604,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 
 /obj/item/paper/guides/antag/guardian
 	name = "Holoparasite Guide"
-	icon_state = "alienpaper_words"
+	icon_state = "paper_words"
 	info = {"<b>A list of Holoparasite Types</b><br>
 
  <br>
@@ -677,9 +673,8 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 	mob_name = "Holocarp"
 	use_message = "<span class='holoparasite'>You put the fishsticks in your mouth...</span>"
 	used_message = "<span class='holoparasite'>Someone's already taken a bite out of these fishsticks! Ew.</span>"
-	failure_message = "<span class='holoparasitebold'>You couldn't catch any carp spirits from the seas of Lake Carp. Maybe there are none, maybe you fucked up.</span>"
-	ling_failure = "<span class='holoparasitebold'>Carp'sie is fine with changelings, so you shouldn't be seeing this message.</span>"
-	activation_message = "<span class='holoparasite'>You finish eating the fishsticks! Delicious!>"
+	failure_message = "<span class='holoparasite bold'>You couldn't catch any carp spirits from the seas of Lake Carp. Maybe there are none, maybe you fucked up.</span>"
+	ling_failure = "<span class='holoparasite bold'>Carp'sie is fine with changelings, so you shouldn't be seeing this message.</span>"
 	allowmultiple = TRUE
 	allowling = TRUE
 	random = TRUE

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

@@ -35,8 +35,6 @@
 	gold_core_spawnable = NO_SPAWN
 	death_sound = 'sound/voice/hiss6.ogg'
 	deathmessage = "lets out a waning guttural screech, green blood bubbling from its maw..."
-	devourable = TRUE
-	no_vore = FALSE
 
 /mob/living/simple_animal/hostile/alien/drone
 	name = "alien drone"

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

@@ -37,8 +37,6 @@
 
 	faction = list("russian")
 	gold_core_spawnable = HOSTILE_SPAWN
-	devourable = TRUE
-	no_vore = FALSE
 
 //SPACE BEARS! SQUEEEEEEEE~     OW! FUCK! IT BIT MY HAND OFF!!
 /mob/living/simple_animal/hostile/bear/Hudson

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

@@ -39,4 +39,4 @@
 		var/mob/living/carbon/C = target
 		C.Knockdown(60)
 		C.visible_message("<span class='danger'>\The [src] knocks down \the [C]!</span>", \
-				"<span class='userdanger'>\The [src] knocks you down!</span>")
+				"<span class='userdanger'>\The [src] knocks you down!</span>")

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

@@ -48,7 +48,6 @@
 	see_in_dark = 4
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
 	var/playable_spider = FALSE
-	devourable = TRUE
 	var/datum/action/innate/spider/lay_web/lay_web
 	var/directive = "" //Message passed down to children, to relay the creator's orders
 

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

@@ -35,8 +35,6 @@
 	unique_name = TRUE
 	var/list/gorilla_overlays[GORILLA_TOTAL_LAYERS]
 	var/oogas = 0
-	devourable = TRUE
-	no_vore = FALSE
 
 // Gorillas like to dismember limbs from unconcious mobs.
 // Returns null when the target is not an unconcious carbon mob; a list of limbs (possibly empty) otherwise.
@@ -105,3 +103,4 @@
 	if(oogas >= rand(2,6))
 		playsound(src, "sound/creatures/gorilla.ogg", 200)
 		oogas = 0
+

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

@@ -494,4 +494,3 @@ mob/living/simple_animal/hostile/proc/DestroySurroundings() // for use with mega
 				. += M
 			else if (M.loc.type in hostile_machines)
 				. += M.loc
-

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

@@ -283,9 +283,8 @@
 
 /mob/living/simple_animal/hostile/syndicate/mecha_pilot/Move(NewLoc,Dir=0,step_x=0,step_y=0)
 	if(mecha && loc == mecha)
-		mecha.relaymove(src, Dir)
-		return
-	..()
+		return mecha.relaymove(src, Dir)
+	return ..()
 
 
 /mob/living/simple_animal/hostile/syndicate/mecha_pilot/Goto(target, delay, minimum_distance)

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

@@ -251,9 +251,9 @@ Difficulty: Medium
 
 	animate(src, transform = M, pixel_y = -6, dir = final_dir, time = 2, easing = EASE_IN|EASE_OUT)
 	sleep(5)
-	animate(src, color = list("#A7A19E", "#A7A19E", "#A7A19E", list(0, 0, 0)), time = 10, easing = EASE_IN, flags_1 = ANIMATION_PARALLEL)
+	animate(src, color = list("#A7A19E", "#A7A19E", "#A7A19E", list(0, 0, 0)), time = 10, easing = EASE_IN, flags = ANIMATION_PARALLEL)
 	sleep(4)
-	animate(src, alpha = 0, time = 6, easing = EASE_OUT, flags_1 = ANIMATION_PARALLEL)
+	animate(src, alpha = 0, time = 6, easing = EASE_OUT, flags = ANIMATION_PARALLEL)
 
 /obj/item/device/gps/internal/miner
 	icon_state = null

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

@@ -783,4 +783,4 @@ Difficulty: Very Hard
 #undef ACTIVATE_WEAPON
 #undef ACTIVATE_MAGIC
 
-#undef MEDAL_PREFIX
+#undef MEDAL_PREFIX

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

@@ -61,7 +61,6 @@ Difficulty: Medium
 	score_type = DRAKE_SCORE
 	deathmessage = "collapses into a pile of bones, its flesh sloughing away."
 	death_sound = 'sound/magic/demon_dies.ogg'
-	no_vore = FALSE
 
 /mob/living/simple_animal/hostile/megafauna/dragon/Initialize()
 	. = ..()
@@ -192,7 +191,7 @@ Difficulty: Medium
 			qdel(F)
 			if(stat == DEAD)
 				swooping &= ~SWOOP_DAMAGEABLE
-				animate(src, alpha = 255, transform = oldtransform, time = 0, flags_1 = ANIMATION_END_NOW) //reset immediately
+				animate(src, alpha = 255, transform = oldtransform, time = 0, flags = ANIMATION_END_NOW) //reset immediately
 			return
 	animate(src, alpha = 100, transform = matrix()*0.7, time = 7)
 	swooping |= SWOOP_INVULNERABLE

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

@@ -31,7 +31,6 @@
 	var/pre_attack = 0
 	var/pre_attack_icon = "Goliath_preattack"
 	loot = list(/obj/item/stack/sheet/animalhide/goliath_hide)
-	no_vore = FALSE
 
 /mob/living/simple_animal/hostile/asteroid/goliath/Life()
 	. = ..()

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

@@ -123,7 +123,8 @@
 /obj/item/udder/gutlunch
 	name = "nutrient sac"
 
-/obj/item/udder/gutlunch/New()
+/obj/item/udder/gutlunch/Initialize()
+	. = ..()
 	reagents = new(50)
 	reagents.my_atom = src
 

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

@@ -64,3 +64,4 @@
 	projectiletype = /obj/item/projectile/beam/laser
 	loot = list(/obj/effect/mob_spawn/human/corpse/pirate/ranged,
 			/obj/item/gun/energy/laser)
+

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

@@ -12,8 +12,8 @@
 	var/growth_time = 1200
 
 
-/obj/structure/alien/resin/flower_bud_enemy/New()
-	..()
+/obj/structure/alien/resin/flower_bud_enemy/Initialize()
+	. = ..()
 	var/list/anchors = list()
 	anchors += locate(x-2,y+2,z)
 	anchors += locate(x+2,y+2,z)

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

@@ -60,8 +60,6 @@
 	mob_size = MOB_SIZE_SMALL
 	movement_type = FLYING
 	gold_core_spawnable = FRIENDLY_SPAWN
-	devourable = TRUE
-	no_vore = FALSE
 
 	var/parrot_damage_upper = 10
 	var/parrot_state = PARROT_WANDER //Hunt for a perch when created
@@ -1001,6 +999,7 @@
 	parrot_interest = null
 	H.visible_message("<span class='danger'>[src] dive bombs into [H]'s chest and vanishes!</span>", "<span class='userdanger'>[src] dive bombs into your chest, vanishing! This can't be good!</span>")
 
+
 /mob/living/simple_animal/parrot/clock_hawk
 	name = "clock hawk"
 	desc = "Cbyl jnaan penpxre! Fdhnnnjx!"

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

@@ -88,7 +88,7 @@
 
 	//domestication
 	var/tame = 0
-	no_vore = TRUE
+
 	var/my_z // I don't want to confuse this with client registered_z 
 
 /mob/living/simple_animal/Initialize()

code/modules/mob/login.dm

@@ -30,8 +30,6 @@
 
 	sync_mind()
 
-	client.sethotkeys() //set mob specific hotkeys
-
 	//Reload alternate appearances
 	for(var/v in GLOB.active_alternate_appearances)
 		if(!v)

code/modules/mob/mob.dm

@@ -30,6 +30,7 @@
 		GLOB.dead_mob_list += src
 	else
 		GLOB.alive_mob_list += src
+	set_focus(src)
 	prepare_huds()
 	for(var/v in GLOB.active_alternate_appearances)
 		if(!v)
@@ -125,7 +126,7 @@
 			if(self_message)
 				msg = self_message
 		else
-			if(M.see_invisible<invisibility)//if src is invisible to us,
+			if(M.see_invisible<invisibility || (T != loc && T != src))//if src is invisible to us or is inside something (and isn't a turf),
 				if(blind_message) // then people see blind message if there is one, otherwise nothing.
 					msg = blind_message
 				else

code/modules/mob/mob_defines.dm

@@ -21,18 +21,13 @@
 	*/
 	var/zone_selected = null
 
-	var/macro_default = "default"
-	var/macro_hotkeys = "hotkeys"
-
 	var/damageoverlaytemp = 0
 	var/computer_id = null
 	var/lastattacker = null
 	var/lastattackerckey = null
 	var/list/logging = list(INDIVIDUAL_ATTACK_LOG, INDIVIDUAL_SAY_LOG, INDIVIDUAL_EMOTE_LOG, INDIVIDUAL_OOC_LOG)
-
 	var/obj/machinery/machine = null
 	var/other_mobs = null
-	var/disabilities = 0	//Carbon
 
 	var/atom/movable/pulling = null
 	var/grab_state = 0

code/modules/mob/mob_helpers.dm

@@ -285,11 +285,6 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
 	firstname.Find(real_name)
 	return firstname.match
 
-/mob/proc/abiotic(full_body = 0)
-	for(var/obj/item/I in held_items)
-		if(!(I.flags_1 & NODROP_1))
-			return 1
-	return 0
 
 //change a mob's act-intent. Input the intent as a string such as "help" or use "right"/"left
 /mob/verb/a_intent_change(input as text)

code/modules/mob/mob_movement.dm

@@ -11,94 +11,12 @@
 	return (!mover.density || !density || lying)
 
 
-//The byond version of these verbs wait for the next tick before acting.
-//	instant verbs however can run mid tick or even during the time between ticks.
-/client/verb/moveup()
-	set name = ".moveup"
-	set instant = 1
-	Move(get_step(mob, NORTH), NORTH)
-
-/client/verb/movedown()
-	set name = ".movedown"
-	set instant = 1
-	Move(get_step(mob, SOUTH), SOUTH)
-
-/client/verb/moveright()
-	set name = ".moveright"
-	set instant = 1
-	Move(get_step(mob, EAST), EAST)
-
-/client/verb/moveleft()
-	set name = ".moveleft"
-	set instant = 1
-	Move(get_step(mob, WEST), WEST)
-
-/client/Northeast()
-	swap_hand()
-	return
-
-
-/client/Southeast()
-	attack_self()
-	return
-
-
-/client/Southwest()
-	if(iscarbon(usr))
-		var/mob/living/carbon/C = usr
-		C.toggle_throw_mode()
-	else
-		to_chat(usr, "<span class='danger'>This mob type cannot throw items.</span>")
-	return
-
-
-/client/Northwest()
-	var/obj/item/I = usr.get_active_held_item()
-	if(!I)
-		to_chat(usr, "<span class='warning'>You have nothing to drop in your hand!</span>")
-		return
-	usr.dropItemToGround(I)
-
-//This gets called when you press the delete button.
-/client/verb/delete_key_pressed()
-	set hidden = 1
-
-	if(!isliving(usr))
-		return
-	if(!usr.pulling)
-		to_chat(usr, "<span class='notice'>You are not pulling anything.</span>")
-		return
-	usr.stop_pulling()
-
-/client/verb/swap_hand()
-	set category = "IC"
-	set name = "Swap hands"
-
-	if(mob)
-		mob.swap_hand()
-
-/client/verb/attack_self()
-	set hidden = 1
-	if(mob)
-		mob.mode()
-	return
-
-
 /client/verb/drop_item()
 	set hidden = 1
 	if(!iscyborg(mob) && mob.stat == CONSCIOUS)
 		mob.dropItemToGround(mob.get_active_held_item())
 	return
 
-
-/client/Center()
-	if(isobj(mob.loc))
-		var/obj/O = mob.loc
-		if(mob.canmove)
-			return O.relaymove(mob, 0)
-	return
-
-
 /client/proc/Move_object(direct)
 	if(mob && mob.control_object)
 		if(mob.control_object.density)
@@ -114,19 +32,23 @@
 #define MOVEMENT_DELAY_BUFFER_DELTA 1.25
 
 /client/Move(n, direct)
-	if(world.time < move_delay)
+	if(world.time < move_delay) //do not move anything ahead of this check please
 		return FALSE
+	else
+		next_move_dir_add = 0
+		next_move_dir_sub = 0
 	var/old_move_delay = move_delay
 	move_delay = world.time+world.tick_lag //this is here because Move() can now be called mutiple times per tick
 	if(!mob || !mob.loc)
 		return FALSE
-	var/oldloc = mob.loc
+	if(!n || !direct)
+		return FALSE
 	if(mob.notransform)
 		return FALSE	//This is sota the goto stop mobs from moving var
 	if(mob.control_object)
 		return Move_object(direct)
 	if(!isliving(mob))
-		return mob.Move(n,direct)
+		return mob.Move(n, direct)
 	if(mob.stat == DEAD)
 		mob.ghostize()
 		return FALSE
@@ -159,26 +81,32 @@
 
 	if(!mob.Process_Spacemove(direct))
 		return FALSE
-
 	//We are now going to move
-	var/delay = mob.movement_delay()
-	if(old_move_delay + (delay*MOVEMENT_DELAY_BUFFER_DELTA) + MOVEMENT_DELAY_BUFFER > world.time)
-		move_delay = old_move_delay + delay
+	var/add_delay = mob.movement_delay()
+	if(old_move_delay + (add_delay*MOVEMENT_DELAY_BUFFER_DELTA) + MOVEMENT_DELAY_BUFFER > world.time)
+		move_delay = old_move_delay
 	else
-		move_delay = delay + world.time
+		move_delay = world.time
+	var/oldloc = mob.loc
 
 	if(mob.confused)
+		var/newdir = 0
 		if(mob.confused > 40)
-			step(mob, pick(GLOB.cardinals))
+			newdir = pick(GLOB.alldirs)
 		else if(prob(mob.confused * 1.5))
-			step(mob, angle2dir(dir2angle(direct) + pick(90, -90)))
+			newdir = angle2dir(dir2angle(direct) + pick(90, -90))
 		else if(prob(mob.confused * 3))
-			step(mob, angle2dir(dir2angle(direct) + pick(45, -45)))
-		else
-			step(mob, direct)
-	else
-		. = ..()
+			newdir = angle2dir(dir2angle(direct) + pick(45, -45))
+		if(newdir)
+			direct = newdir
+			n = get_step(mob, direct)
 
+	. = ..()
+
+	if((direct & (direct - 1)) && mob.loc == n) //moved diagonally successfully
+		add_delay *= 2
+	if(mob.loc != oldloc)
+		move_delay += add_delay
 	if(.) // If mob is null here, we deserve the runtime
 		if(mob.throwing)
 			mob.throwing.finalize(FALSE)

code/modules/mob/say.dm

@@ -82,4 +82,4 @@
 	return 0
 
 /mob/proc/lingcheck()
-	return LINGHIVE_NONE
+	return LINGHIVE_NONE

code/modules/mob/say_readme.dm

@@ -11,7 +11,7 @@ This rewrite was needed, but is far from perfect. Report any bugs you come acros
 Radio code, while very much related to saycode, is not something I wanted to touch, so the code related to that may be messy.
 
 If you came here to see how to use saycode, all you will ever really need to call is say(message).
-To have things react when other things speak around them, add the HEAR_1 flag to their flags_1 variable and
+To have things react when other things speak around them, add the HEAR_1 flag to their flags variable and
 override their Hear() proc.
 
 =======================PROCS & VARIABLES=======================
@@ -43,7 +43,7 @@ global procs
 		Attaches span classes around input.
 
 /atom/movable
-	flags_1
+	flags
 		The HEAR_1 flag determines whether something is a hearer or not.
 		Hear() is only called on procs with this flag.
 

code/modules/mob/say_vr.dm

@@ -19,7 +19,7 @@
 /mob/proc/warn_flavor_changed()
 	if(flavor_text && flavor_text != "") // don't spam people that don't use it!
 		src << "<h2 class='alert'>OOC Warning:</h2>"
-		src << "<span class='alert'>Your flavor text is likely out of date! <a href='byond://?src=\ref[src];flavor_change=1'>Change</a></span>"
+		src << "<span class='alert'>Your flavor text is likely out of date! <a href='?src=[REF(src)];flavor_change=1'>Change</a></span>"
 
 /mob/proc/print_flavor_text()
 	if(flavor_text && flavor_text != "")
@@ -27,7 +27,7 @@
 		if(lentext(msg) <= 40)
 			return "<span class='notice'>[msg]</span>"
 		else
-			return "<span class='notice'>[copytext(msg, 1, 37)]... <a href=\"byond://?src=\ref[src];flavor_more=1\">More...</span></a>"
+			return "<span class='notice'>[copytext(msg, 1, 37)]... <a href='?src=[REF(src)];flavor_more=1\">More...</span></a>"
 
 /mob/proc/get_top_level_mob()
 	if(istype(src.loc,/mob)&&src.loc!=src)