Improves the quality of life of Cluwnes

code/modules/surgery/organs/organ_internal.dm

@@ -9,6 +9,7 @@
 	// DO NOT add slots with matching names to different zones - it will break internal_organs_slot list!
 	vital = 0
 	var/non_primary = 0
+	var/unremovable = FALSE //Whether it shows up as an option to remove during surgery.
 
 /obj/item/organ/internal/New(var/mob/living/carbon/holder)
 	..()
@@ -283,7 +284,6 @@
 
 
 /obj/item/organ/internal/lungs/on_life()
-	..()
 	if(germ_level > INFECTION_LEVEL_ONE)
 		if(prob(5))
 			owner.emote("cough")		//respitory tract infection
@@ -305,7 +305,6 @@
 	slot = "kidneys"
 
 /obj/item/organ/internal/kidneys/on_life()
-	..()
 	// Coffee is really bad for you with busted kidneys.
 	// This should probably be expanded in some way, but fucked if I know
 	// what else kidneys can process in our reagent list.
@@ -418,7 +417,6 @@
 	var/alcohol_intensity = 1
 
 /obj/item/organ/internal/liver/on_life()
-	..()
 	if(germ_level > INFECTION_LEVEL_ONE)
 		if(prob(1))
 			to_chat(owner, "<span class='warning'> Your skin itches.</span>")
@@ -536,10 +534,6 @@
 	var/organhonked = 0
 	var/suffering_delay = 900
 
-/obj/item/organ/internal/honktumor/New()
-	..()
-	processing_objects.Add(src)
-
 /obj/item/organ/internal/honktumor/insert(mob/living/carbon/M, special = 0)
 	..()
 	M.mutations.Add(CLUMSY)
@@ -559,23 +553,9 @@
 	M.dna.SetSEState(COMICBLOCK,0)
 	genemutcheck(M,CLUMSYBLOCK,null,MUTCHK_FORCED)
 	genemutcheck(M,COMICBLOCK,null,MUTCHK_FORCED)
-
-/obj/item/organ/internal/honktumor/Destroy()
-	processing_objects.Remove(src)
-	return ..()
-
-/obj/item/organ/internal/honktumor/process()
-	if(isturf(loc))
-		visible_message("<span class='warning'>[src] honks in on itself!</span>")
-		new /obj/item/weapon/grown/bananapeel(get_turf(loc))
-		qdel(src)
-
+	qdel(src)
 
 /obj/item/organ/internal/honktumor/on_life()
-
-	if(!owner)
-		return
-
 	if(organhonked < world.time)
 		organhonked = world.time + suffering_delay
 		to_chat(owner, "<font color='red' size='7'>HONK</font>")
@@ -590,7 +570,7 @@
 		else
 			owner.Jitter(500)
 
-		if(istype(owner, /mob/living/carbon/human))
+		if(ishuman(owner))
 			var/mob/living/carbon/human/H = owner
 			if(isobj(H.shoes))
 				var/thingy = H.shoes
@@ -599,17 +579,15 @@
 					spawn(20)
 						if(thingy)
 							walk(thingy,0)
-	..()
 
 /obj/item/organ/internal/honktumor/cursed
+	unremovable = TRUE
 
-/obj/item/organ/internal/honktumor/cursed/remove(mob/living/carbon/M, special = 0, clean_remove = 0)
-	. = ..()
-	if(!clean_remove)
-		visible_message("<span class='warning'>[src] vanishes into dust, and a [M] emits a loud honk!</span>", "<span class='notice'>You hear a loud honk.</span>")
-		insert(M) //You're not getting away that easily!
-	else
-		qdel(src)
+/obj/item/organ/internal/honktumor/cursed/on_life() //No matter what you do, no matter who you are, no matter where you go, you're always going to be a fat, stuttering dimwit.
+	..()
+	owner.setBrainLoss(80)
+	owner.nutrition = 9000
+	owner.overeatduration = 9000
 
 /obj/item/organ/internal/beard
 	name = "beard organ"

code/modules/surgery/organs_internal.dm

@@ -169,6 +169,8 @@
 			return -1
 
 		for(var/obj/item/organ/internal/O in organs)
+			if(O.unremovable)
+				continue
 			O.on_find(user)
 			organs -= O
 			organs[O.name] = O