Removes dangling references to corgis and constructs.

code/_macros.dm

@@ -18,7 +18,7 @@
 
 #define iscarbon(A) istype(A, /mob/living/carbon)
 
-#define iscorgi(A) istype(A, /mob/living/simple_animal/corgi)
+#define iscorgi(A) istype(A, /mob/living/simple_mob/animal/passive/dog/corgi)
 
 #define isEye(A) istype(A, /mob/observer/eye)
 

code/_onclick/hud/other_mobs.dm

@@ -94,9 +94,6 @@
 	return
 */
 
-/mob/living/simple_animal/construct/instantiate_hud(var/datum/hud/HUD)
-	..(HUD)
-
 //	HUD.construct_hud() //Archaic.
 /*
 /datum/hud/proc/construct_hud()

code/datums/mind.dm

@@ -527,11 +527,11 @@
 	mind.special_role = ""
 
 //Animals
-/mob/living/simple_animal/mind_initialize()
+/mob/living/simple_mob/mind_initialize()
 	. = ..()
-	mind.assigned_role = "Animal"
+	mind.assigned_role = "Simple Mob"
 
-/mob/living/simple_animal/corgi/mind_initialize()
+/mob/living/simple_mob/animal/passive/dog/corgi/mind_initialize()
 	. = ..()
 	mind.assigned_role = "Corgi"
 

code/game/antagonist/station/cultist.dm

@@ -111,12 +111,12 @@ var/datum/antagonist/cultist/cult
 	. = ..()
 	if(.)
 		player << "You catch a glimpse of the Realm of Nar-Sie, the Geometer of Blood. You now see how flimsy the world is, you see that it should be open to the knowledge of That Which Waits. Assist your new compatriots in their dark dealings. Their goals are yours, and yours are theirs. You serve the Dark One above all else. Bring It back."
-		if(player.current && !istype(player.current, /mob/living/simple_animal/construct))
+		if(player.current && !istype(player.current, /mob/living/simple_mob/construct))
 			player.current.add_language(LANGUAGE_CULT)
 
 /datum/antagonist/cultist/remove_antagonist(var/datum/mind/player, var/show_message, var/implanted)
 	. = ..()
-	if(. && player.current && !istype(player.current, /mob/living/simple_animal/construct))
+	if(. && player.current && !istype(player.current, /mob/living/simple_mob/construct))
 		player.current.remove_language(LANGUAGE_CULT)
 
 /datum/antagonist/cultist/can_become_antag(var/datum/mind/player)

code/game/gamemodes/cult/cult_items.dm

@@ -14,7 +14,7 @@
 	return
 
 /obj/item/weapon/melee/cultblade/attack(mob/living/M, mob/living/user, var/target_zone)
-	if(iscultist(user) && !istype(user, /mob/living/simple_animal/construct))
+	if(iscultist(user) && !istype(user, /mob/living/simple_mob/construct))
 		return ..()
 
 	var/zone = (user.hand ? "l_arm":"r_arm")
@@ -25,7 +25,7 @@
 		//random amount of damage between half of the blade's force and the full force of the blade.
 		user.apply_damage(rand(force/2, force), BRUTE, zone, 0, sharp=1, edge=1)
 		user.Weaken(5)
-	else if(!istype(user, /mob/living/simple_animal/construct))
+	else if(!istype(user, /mob/living/simple_mob/construct))
 		to_chat(user, "<span class='danger'>An inexplicable force rips through you, tearing the sword from your grasp!</span>")
 	else
 		to_chat(user, "<span class='critical'>The blade hisses, forcing itself from your manipulators. \The [src] will only allow mortals to wield it against foes, not kin.</span>")
@@ -39,10 +39,10 @@
 	return 1
 
 /obj/item/weapon/melee/cultblade/pickup(mob/living/user as mob)
-	if(!iscultist(user) && !istype(user, /mob/living/simple_animal/construct))
+	if(!iscultist(user) && !istype(user, /mob/living/simple_mob/construct))
 		to_chat(user, "<span class='warning'>An overwhelming feeling of dread comes over you as you pick up the cultist's sword. It would be wise to be rid of this blade quickly.</span>")
 		user.make_dizzy(120)
-	if(istype(user, /mob/living/simple_animal/construct))
+	if(istype(user, /mob/living/simple_mob/construct))
 		to_chat(user, "<span class='warning'>\The [src] hisses, as it is discontent with your acquisition of it. It would be wise to return it to a worthy mortal quickly.</span>")
 
 /obj/item/clothing/head/culthood

code/game/gamemodes/technomancer/spells/abjuration.dm

@@ -29,8 +29,8 @@
 			else
 				visible_message("<span class='notice'>\The [L] vanishes!</span>")
 				qdel(L)
-		else if(istype(L, /mob/living/simple_animal/construct))
-			var/mob/living/simple_animal/construct/evil = L
+		else if(istype(L, /mob/living/simple_mob/construct))
+			var/mob/living/simple_mob/construct/evil = L
 			evil << "<span class='danger'>\The [user]'s abjuration purges your form!</span>"
 			evil.purge = 3
 		adjust_instability(5)

code/game/gamemodes/technomancer/spells/control.dm

@@ -26,7 +26,7 @@
 		/mob/living/simple_animal/cat,
 		/mob/living/simple_mob/animal/passive/chick,
 		/mob/living/simple_mob/animal/passive/chicken,
-		/mob/living/simple_animal/corgi,
+		/mob/living/simple_mob/animal/passive/dog/corgi,
 		/mob/living/simple_mob/animal/passive/cow,
 		/mob/living/simple_mob/animal/passive/crab,
 		/mob/living/simple_mob/animal/passive/lizard,

code/game/objects/structures/simple_doors.dm

@@ -206,6 +206,6 @@
 /obj/structure/simple_door/cult/TryToSwitchState(atom/user)
 	if(isliving(user))
 		var/mob/living/L = user
-		if(!iscultist(L) && !istype(L, /mob/living/simple_animal/construct))
+		if(!iscultist(L) && !istype(L, /mob/living/simple_mob/construct))
 			return
 	..()

code/modules/mob/_modifiers/unholy.dm

@@ -71,7 +71,7 @@
 
 /datum/modifier/repair_aura/tick()
 	spawn()
-		for(var/mob/living/simple_animal/construct/T in view(4,holder))
+		for(var/mob/living/simple_mob/construct/T in view(4,holder))
 			T.adjustBruteLoss(rand(-10,-15))
 			T.adjustFireLoss(rand(-10,-15))
 
@@ -110,7 +110,7 @@
 	spawn()
 		if(isliving(holder))
 			var/mob/living/L = holder
-			if(istype(L, /mob/living/simple_animal/construct))
+			if(istype(L, /mob/living/simple_mob/construct))
 				L.adjustBruteLoss(rand(-5,-10))
 				L.adjustFireLoss(rand(-5,-10))
 			else

code/modules/multiz/movement.dm

@@ -64,11 +64,13 @@
 /mob/proc/can_overcome_gravity()
 	return FALSE
 
-/mob/living/carbon/human/can_overcome_gravity()
-	return species && species.can_overcome_gravity(src)
+/mob/living/can_overcome_gravity()
+	return hovering
 
-/mob/living/simple_animal/construct/can_overcome_gravity()
-	return 1 //They care not for standard physics.
+/mob/living/carbon/human/can_overcome_gravity()
+	. = ..()
+	if(!.)
+		return species && species.can_overcome_gravity(src)
 
 /mob/observer/zMove(direction)
 	var/turf/destination = (direction == UP) ? GetAbove(src) : GetBelow(src)
@@ -98,33 +100,41 @@
 	return ..()
 
 /mob/observer/can_ztravel()
-	return 1
+	return TRUE
 
-/mob/living/simple_animal/construct/can_ztravel()
-	return 1
+/mob/living/can_ztravel()
+	if(incapacitated())
+		return FALSE
+	return hovering
 
 /mob/living/carbon/human/can_ztravel()
 	if(incapacitated())
-		return 0
+		return FALSE
+
+	if(hovering)
+		return TRUE
 
 	if(Process_Spacemove())
-		return 1
+		return TRUE
 
 	if(Check_Shoegrip())	//scaling hull with magboots
 		for(var/turf/simulated/T in trange(1,src))
 			if(T.density)
-				return 1
+				return TRUE
 
 /mob/living/silicon/robot/can_ztravel()
 	if(incapacitated() || is_dead())
-		return 0
+		return FALSE
+
+	if(hovering)
+		return TRUE
 
 	if(Process_Spacemove()) //Checks for active jetpack
-		return 1
+		return FALSE
 
 	for(var/turf/simulated/T in trange(1,src)) //Robots get "magboots"
 		if(T.density)
-			return 1
+			return TRUE
 
 // TODO - Leshana Experimental