Merge pull request #241 from Very-Soft/itsawildtimetobeatummylover

Just a liddol ol thang

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

@@ -1614,6 +1614,12 @@
 /mob/living/carbon/human/can_feel_pain(var/obj/item/organ/check_organ)
 	if(isSynthetic())
 		return 0
+	//RS ADD START
+	if(!species.digest_pain && (isbelly(src.loc) || istype(src.loc, /turf/simulated/floor/water/digestive_enzymes)))
+		var/obj/belly/b = src.loc
+		if(b.digest_mode == DM_DIGEST || b.digest_mode == DM_SELECT)
+			return FALSE
+	//RS ADD END
 	for(var/datum/modifier/M in modifiers)
 		if(M.pain_immunity == TRUE)
 			return 0

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

@@ -1,8 +1,9 @@
 /datum/species
 	var/vore_belly_default_variant = "H"
+	var/digest_pain = TRUE
 
 /datum/species/unathi
 	vore_belly_default_variant = "L"
 
 /datum/species/teshari
-	vore_belly_default_variant = "T"
+	vore_belly_default_variant = "T"

code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm

@@ -1008,3 +1008,11 @@
 	desc = "Makes your nice clawed, scaled, hooved, armored, or otherwise just awfully calloused feet immune to glass shards."
 	cost = 0
 	var_changes = list("flags" = NO_MINOR_CUT) //Checked the flag is only used by shard stepping.
+//RS ADD
+/datum/trait/neutral/nodigestpain
+	name = "Painless Digestion"
+	desc = "Makes it so that you feel no pain from being digested, even if you otherwise would."
+	cost = 0
+	var_changes = list("digest_pain" = FALSE)
+	custom_only = FALSE
+	can_take = ORGANICS

code/modules/vore/eating/belly_obj_vr.dm

@@ -449,7 +449,7 @@
 // Release all contents of this belly into the owning mob's location.
 // If that location is another mob, contents are transferred into whichever of its bellies the owning mob is in.
 // Returns the number of mobs so released.
-/obj/belly/proc/release_all_contents(include_absorbed = FALSE, silent = FALSE)
+/obj/belly/proc/release_all_contents(include_absorbed = FALSE, silent = FALSE, include_bones = FALSE)	//RS EDIT
 	//Don't bother if we don't have contents
 	if(!contents.len)
 		return FALSE
@@ -463,6 +463,8 @@
 			var/mob/living/L = AM
 			if(L.absorbed && !include_absorbed)
 				continue
+		if(istype(AM, /obj/item/weapon/digestion_remains) && !include_bones)	// RS ADD
+			continue	//RS ADD
 		count += release_specific_contents(AM, silent = TRUE)
 
 	//Clean up our own business

code/modules/vore/eating/living_vr.dm

@@ -317,7 +317,7 @@
 //
 /mob/living/proc/release_vore_contents(var/include_absorbed = TRUE, var/silent = FALSE)
 	for(var/obj/belly/B as anything in vore_organs)
-		B.release_all_contents(include_absorbed, silent)
+		B.release_all_contents(include_absorbed, silent, TRUE)	//RS EDIT
 
 //
 // Returns examine messages for bellies

code/modules/vore/eating/vorepanel_vr.dm

@@ -737,8 +737,19 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
 				if(host.stat)
 					to_chat(user,"<span class='warning'>You can't do that in your state!</span>")
 					return TRUE
+				//RS ADD START
+				var/bones_detected = FALSE
+				var/bone_time = FALSE
+				for(var/thing in host.vore_selected.contents)
+					if(istype(thing, /obj/item/weapon/digestion_remains))
+						bones_detected = TRUE
+						break
+				if(bones_detected)
+					if(tgui_alert(user, "Do you want to include the remains that are inside your [lowertext(host.vore_selected)]?","",list("Yes","No")) == "Yes")
+						bone_time = TRUE
+				//RS ADD END
 
-				host.vore_selected.release_all_contents()
+				host.vore_selected.release_all_contents(include_bones = bone_time)	//RS EDIT
 				return TRUE
 
 			if("Move all")