Makes proteans gib on death

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

@@ -1,5 +1,6 @@
 /mob/living/carbon/human/gib()
 
+<<<<<<< HEAD
 	//Drop the NIF, they're expensive, why not recover them? Also important for prometheans.
 	if(nif)
 		var/obj/item/device/nif/deadnif = nif //Unimplant removes the reference on the mob
@@ -7,6 +8,18 @@
 		deadnif.forceMove(drop_location())
 		deadnif.throw_at(get_edge_target_turf(src,pick(alldirs)), rand(1,3), round(30/deadnif.w_class))
 		deadnif.wear(10) //Presumably it's gone through some shit if they got gibbed?
+=======
+	//Drop the NIF, they're expensive, why not recover them?
+	if(nif)
+		var/obj/item/device/nif/deadnif = nif //Unimplant removes the reference on the mob
+		if(!deadnif.gib_nodrop)
+			deadnif.unimplant(src)
+			deadnif.forceMove(drop_location())
+			deadnif.throw_at(get_edge_target_turf(src,pick(alldirs)), rand(1,3), round(30/deadnif.w_class))
+			deadnif.wear(10) //Presumably it's gone through some shit if they got gibbed?
+
+	. = ..()
+>>>>>>> a9cb5cae72... Merge pull request #11952 from Heroman3003/proteanfix
 
 	. = ..()
 /* CHOMPEdit - Removed because we don't use resleeving sickness.

code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm

@@ -185,13 +185,9 @@
 
 	to_chat(H, "<span class='warning'>You died as a Protean. Please sit out of the round for at least 5 or 10 minutes before respawning, to represent the time it would take to ship a new-you to the station, depending on how you died.</span>")
 
-	for(var/obj/item/organ/I in H.internal_organs)
-		I.removed()
-
-	for(var/obj/item/I in H.contents)
-		H.drop_from_inventory(I)
-
-	qdel(H)
+	spawn(1)
+		if(H)
+			H.gib()
 
 /datum/species/protean/handle_environment_special(var/mob/living/carbon/human/H)
 	if((H.getActualBruteLoss() + H.getActualFireLoss()) > H.maxHealth*0.5 && isturf(H.loc)) //So, only if we're not a blob (we're in nullspace) or in someone (or a locker, really, but whatever)

code/modules/nifsoft/nif.dm

@@ -28,6 +28,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
 
 	var/durability = 100					// Durability remaining
 	var/bioadap = FALSE						// If it'll work in fancy species
+	var/gib_nodrop = FALSE					// NIF self-destructs when owner is gibbed
 
 	var/tmp/power_usage = 0						// Nifsoft adds to this
 	var/tmp/mob/living/carbon/human/human		// Our owner!
@@ -613,6 +614,16 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
 	durability = 75
 	bioadap = TRUE
 
+<<<<<<< HEAD
+=======
+/obj/item/device/nif/protean				// Proteans' integrated NIF
+	name = "protean integrated NIF"
+	desc = "A NIF that is part of a protean's body structure. Where did you get that anyway?"
+	durability = 25
+	bioadap = TRUE
+	gib_nodrop = TRUE
+
+>>>>>>> a9cb5cae72... Merge pull request #11952 from Heroman3003/proteanfix
 ////////////////////////////////
 // Special Promethean """surgery"""
 /obj/item/device/nif/attack(mob/living/M, mob/living/user, var/target_zone)

code/modules/vore/eating/digest_act_vr.dm

@@ -155,6 +155,10 @@
 	//Replace this with a VORE setting so all types of posibrains can/can't be digested on a whim
 	return FALSE
 
+/obj/item/organ/internal/nano/digest_act(atom/movable/item_storage = null)
+	//Make proteans recoverable too
+	return FALSE
+
 // Gradual damage measurement
 /obj/item
 	var/digest_stage = null