Merge pull request #12245 from Fox-McCloud/universal-damage

Universal Object Damage

code/modules/surgery/organs/augments_arms.dm

@@ -86,7 +86,7 @@
 	holder = item
 
 	holder.flags |= NODROP
-	holder.unacidable = 1
+	holder.resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 	holder.slot_flags = null
 	holder.w_class = WEIGHT_CLASS_HUGE
 	holder.materials = null

code/modules/surgery/organs/organ_internal.dm

@@ -191,7 +191,7 @@
 	w_class = WEIGHT_CLASS_TINY
 	parent_organ = "head"
 	slot = "brain_tumor"
-	health = 3
+	max_integrity = 3
 
 /obj/item/organ/internal/shadowtumor/New()
 	..()
@@ -205,11 +205,11 @@
 	if(isturf(loc))
 		var/turf/T = loc
 		var/light_count = T.get_lumcount()*10
-		if(light_count > 4 && health > 0) //Die in the light
-			health--
-		else if(light_count < 2 && health < 3) //Heal in the dark
-			health++
-		if(health <= 0)
+		if(light_count > 4 && obj_integrity > 0) //Die in the light
+			obj_integrity--
+		else if(light_count < 2 && obj_integrity < max_integrity) //Heal in the dark
+			obj_integrity++
+		if(obj_integrity <= 0)
 			visible_message("<span class='warning'>[src] collapses in on itself!</span>")
 			qdel(src)
 
@@ -223,7 +223,6 @@
 	w_class = WEIGHT_CLASS_TINY
 	parent_organ = "head"
 	slot = "brain_tumor"
-	health = 3
 	var/organhonked = 0
 	var/suffering_delay = 900
 	var/datum/component/waddle
@@ -297,7 +296,6 @@
 	w_class = WEIGHT_CLASS_TINY
 	parent_organ = "groin"
 	slot = "honk_bladder"
-	health = 3
 	var/datum/component/squeak
 
 /obj/item/organ/internal/honkbladder/insert(mob/living/carbon/M, special = 0)

code/modules/surgery/organs/subtypes/skrell.dm

@@ -46,7 +46,8 @@
 	. = ..()
 
 /obj/item/organ/internal/headpocket/proc/empty_contents()
-	pocket.empty_object_contents(0, get_turf(owner))
+	for(var/obj/item/I in pocket.contents)
+		pocket.remove_from_storage(I, get_turf(owner))
 
 /obj/item/organ/internal/headpocket/proc/get_contents()
 	return pocket.contents