TG Sync 12/15/17

s

s

code/modules/mob/camera/camera.dm

@@ -1,15 +1,18 @@
-// Camera mob, used by AI camera and blob.
-
-/mob/camera
-	name = "camera mob"
+// Camera mob, used by AI camera and blob.
+
+/mob/camera
+	name = "camera mob"
 	density = FALSE
 	anchored = TRUE
-	status_flags = GODMODE  // You can't damage it.
+	status_flags = GODMODE  // You can't damage it.
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
-	see_in_dark = 7
-	invisibility = INVISIBILITY_ABSTRACT // No one can see us
-	sight = SEE_SELF
-	move_on_shuttle = 0
-
-/mob/camera/experience_pressure_difference()
-	return
+	see_in_dark = 7
+	invisibility = INVISIBILITY_ABSTRACT // No one can see us
+	sight = SEE_SELF
+	move_on_shuttle = 0
+
+/mob/camera/experience_pressure_difference()
+	return
+
+/mob/camera/forceMove(atom/destination)
+	loc = destination

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.
@@ -24,6 +28,9 @@ INITIALIZE_IMMEDIATE(/mob/dead)
 /mob/dead/ConveyorMove()	//lol
 	return
 
+/mob/dead/forceMove(atom/destination)
+	loc = destination
+
 /mob/dead/Stat()
 	..()
 
@@ -42,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

@@ -21,9 +21,9 @@
 		S.Fade(TRUE)
 
 	if(length(GLOB.newplayer_start))
-		loc = pick(GLOB.newplayer_start)
+		forceMove(pick(GLOB.newplayer_start))
 	else
-		loc = locate(1,1,1)
+		forceMove(locate(1,1,1))
 
 	ComponentInitialize()
 
@@ -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)
@@ -282,7 +262,7 @@
 	var/obj/effect/landmark/observer_start/O = locate(/obj/effect/landmark/observer_start) in GLOB.landmarks_list
 	to_chat(src, "<span class='notice'>Now teleporting.</span>")
 	if (O)
-		observer.loc = O.loc
+		observer.forceMove(O.loc)
 	else
 		to_chat(src, "<span class='notice'>Teleporting failed. Ahelp an admin please</span>")
 		stack_trace("There's no freaking observer landmark available on this map or you're making observers before the map is initialised")
@@ -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()
 	// Silicons only need a very basic preview since there is no customization for them.
 	if(job_engsec_high)
 		switch(job_engsec_high)
@@ -56,7 +57,7 @@
 				previewJob = job
 				break
 
-	if(previewJob && !nude)
+	if(previewJob)
 		mannequin.job = previewJob.title
 		previewJob.equip(mannequin, TRUE)
 	COMPILE_OVERLAYS(mannequin)

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
@@ -109,7 +108,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
 		else
 			T = locate(round(world.maxx/2), round(world.maxy/2), ZLEVEL_STATION_PRIMARY)	//middle of the station
 
-	loc = T
+	forceMove(T)
 
 	if(!name)							//To prevent nameless ghosts
 		name = random_unique_name(gender)
@@ -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()
@@ -288,10 +287,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	var/oldloc = loc
 
 	if(NewLoc)
-		loc = NewLoc
+		forceMove(NewLoc)
 		update_parallax_contents()
 	else
-		loc = get_turf(src) //Get out of closets and such as a ghost
+		forceMove(get_turf(src))  //Get out of closets and such as a ghost
 		if((direct & NORTH) && y < world.maxy)
 			y++
 		else if((direct & SOUTH) && y > 1)
@@ -371,7 +370,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	if(!L || !L.len)
 		to_chat(usr, "No area available.")
 
-	usr.loc = pick(L)
+	usr.forceMove(pick(L))
 	update_parallax_contents()
 
 /mob/dead/observer/verb/follow()
@@ -445,7 +444,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 			var/turf/T = get_turf(M) //Turf of the destination mob
 
 			if(T && isturf(T))	//Make sure the turf exists, then move the source to that destination.
-				A.loc = T
+				A.forceMove(T)
 				A.update_parallax_contents()
 			else
 				to_chat(A, "This mob is not located in the game world.")
