Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

modular_citadel/code/modules/custom_loadout/custom_items.dm

@@ -322,31 +322,6 @@
 	name = "worn pet collar"
 	desc = "a pet collar that looks well used."
 
-/obj/item/clothing/neck/petcollar/naomi/examine(mob/user)
-	. = ..()
-	if(usr.ckey != "technicalmagi")
-		to_chat(user, "There's something odd about the it. You probably shouldn't wear it...")//warn people not to wear it if they're not Naomi, lest they become as crazy as she is
-
-/obj/item/clothing/neck/petcollar/naomi/equipped()
-	. = ..()
-	START_PROCESSING(SSobj, src)
-
-/obj/item/clothing/neck/petcollar/naomi/dropped()
-	. = ..()
-	STOP_PROCESSING(SSobj, src)
-
-/obj/item/clothing/neck/petcollar/naomi/process()
-	var/mob/living/carbon/human/H
-	if(ishuman(loc))
-		H = loc
-	if(!H)
-		return
-	else if(H.get_item_by_slot(SLOT_NECK) == src)
-		if(H.arousalloss < H.max_arousal / 3)
-			H.arousalloss = H.max_arousal / 3
-		if(prob(5) && H.hallucination < 15)
-			H.hallucination += 10
-
 /obj/item/clothing/neck/cloak/green
 	name = "Generic Green Cloak"
 	desc = "This cloak doesn't seem too special."

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

@@ -1,36 +1,20 @@
-/mob/living/carbon/human/species/mammal
-	race = /datum/species/mammal
-
-/mob/living/carbon/human/species/avian
-	race = /datum/species/avian
-
-/mob/living/carbon/human/species/aquatic
-	race = /datum/species/aquatic
-
-/mob/living/carbon/human/species/insect
-	race = /datum/species/insect
-
-/mob/living/carbon/human/species/xeno
-	race = /datum/species/xeno
-
-/mob/living/carbon/human/species/ipc
-	race = /datum/species/ipc
-
-/mob/living/carbon/human/species/roundstartslime
-	race = /datum/species/jelly/roundstartslime
-
 /mob/living/carbon/human/resist()
 	. = ..()
 	if(wear_suit && wear_suit.breakouttime)//added in human cuff breakout proc
+
+/mob/living/proc/resist_embedded()
+	return
+
+/mob/living/carbon/human/resist_embedded()
+	if(handcuffed || legcuffed || (wear_suit && wear_suit.breakouttime))
 		return
-	if(.)
-		if(canmove && !on_fire)
-			for(var/obj/item/bodypart/L in bodyparts)
-				if(istype(L) && L.embedded_objects.len)
-					for(var/obj/item/I in L.embedded_objects)
-						if(istype(I) && I.w_class >= WEIGHT_CLASS_NORMAL)	//minimum weight class to insta-ripout via resist
-							remove_embedded_unsafe(L, I, src, 1.5)	//forcefully call the remove embedded unsafe proc but with extra pain multiplier. if you want to remove it less painfully, examine and remove it carefully.
-							return FALSE //Hands are occupied
+	if(canmove && !on_fire)
+		for(var/obj/item/bodypart/L in bodyparts)
+			if(istype(L) && L.embedded_objects.len)
+				for(var/obj/item/I in L.embedded_objects)
+					if(istype(I) && I.w_class >= WEIGHT_CLASS_NORMAL)	//minimum weight class to insta-ripout via resist
+						remove_embedded_unsafe(L, I, src, 1.5)	//forcefully call the remove embedded unsafe proc but with extra pain multiplier. if you want to remove it less painfully, examine and remove it carefully.
+						return TRUE //Hands are occupied
 	return
 
 /mob/living/carbon/human/proc/remove_embedded_unsafe(obj/item/bodypart/L, obj/item/I, mob/user, painmul = 1)

modular_citadel/code/modules/vore/eating/belly_obj_vr.dm

@@ -152,11 +152,13 @@
 		SSbellies.belly_list += src
 
 /obj/belly/Destroy()
-	SSbellies.belly_list -= src
 	if(owner)
-		owner.vore_organs -= src
-		owner = null
-	. = ..()
+		Remove(owner)
+	return ..()
+
+/obj/belly/proc/Remove(mob/living/owner)
+	owner.vore_organs -= src
+	owner = null
 
 // Called whenever an atom enters this belly
 /obj/belly/Entered(var/atom/movable/thing,var/atom/OldLoc)

modular_citadel/code/modules/vore/eating/bellymodes_vr.dm

@@ -4,10 +4,16 @@
 		recent_sound = FALSE
 		return SSBELLIES_IGNORED
 
+	if(!owner)
+		qdel(src)
+		SSbellies.belly_list -= src
+		return SSBELLIES_PROCESSED
+
 	if(loc != owner)
-		if(istype(owner))
-			loc = owner
+		if(isliving(owner)) //we don't have machine based bellies. (yet :honk:)
+			forceMove(owner)
 		else
+			SSbellies.belly_list -= src
 			qdel(src)
 			return SSBELLIES_PROCESSED