Merge branch 'master' into master

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

@@ -149,7 +149,7 @@
 		if(H.hallucination >= hallucination_cap && H.loneliness_stage >= warning_cap)
 			return
 		// Vored? Not gonna get frightened.
-		if(ishuman(H.loc))
+		if(isbelly(H.loc))
 			if(H.loneliness_stage > 0)
 				H.loneliness_stage -= 4
 			return

code/modules/nifsoft/software/05_health.dm

@@ -43,7 +43,7 @@
 			else if(mode == 2 && HP_percent < -0.4)
 				nif.notify("User Status: CRITICAL. Notifying medical, and starting emergency stasis!",TRUE)
 				mode = 3
-				if(!ishuman(H.loc)) //Not notified in case of vore, for gameplay purposes.
+				if(!isbelly(H.loc)) //Not notified in case of vore, for gameplay purposes.
 					var/turf/T = get_turf(H)
 					var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset/heads/captain(null)
 					a.autosay("[H.real_name] has been put in emergency stasis, located at ([T.x],[T.y],[T.z])!", "[H.real_name]'s NIF", "Medical")