@@ -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,25 @@
-/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]")
-
+
+	. = 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]")
+

code/modules/mob/living/brain/MMI.dm

@@ -57,7 +57,7 @@
 
 		brainmob = newbrain.brainmob
 		newbrain.brainmob = null
-		brainmob.loc = src
+		brainmob.forceMove(src)
 		brainmob.container = src
 		if(!newbrain.damaged_brain) // the brain organ hasn't been beaten to death.
 			brainmob.stat = CONSCIOUS //we manually revive the brain mob
@@ -90,7 +90,7 @@
 
 /obj/item/device/mmi/proc/eject_brain(mob/user)
 	brainmob.container = null //Reset brainmob mmi var.
-	brainmob.loc = brain //Throw mob into brain.
+	brainmob.forceMove(brain) //Throw mob into brain.
 	brainmob.stat = DEAD
 	brainmob.emp_damage = 0
 	brainmob.reset_perspective() //so the brainmob follows the brain organ instead of the mmi. And to update our vision
@@ -120,7 +120,7 @@
 	if(ishuman(L))
 		var/mob/living/carbon/human/H = L
 		var/obj/item/organ/brain/newbrain = H.getorgan(/obj/item/organ/brain)
-		newbrain.loc = src
+		newbrain.forceMove(src)
 		brain = newbrain
 	else if(!brain)
 		brain = new(src)

code/modules/mob/living/brain/posibrain.dm

@@ -157,7 +157,7 @@ GLOBAL_VAR(posibrain_notify_cooldown)
 		new_name = pick(possible_names)
 	brainmob.name = "[new_name]-[rand(100, 999)]"
 	brainmob.real_name = brainmob.name
-	brainmob.loc = src
+	brainmob.forceMove(src)
 	brainmob.container = src
 	if(autoping)
 		ping_ghosts("created", TRUE)

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/alien_powers.dm

@@ -277,7 +277,7 @@ Doesn't work on other aliens/AI.*/
 	if(user.stomach_contents.len)
 		for(var/atom/movable/A in user.stomach_contents)
 			user.stomach_contents.Remove(A)
-			A.loc = user.loc
+			A.forceMove(user.drop_location())
 			if(isliving(A))
 				var/mob/M = A
 				M.reset_perspective()

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

@@ -106,7 +106,7 @@
 	for(var/atom/movable/A in stomach_contents)
 		stomach_contents.Remove(A)
 		new_xeno.stomach_contents.Add(A)
-		A.loc = new_xeno
+		A.forceMove(new_xeno)
 	..()
 
 //For alien evolution/promotion/queen finder procs. Checks for an active alien of that type

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)
@@ -38,7 +38,7 @@
 
 				if(prob(src.getBruteLoss() - 50))
 					for(var/atom/movable/A in stomach_contents)
-						A.loc = loc
+						A.forceMove(drop_location())
 						stomach_contents.Remove(A)
 					src.gib()
 
@@ -332,7 +332,7 @@
 		if (client)
 			client.screen -= W
 		if (W)
-			W.loc = loc
+			W.forceMove(drop_location())
 			W.dropped(src)
 			if (W)
 				W.layer = initial(W.layer)
@@ -345,7 +345,7 @@
 		if (client)
 			client.screen -= W
 		if (W)
-			W.loc = loc
+			W.forceMove(drop_location())
 			W.dropped(src)
 			if (W)
 				W.layer = initial(W.layer)
@@ -372,7 +372,7 @@
 
 	else
 		if(I == handcuffed)
-			handcuffed.loc = loc
+			handcuffed.forceMove(drop_location())
 			handcuffed.dropped(src)
 			handcuffed = null
 			if(buckled && buckled.buckle_requires_restraints)
@@ -380,7 +380,7 @@
 			update_handcuffed()
 			return
 		if(I == legcuffed)
-			legcuffed.loc = loc
+			legcuffed.forceMove(drop_location())
 			legcuffed.dropped()
 			legcuffed = null
 			update_inv_legcuffed()
@@ -786,7 +786,7 @@
 		if(prob(50))
 			organs_amt++
 			O.Remove(src)
-			O.loc = get_turf(src)
+			O.forceMove(drop_location())
 	if(organs_amt)
 		to_chat(user, "<span class='notice'>You retrieve some of [src]\'s internal organs!</span>")
 

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)

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

@@ -230,14 +230,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"
@@ -342,6 +341,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

@@ -263,7 +263,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///////

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

@@ -131,7 +131,7 @@
 					var/obj/item/bodypart/L = pick(bodyparts)
 					L.embedded_objects |= I
 					I.add_mob_blood(src)//it embedded itself in you, of course it's bloody!
-					I.loc = src
+					I.forceMove(src)
 					L.receive_damage(I.w_class*I.embedded_impact_pain_multiplier)
 					visible_message("<span class='danger'>[I] embeds itself in [src]'s [L.name]!</span>","<span class='userdanger'>[I] embeds itself in your [L.name]!</span>")
 					hitpush = FALSE
@@ -140,8 +140,8 @@
 	return ..()
 
 /mob/living/carbon/human/grabbedby(mob/living/carbon/user, supress_message = 0)
-	if(user == src && pulling && !pulling.anchored && grab_state >= GRAB_AGGRESSIVE && isliving(pulling))
-		vore_attack(user, pulling)
+	if(user == src && pulling && !pulling.anchored && grab_state >= GRAB_AGGRESSIVE && (disabilities & FAT) && ismonkey(pulling))
+		devour_mob(pulling)
 	else
 		..()
 
@@ -180,7 +180,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 +199,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 +221,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 +250,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 +278,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 +294,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 +314,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 +331,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 +368,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/interactive.dm

@@ -219,7 +219,7 @@
 				if(prob(25))
 					var/cType = pick(list(SNPC_BRUTE,SNPC_STEALTH,SNPC_MARTYR,SNPC_PSYCHO))
 					T.makeTraitor(cType)
-				T.loc = pick(get_area_turfs(T.job2area(T.myjob)))
+				T.forceMove(pick(get_area_turfs(T.job2area(T.myjob))))
 			if(choice == "Custom")
 				var/cjob = input("Choose Job") as null|anything in SSjob.occupations
 				if(cjob)
@@ -256,7 +256,7 @@
 				var/doTele = input("Place the SNPC in their department?") as null|anything in list("Yes","No")
 				if(doTele)
 					if(doTele == "Yes")
-						T.loc = pick(get_area_turfs(T.job2area(T.myjob)))
+						T.forceMove(pick(get_area_turfs(T.job2area(T.myjob))))
 
 /mob/living/carbon/human/interactive/proc/doSetup()
 	Path_ID = new /obj/item/card/id(src)
@@ -506,7 +506,7 @@
 	var/list/slots = list ("left pocket" = slot_l_store,"right pocket" = slot_r_store,"left hand" = slot_hands,"right hand" = slot_hands)
 	if(hands)
 		slots = list ("left hand" = slot_hands,"right hand" = slot_hands)
-	G.loc = src
+	G.forceMove(src)
 	if(G.force && G.force > best_force)
 		best_force = G.force
 	equip_in_one_of_slots(G, slots)
@@ -931,7 +931,7 @@
 /mob/living/carbon/human/interactive/proc/npcDrop(var/obj/item/A,var/blacklist = 0)
 	if(blacklist)
 		blacklistItems += A
-	A.loc = get_turf(src) // drop item works inconsistently
+	A.forceMove(drop_location()) // drop item works inconsistently
 	enforce_hands()
 	update_icons()
 
@@ -956,7 +956,7 @@
 							retal_target = traitorTarget
 						else
 							var/obj/item/I = traitorTarget
-							I.loc = get_turf(traitorTarget) // pull it outta them
+							I.forceMove(get_turf(I)) // pull it outta them
 					else
 						take_to_slot(traitorTarget)
 				if(SNPC_MARTYR)
@@ -1315,7 +1315,7 @@
 					customEmote("[src] [pick("gibbers","drools","slobbers","claps wildly","spits")], grabbing various foodstuffs from [SF] and sticking them in it's mouth!")
 					for(var/obj/item/A in SF.contents)
 						if(prob(smartness/2))
-							A.loc = src
+							A.forceMove(src)
 
 
 		if(foundCustom)
@@ -1398,7 +1398,7 @@
 				if(!Adjacent(toGrab))
 					tryWalk(toGrab)
 				else
-					toGrab.loc = src
+					toGrab.forceMove(src)
 
 		if(finishedList.len > 0)
 			var/obj/structure/table/reinforced/RT
@@ -1563,7 +1563,7 @@
 										var/obj/item/W = main_hand
 										W.attack(TARGET,src)
 							else
-								G.loc = get_turf(src) // drop item works inconsistently
+								G.forceMove(drop_location()) // drop item works inconsistently
 								enforce_hands()
 								update_icons()
 				else
@@ -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
@@ -153,7 +152,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
@@ -314,7 +313,7 @@
 			if(prob(I.embedded_fall_chance))
 				BP.receive_damage(I.w_class*I.embedded_fall_pain_multiplier)
 				BP.embedded_objects -= I
-				I.loc = get_turf(src)
+				I.forceMove(drop_location())
 				visible_message("<span class='danger'>[I] falls out of [name]'s [BP.name]!</span>","<span class='userdanger'>[I] falls out of your [BP.name]!</span>")
 				if(!has_embedded_objects())
 					clear_alert("embeddedobject")
@@ -343,6 +342,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())

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

@@ -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
@@ -125,12 +125,11 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 		randname += " [pick(GLOB.last_names)]"
 
 	return randname
-	
+
 //Called when cloning, copies some vars that should be kept
 /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)
@@ -1093,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
 
 ////////
@@ -1476,7 +1475,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/humans.dm

@@ -12,7 +12,7 @@
 
 
 /datum/species/human/qualifies_for_rank(rank, list/features)
-	return TRUE
+	return TRUE	//Pure humans are always allowed in all roles.
 
 //Curiosity killed the cat's wagging tail.
 /datum/species/human/spec_death(gibbed, mob/living/carbon/human/H)

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/species_types/skeletons.dm

@@ -15,4 +15,4 @@
 /datum/species/skeleton/check_roundstart_eligible()
 	if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
 		return TRUE
-	return ..()
+	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

@@ -49,10 +49,6 @@
 		return
 	if(istype(loc, /obj/machinery/atmospherics/components/unary/cryo_cell))
 		return
-	if(istype(loc, /obj/item/device/dogborg/sleeper))
-		return
-	if(ismob(loc))
-		return
 
 	var/datum/gas_mixture/environment
 	if(loc)
@@ -460,4 +456,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)
@@ -150,7 +150,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)))
@@ -388,7 +388,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_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,8 +143,6 @@
 		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

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/living.dm

@@ -979,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/say.dm

@@ -72,7 +72,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 /mob/living/say(message, bubble_type,var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE)
 	var/static/list/crit_allowed_modes = list(MODE_WHISPER = TRUE, MODE_CHANGELING = TRUE, MODE_ALIEN = TRUE)
 	var/static/list/unconscious_allowed_modes = list(MODE_CHANGELING = TRUE, MODE_ALIEN = TRUE)
-	var/key = get_key(message)
+	var/talk_key = get_key(message)
 
 	var/static/list/one_character_prefix = list(MODE_HEADSET = TRUE, MODE_ROBOT = TRUE, MODE_WHISPER = TRUE)
 
@@ -134,12 +134,10 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 	// Detection of language needs to be before inherent channels, because
 	// AIs use inherent channels for the holopad. Most inherent channels
 	// ignore the language argument however.
-
-	var/datum/saymode/SM = SSradio.saymodes[key]
-	if(key && SM)
-		if(!SM.handle_message(src, message, language) && !message_mode)
-			return
-
+  
+	var/datum/saymode/SM = SSradio.saymodes[talk_key]
+	if(SM && !SM.handle_message(src, message, language))
+		return
 
 	if(!can_speak_vocal(message))
 		to_chat(src, "<span class='warning'>You find yourself unable to speak!</span>")

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

@@ -117,7 +117,7 @@
 	job = "AI"
 
 	eyeobj.ai = src
-	eyeobj.loc = src.loc
+	eyeobj.forceMove(src.loc)
 	rename_self("ai")
 
 	holo_icon = getHologramIcon(icon('icons/mob/ai.dmi',"default"))

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/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

@@ -51,7 +51,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
@@ -101,7 +101,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/life.dm

@@ -50,6 +50,7 @@
 			if(!mind.special_role)
 				mind.special_role = "traitor"
 				SSticker.mode.traitors += mind
+				mind.add_antag_datum(/datum/antagonist/auto_custom) // ????
 
 
 /mob/living/silicon/robot/update_health_hud()

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
@@ -248,17 +246,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)
@@ -537,6 +524,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 ..()
 

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

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/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

@@ -360,8 +360,14 @@
 	..()
 
 /datum/action/innate/seek_master/Activate()
-	if(!SSticker.mode.eldergod)
-		the_construct.master = GLOB.blood_target
+	var/datum/antagonist/cult/C = owner.mind.has_antag_datum(/datum/antagonist/cult)
+	if(!C)
+		return
+	var/datum/objective/eldergod/summon_objective = locate() in C.cult_team.objectives
+
+	if(summon_objective.check_completion())
+		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>")
 		the_construct.seeking = FALSE

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

@@ -75,4 +75,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

@@ -135,7 +135,7 @@
 		switch(remove_from)
 			if("head")
 				if(inventory_head)
-					inventory_head.loc = src.loc
+					inventory_head.forceMove(drop_location())
 					inventory_head = null
 					update_corgi_fluff()
 					regenerate_icons()
@@ -144,7 +144,7 @@
 					return
 			if("back")
 				if(inventory_back)
-					inventory_back.loc = src.loc
+					inventory_back.forceMove(drop_location())
 					inventory_back = null
 					update_corgi_fluff()
 					regenerate_icons()

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

@@ -15,8 +15,8 @@
 	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
 
-/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)
@@ -67,7 +67,7 @@
 		L.dropItemToGround(src)
 
 	contents -= drone
-	drone.loc = get_turf(src)
+	drone.forceMove(drop_location())
 	drone.reset_perspective()
 	drone.setDir(SOUTH )//Looks better
 	drone.visible_message("<span class='warning'>[drone] uncurls!</span>")

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

@@ -153,7 +153,7 @@
 
 /mob/living/simple_animal/drone/cogscarab/Login()
 	..()
-	add_servant_of_ratvar(src, TRUE)
+	add_servant_of_ratvar(src, TRUE, GLOB.servants_active)
 	to_chat(src,"<b>You yourself are one of these servants, and will be able to utilize almost anything they can[GLOB.ratvar_awakens ? "":", <i>excluding a clockwork slab</i>"].</b>") // this can't go with flavortext because i'm assuming it requires them to be ratvar'd
 
 /mob/living/simple_animal/drone/cogscarab/binarycheck()

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

@@ -15,7 +15,6 @@
 /mob/living/simple_animal/drone/verb/toggle_light()
 	set category = "Drone"
 	set name = "Toggle drone light"
-	
 	if(stat == DEAD)
 		to_chat(src, "<span class='warning'>There's no light in your life... by that I mean you're dead.</span>")
 		return
@@ -40,7 +39,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

@@ -66,7 +66,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()
 

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

@@ -110,3 +110,7 @@
 	eatverb = "devours"
 	list_reagents = list("nutriment" = 3, "vitamin" = 2)
 	foodtype = GROSS | MEAT | RAW
+	grind_results = list("blood" = 20, "liquidgibs" = 5)
+
+/obj/item/reagent_containers/food/snacks/deadmouse/on_grind()
+	reagents.clear_reagents()

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

@@ -9,17 +9,20 @@
 
 /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 +54,4 @@
 		add_overlay(collar)
 	if(pettag)
 		add_overlay(pettag)
+

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

@@ -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)]"
 

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/gorilla/gorilla.dm

@@ -105,3 +105,4 @@
 	if(oogas >= rand(2,6))
 		playsound(src, "sound/creatures/gorilla.ogg", 200)
 		oogas = 0
+

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

@@ -28,9 +28,6 @@
 	var/ranged_message = "fires" //Fluff text for ranged mobs
 	var/ranged_cooldown = 0 //What the current cooldown on ranged attacks is, generally world.time + ranged_cooldown_time
 	var/ranged_cooldown_time = 30 //How long, in deciseconds, the cooldown of ranged attacks is
-	var/ranged_telegraph = "prepares to fire at *TARGET*!" //A message shown when the mob prepares to fire; use *TARGET* if you want to show the target's name
-	var/ranged_telegraph_sound //A sound played when the mob prepares to fire
-	var/ranged_telegraph_time = 0 //In deciseconds, how long between the telegraph and ranged shot
 	var/ranged_ignores_vision = FALSE //if it'll fire ranged attacks even if it lacks vision on its target, only works with environment smash
 	var/check_friendly_fire = 0 // Should the ranged mob check for friendlies when shooting
 	var/retreat_distance = null //If our mob runs from players when they're too close, set in tile distance. By default, mobs do not retreat.
@@ -231,9 +228,6 @@
 	if(!target || !CanAttack(target))
 		LoseTarget()
 		return 0
-	if(ismob(target.loc))
-		LoseTarget()
-		return 0
 	if(target in possible_targets)
 		if(target.z != z)
 			LoseTarget()
@@ -241,14 +235,7 @@
 		var/target_distance = get_dist(targets_from,target)
 		if(ranged) //We ranged? Shoot at em
 			if(!target.Adjacent(targets_from) && ranged_cooldown <= world.time) //But make sure they're not in range for a melee attack and our range attack is off cooldown
-				if(!ranged_telegraph_time || client)
-					OpenFire(target)
-				else
-					if(ranged_telegraph)
-						visible_message("<span class='danger'>[src] [replacetext(ranged_telegraph, "*TARGET*", "[target]")]</span>")
-					if(ranged_telegraph_sound)
-						playsound(src, ranged_telegraph_sound, 75, FALSE)
-					addtimer(CALLBACK(src, .proc/OpenFire, target), ranged_telegraph_time)
+				OpenFire(target)
 		if(!Process_Spacemove()) //Drifting
 			walk(src,0)
 			return 1
@@ -412,7 +399,6 @@ mob/living/simple_animal/hostile/proc/DestroySurroundings() // for use with mega
 			DestroyObjectsInDirection(dir)
 
 
-
 /mob/living/simple_animal/hostile/proc/EscapeConfinement()
 	if(buckled)
 		buckled.attack_animal(src)

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

@@ -114,7 +114,7 @@ Difficulty: Medium
 		if(L.stat == DEAD)
 			visible_message("<span class='danger'>[src] butchers [L]!</span>",
 			"<span class='userdanger'>You butcher [L], restoring your health!</span>")
-			if(!(z in GLOB.station_z_levels && !client)) //NPC monsters won't heal while on station
+			if(!(z in GLOB.station_z_levels) || client) //NPC monsters won't heal while on station
 				if(guidance)
 					adjustHealth(-L.maxHealth)
 				else
@@ -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

@@ -192,7 +192,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/megafauna/megafauna.dm

@@ -89,15 +89,11 @@
 	. = ..()
 	if(. && isliving(target))
 		var/mob/living/L = target
-		if(L.stat >= SOFT_CRIT)
-			if(vore_active == TRUE && L.devourable == TRUE)
-				dragon_feeding(src,L)
-			else if(L.stat == DEAD)
-				devour(L)
+		if(L.stat != DEAD)
+			if(!client && ranged && ranged_cooldown <= world.time)
+				OpenFire()
 		else
-			if(L.stat != DEAD)
-				if(!client && ranged && ranged_cooldown <= world.time)
-					OpenFire()
+			devour(L)
 
 /mob/living/simple_animal/hostile/megafauna/proc/devour(mob/living/L)
 	if(!L)
@@ -105,7 +101,7 @@
 	visible_message(
 		"<span class='danger'>[src] devours [L]!</span>",
 		"<span class='userdanger'>You feast on [L], restoring your health!</span>")
-	if(!(z in GLOB.station_z_levels && !client)) //NPC monsters won't heal while on station
+	if(!(z in GLOB.station_z_levels) || client) //NPC monsters won't heal while on station
 		adjustBruteLoss(-L.maxHealth/2)
 	L.gib()
 

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

@@ -14,9 +14,6 @@
 	ranged = 1
 	ranged_message = "stares"
 	ranged_cooldown_time = 30
-	ranged_telegraph = "gathers energy and stares at *TARGET*!"
-	ranged_telegraph_sound = 'sound/magic/magic_missile.ogg'
-	ranged_telegraph_time = 7
 	throw_message = "does nothing against the hard shell of"
 	vision_range = 2
 	speed = 3
@@ -74,11 +71,9 @@
 	melee_damage_lower = 15
 	melee_damage_upper = 15
 	attacktext = "impales"
-	ranged_telegraph = "fixates on *TARGET* as its eye shines blue!"
-	ranged_telegraph_sound = 'sound/magic/tail_swing.ogg'
-	ranged_telegraph_time = 5
 	a_intent = INTENT_HARM
 	speak_emote = list("telepathically cries")
+	attack_sound = 'sound/weapons/bladeslice.ogg'
 	stat_attack = UNCONSCIOUS
 	movement_type = FLYING
 	robust_searching = 1

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

@@ -127,7 +127,7 @@
 
 /mob/living/simple_animal/parrot/death(gibbed)
 	if(held_item)
-		held_item.loc = src.loc
+		held_item.forceMove(drop_location())
 		held_item = null
 	walk(src,0)
 
@@ -702,7 +702,7 @@
 				continue
 
 			held_item = I
-			I.loc = src
+			I.forceMove(src)
 			visible_message("[src] grabs [held_item]!", "<span class='notice'>You grab [held_item]!</span>", "<span class='italics'>You hear the sounds of wings flapping furiously.</span>")
 			return held_item
 
@@ -777,7 +777,7 @@
 	if(!drop_gently)
 		if(istype(held_item, /obj/item/grenade))
 			var/obj/item/grenade/G = held_item
-			G.loc = src.loc
+			G.forceMove(drop_location())
 			G.prime()
 			to_chat(src, "You let go of [held_item]!")
 			held_item = null
@@ -785,7 +785,7 @@
 
 	to_chat(src, "You drop [held_item].")
 
-	held_item.loc = src.loc
+	held_item.forceMove(drop_location())
 	held_item = null
 	return 1
 
@@ -801,7 +801,7 @@
 		for(var/atom/movable/AM in view(src,1))
 			for(var/perch_path in desired_perches)
 				if(istype(AM, perch_path))
-					src.loc = AM.loc
+					src.forceMove(AM.loc)
 					icon_state = icon_sit
 					return
 	to_chat(src, "<span class='warning'>There is no perch nearby to sit on!</span>")
@@ -838,7 +838,7 @@
 /mob/living/simple_animal/parrot/proc/perch_on_human(mob/living/carbon/human/H)
 	if(!H)
 		return
-	loc = get_turf(H)
+	forceMove(get_turf(H))
 	H.buckle_mob(src, force=1)
 	pixel_y = 9
 	pixel_x = pick(-8,8) //pick left or right shoulder
@@ -996,11 +996,12 @@
 		return
 	var/datum/disease/parrot_possession/P = new
 	P.parrot = src
-	loc = H
+	forceMove(H)
 	H.ForceContractDisease(P)
 	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/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)
@@ -45,6 +43,10 @@
 
 		client.change_view(CONFIG_GET(string/default_view)) // Resets the client.view in case it was changed.
 
+		if(client.player_details.player_actions.len)
+			for(var/datum/action/A in client.player_details.player_actions)
+				A.Grant(src)
+
 	if(!GLOB.individual_log_list[ckey])
 		GLOB.individual_log_list[ckey] = logging
 	else

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,15 +21,11 @@
 	*/
 	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

code/modules/mob/mob_helpers.dm

@@ -363,7 +363,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
 				if(M.mind in SSticker.mode.cult)
 					return 2
 			if("nuclear")
-				if(M.mind in SSticker.mode.syndicates)
+				if(M.mind.has_antag_datum(/datum/antagonist/nukeop,TRUE))
 					return 2
 			if("changeling")
 				if(M.mind.has_antag_datum(/datum/antagonist/changeling,TRUE))

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)
@@ -107,26 +25,30 @@
 				return
 			mob.control_object.setDir(direct)
 		else
-			mob.control_object.loc = get_step(mob.control_object,direct)
+			mob.control_object.forceMove(get_step(mob.control_object,direct))
 	return
 
 #define MOVEMENT_DELAY_BUFFER 0.75
 #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)
@@ -186,7 +114,7 @@
 	if(LAZYLEN(mob.user_movement_hooks))
 		for(var/obj/O in mob.user_movement_hooks)
 			O.intercept_user_move(direct, mob, n, oldloc)
-	
+
 	var/atom/movable/P = mob.pulling
 	if(P && !ismob(P) && P.density)
 		mob.dir = turn(mob.dir, 180)

code/modules/mob/say.dm

@@ -5,7 +5,8 @@
 	if(GLOB.say_disabled)	//This is here to try to identify lag problems
 		to_chat(usr, "<span class='danger'>Speech is currently admin-disabled.</span>")
 		return
-	usr.say(message)
+	if(message)
+		say(message)
 
 
 /mob/verb/whisper_verb(message as text)

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/transform_procs.dm

@@ -58,7 +58,6 @@
 		O.suiciding = suiciding
 	if(hellbound)
 		O.hellbound = hellbound
-	O.loc = loc
 	O.a_intent = INTENT_HARM
 
 	//keep viruses?
@@ -113,7 +112,7 @@
 	var/obj/item/bodypart/chest/torso = O.get_bodypart("chest")
 	if(cavity_object)
 		torso.cavity_item = cavity_object //cavity item is given to the new chest
-		cavity_object.loc = O
+		cavity_object.forceMove(O)
 
 	for(var/missing_zone in missing_bodyparts_zones)
 		var/obj/item/bodypart/BP = O.get_bodypart(missing_zone)
@@ -220,8 +219,6 @@
 	if(hellbound)
 		O.hellbound = hellbound
 
-	O.loc = loc
-
 	//keep viruses?
 	if (tr_flags & TR_KEEPVIRUS)
 		O.viruses = viruses
@@ -276,7 +273,7 @@
 	var/obj/item/bodypart/chest/torso = get_bodypart("chest")
 	if(cavity_object)
 		torso.cavity_item = cavity_object //cavity item is given to the new chest
-		cavity_object.loc = O
+		cavity_object.forceMove(O)
 
 	for(var/missing_zone in missing_bodyparts_zones)
 		var/obj/item/bodypart/BP = O.get_bodypart(missing_zone)
@@ -401,7 +398,6 @@
 			R.mmi.brainmob.real_name = real_name //the name of the brain inside the cyborg is the robotized human's name.
 			R.mmi.brainmob.name = real_name
 
-	R.loc = loc
 	R.job = "Cyborg"
 	R.notify_ai(NEW_BORG)
 
@@ -472,11 +468,7 @@
 	qdel(src)
 
 /mob/proc/become_overmind(starting_points = 60)
-	var/turf/T = get_turf(loc) //just to avoid messing up in lockers
-	var/area/A = get_area(T)
-	if(((A && !A.blob_allowed) || !(T.z in GLOB.station_z_levels)) && LAZYLEN(GLOB.blobstart))
-		T = get_turf(pick(GLOB.blobstart))
-	var/mob/camera/blob/B = new /mob/camera/blob(T, starting_points)
+	var/mob/camera/blob/B = new /mob/camera/blob(get_turf(src), starting_points)
 	B.key = key
 	. = B
 	qdel(src)