[HOLY SHIT!]Charlie, lets go to candy mountain, charlie

code/_onclick/hud/action.dm

@@ -221,6 +221,22 @@
 /datum/action/item_action/hands_free
 	check_flags = AB_CHECK_ALIVE|AB_CHECK_INSIDE
 
+///prset for organ actions
+/datum/action/item_action/organ_action
+	check_flags = AB_CHECK_ALIVE
+
+/datum/action/item_action/organ_action/CheckRemoval(mob/living/carbon/user)
+	if(!iscarbon(user))
+		return 1
+	if(target in user.internal_organs)
+		return 0
+	return 1
+
+/datum/action/item_action/organ_action/IsAvailable()
+	var/obj/item/organ/internal/I = target
+	if(!I.owner)
+		return 0
+	return ..()
 
 //Preset for spells
 /datum/action/spell_action

code/datums/datumvars.dm

@@ -1006,7 +1006,7 @@ client
 			usr << "This can only be done to instances of type /mob/living/carbon"
 			return
 
-		var/obj/item/organ/rem_organ = input("Please choose an organ to remove.","Organ",null) as null|anything in M.internal_organs
+		var/obj/item/organ/internal/rem_organ = input("Please choose an organ to remove.","Organ",null) as null|anything in M.internal_organs
 
 		if(!M)
 			usr << "Mob doesn't exist anymore"
@@ -1017,7 +1017,7 @@ client
 			return
 
 		usr << "Removed [rem_organ] from [M]."
-		rem_organ.removed()
+		rem_organ.Remove(M)
 		message_admins("[key_name_admin(usr)] has removed the organ [rem_organ] from [key_name_admin(M)]")
 		log_admin("[key_name(usr)] has removed the organ [rem_organ] from [key_name(M)]")
 		qdel(rem_organ)

code/datums/spells/inflict_handler.dm

@@ -28,9 +28,11 @@
 			if("gib_brain")
 				if(ishuman(target))
 					var/mob/living/carbon/C = target
-					if(C.brain_op_stage != 4) // Their brain is already taken out
-						var/obj/item/organ/brain/B = new(C.loc)
+					var/obj/item/organ/internal/brain/B = C_target.get_int_organ(/obj/item/organ/internal/brain)//do we has brains?
+					if(B)
+						B.loc = get_turf(C_target)
 						B.transfer_identity(C)
+						C_target.internal_organs -= B
 				target.gib()
 			if("disintegrate")
 				target.dust()

code/datums/spells/summonitem.dm

@@ -24,7 +24,7 @@
 		if(!marked_item) //linking item to the spell
 			message = "<span class='notice'>"
 			for(var/obj/item in hand_items)
-				if(istype(item, /obj/item/organ/brain)) //Yeah, sadly this doesn't work due to the organ system.
+				if(istype(item, /obj/item/organ/internal/brain)) //Yeah, sadly this doesn't work due to the organ system.
 					break
 				marked_item = 		item
 				message += "You mark [item] for recall.</span>"

code/game/asteroid.dm

@@ -61,7 +61,7 @@ var/global/max_secret_rooms = 6
 			walltypes = list(/turf/simulated/wall/r_wall=2,/turf/simulated/wall=2,/turf/simulated/mineral/random/high_chance=1)
 			floortypes = list(/turf/simulated/floor,/turf/simulated/floor/engine)
 			treasureitems = list(/obj/machinery/bot/medbot/mysterious=1, /obj/item/weapon/circular_saw=1, /obj/structure/closet/critter/cat=2)
-			fluffitems = list(/obj/effect/decal/cleanable/blood=5,/obj/item/organ/appendix=2,/obj/structure/closet/crate/freezer=2,
+			fluffitems = list(/obj/effect/decal/cleanable/blood=5,/obj/item/organ/internal/appendix=2,/obj/structure/closet/crate/freezer=2,
 							  /obj/machinery/optable=1,/obj/item/weapon/scalpel=1,/obj/item/weapon/storage/firstaid/regular=3,
 							  /obj/item/weapon/tank/anesthetic=1, /obj/item/weapon/surgical_drapes=2, /obj/item/device/mass_spectrometer/adv=1,/obj/item/clothing/glasses/hud/health=1)
 
@@ -72,7 +72,7 @@ var/global/max_secret_rooms = 6
 			treasureitems = list(/obj/item/device/soulstone=1, /obj/item/clothing/suit/space/cult=1, /obj/item/weapon/bedsheet/cult=2,
 								 /obj/item/clothing/suit/cultrobes=2, /mob/living/simple_animal/hostile/creature=3)
 			fluffitems = list(/obj/effect/gateway=1,/obj/effect/gibspawner=1,/obj/structure/cult/talisman=1,/obj/item/toy/crayon/red=2,
-							  /obj/item/organ/heart=2, /obj/effect/decal/cleanable/blood=4,/obj/structure/table/woodentable=2,/obj/item/weapon/ectoplasm=3,
+							  /obj/item/organ/internal/heart=2, /obj/effect/decal/cleanable/blood=4,/obj/structure/table/woodentable=2,/obj/item/weapon/ectoplasm=3,
 							  /obj/item/clothing/head/helmet/space/cult=1, /obj/item/clothing/shoes/cult=1)
 
 		if("wizden")

code/game/gamemodes/changeling/powers/panacea.dm

@@ -10,6 +10,15 @@
 /obj/effect/proc_holder/changeling/panacea/sting_action(var/mob/user)
 
 	user << "<span class='notice'>We cleanse impurities from our form.</span>"
+
+	var/obj/item/organ/internal/body_egg/egg = user.get_int_organ(/obj/item/organ/internal/body_egg)
+	if(egg)
+		egg.Remove(user)
+		if(iscarbon(user))
+			var/mob/living/carbon/C = user
+			C.vomit(0)
+		egg.loc = get_turf(user)
+
 	user.reagents.add_reagent("mutadone", 10)
 	user.reagents.add_reagent("potass_iodide", 10)
 	user.reagents.add_reagent("charcoal", 20)

code/game/gamemodes/changeling/powers/revive.dm

@@ -57,7 +57,7 @@
 			O.trace_chemicals = list()
 			O.wounds = list()
 			O.wound_update_accuracy = 1
-		for(var/obj/item/organ/IO in H.internal_organs)
+		for(var/obj/item/organ/internal/IO in H.internal_organs)
 			IO.damage = 0
 			IO.trace_chemicals = list()
 		H.updatehealth()

code/game/gamemodes/cult/runes.dm

@@ -582,8 +582,8 @@ var/list/sacrificed = list()
 			if(!(iscultist(V)))
 				victims += V//Checks for cult status and mob type
 	for(var/obj/item/I in src.loc)//Checks for MMIs/brains/Intellicards
-		if(istype(I,/obj/item/organ/brain))
-			var/obj/item/organ/brain/B = I
+		if(istype(I,/obj/item/organ/internal/brain))
+			var/obj/item/organ/internal/brain/B = I
 			victims += B.brainmob
 		else if(istype(I,/obj/item/device/mmi))
 			var/obj/item/device/mmi/B = I

code/game/gamemodes/wizard/artefact.dm

@@ -461,7 +461,7 @@ var/global/list/multiverse = list()
 
 			if("cyborg")
 				if(M.get_species() != "Machine")
-					for(var/obj/item/organ/O in M.organs)
+					for(var/obj/item/organ/internal/O in M.organs)
 						O.robotize()
 				M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/eyepatch(M), slot_glasses)
 				M.equip_to_slot_or_del(sword, slot_r_hand)

code/game/gamemodes/wizard/godhand.dm

@@ -46,10 +46,11 @@
 	var/mob/M = target
 	if(ishuman(M) || issmall(M))
 		var/mob/living/carbon/C_target = M
-		var/obj/item/organ/brain/B
-		if(C_target.brain_op_stage != 4) // Their brain is already taken out
-			B = new(C_target.loc)
+		var/obj/item/organ/internal/brain/B = C_target.get_int_organ(/obj/item/organ/internal/brain)
+		if(B)
+			B.loc = get_turf(C_target)
 			B.transfer_identity(C_target)
+			C_target.internal_organs -= B
 	var/datum/effect/system/spark_spread/sparks = new
 	sparks.set_up(4, 0, M.loc) //no idea what the 0 is
 	sparks.start()

code/game/machinery/adv_med.dm

@@ -399,7 +399,7 @@
 			occupantData["extOrgan"] = extOrganData
 
 			var/intOrganData[0]
-			for(var/obj/item/organ/I in H.internal_organs)
+			for(var/obj/item/organ/internal/I in H.internal_organs)
 				var/organData[0]
 				organData["name"] = I.name
 				organData["desc"] = I.desc
@@ -579,7 +579,7 @@
 				else
 					dat += "<td>[e.name]</td><td>-</td><td>-</td><td>Not Found</td>"
 				dat += "</tr>"
-			for(var/obj/item/organ/i in occupant.internal_organs)
+			for(var/obj/item/organ/internal/i in occupant.internal_organs)
 				var/mech = i.desc
 				var/infection = "None"
 				switch (i.germ_level)

code/game/machinery/cloning.dm

@@ -132,7 +132,7 @@
 		if ((M.stat != 2) || (!M.client))
 			continue
 		//They need a brain!
-		if ((istype(M, /mob/living/carbon/human)) && (M:brain_op_stage >= 4.0))
+		if(istype(M, /mob/living/carbon/human) && !M.get_int_organ(/obj/item/organ/internal/brain))
 			continue
 
 		if (M.ckey == find_key)

code/game/machinery/computer/cloning.dm

@@ -349,7 +349,7 @@
 		scantemp = "<span class=\"bad\">Error: Unable to locate valid genetic data.</span>"
 		nanomanager.update_uis(src)
 		return
-	if (subject.brain_op_stage == 4.0)
+	if (!subject.get_int_organ(/obj/item/organ/internal/brain))
 		scantemp = "<span class=\"bad\">Error: No signs of intelligence detected.</span>"
 		nanomanager.update_uis(src)
 		return

code/game/machinery/flasher.dm

@@ -84,7 +84,7 @@
 			O.visible_message("<span class='disarm'><b>[O]</b> gasps and shields their eyes!</span>")
 		if (istype(O, /mob/living/carbon/human))
 			var/mob/living/carbon/human/H = O
-			var/obj/item/organ/eyes/E = H.internal_organs_by_name["eyes"]
+			var/obj/item/organ/internal/eyes/E = H.internal_organs_by_name["eyes"]
 			if (E && (E.damage > E.min_bruised_damage && prob(E.damage + 50)))
 				flick("e_flash", O:flash)
 				E.damage += rand(1, 2)

code/game/objects/effects/aliens.dm

@@ -322,8 +322,23 @@
 
 
 /obj/structure/alien/egg/attack_hand(mob/user)
-	user << "<span class='notice'>It feels slimy.</span>"
-
+	if(user.getorgan(/obj/item/organ/internal/xenos/plasmavessel))
+		switch(status)
+			if(BURST)
+				user << "<span class='notice'>You clear the hatched egg.</span>"
+				playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
+				qdel(src)
+				return
+			if(GROWING)
+				user << "<span class='notice'>The child is not developed yet.</span>"
+				return
+			if(GROWN)
+				user << "<span class='notice'>You retrieve the child.</span>"
+				Burst(0)
+				return
+	else
+		user << "<span class='notice'>It feels slimy.</span>"
+		user.changeNext_move(CLICK_CD_MELEE)
 
 /obj/structure/alien/egg/proc/GetFacehugger()
 	return locate(/obj/item/clothing/mask/facehugger) in contents

code/game/objects/items.dm

@@ -324,10 +324,10 @@
 
 //the mob M is attempting to equip this item into the slot passed through as 'slot'. Return 1 if it can do this and 0 if it can't.
 //If you are making custom procs but would like to retain partial or complete functionality of this one, include a 'return ..()' to where you want this to happen.
-//Set disable_warning to 1 if you wish it to not give you outputs.
+//Set disable_warning to 1 if you wish it to not give you outputs.
 /obj/item/proc/mob_can_equip(mob/M, slot, disable_warning = 0)
 	if(!M)
-		return 0
+		return 0
 
 	return M.can_equip(src, slot, disable_warning)
 
@@ -427,7 +427,7 @@
 			"\red You stab yourself in the eyes with [src]!" \
 		)
 	if(istype(H))
-		var/obj/item/organ/eyes/eyes = H.internal_organs_by_name["eyes"]
+		var/obj/item/organ/internal/eyes/eyes = H.internal_organs_by_name["eyes"]
 		if(!eyes)
 			return
 		eyes.take_damage(rand(3,4), 1)

code/game/objects/items/devices/laserpointer.dm

@@ -113,7 +113,7 @@
 					severity -= 1
 				severity = min(max(severity, 0), 4)
 				var/mob/living/carbon/human/H = C
-				var/obj/item/organ/eyes/E = H.internal_organs_by_name["eyes"]
+				var/obj/item/organ/internal/eyes/E = H.internal_organs_by_name["eyes"]
 
 				switch(severity)
 					if(0)

code/game/objects/items/devices/scanners.dm

@@ -202,7 +202,7 @@ REAGENT SCANNER
 //		user.show_message("\blue Bloodstream Analysis located [M.reagents:get_reagent_amount("epinephrine")] units of rejuvenation chemicals.")
 	if (M.has_brain_worms())
 		user.show_message("\red Subject suffering from aberrant brain activity. Recommend further scanning.")
-	else if (M.getBrainLoss() >= 100 || istype(M, /mob/living/carbon/human) && M:brain_op_stage == 4.0)
+	else if (M.getBrainLoss() >= 100 || istype(M, /mob/living/carbon/human) && !M.get_int_organ(/obj/item/organ/internal/brain))
 		user.show_message("\red Subject is brain dead.")
 	else if (M.getBrainLoss() >= 60)
 		user.show_message("\red Severe brain damage detected. Subject likely to have mental retardation.")

code/game/objects/items/weapons/defib.dm

@@ -383,7 +383,7 @@
 							defib.deductcharge(revivecost)
 							add_logs(M, user, "revived", object="defibrillator")
 						else
-							if(tplus > tlimit)
+							if(tplus > tlimit|| !H.get_int_organ(/obj/item/organ/internal/heart))
 								user.visible_message("<span class='boldnotice'>[defib] buzzes: Resuscitation failed - Heart tissue damage beyond point of no return for defibrillation.</span>")
 							else if(total_burn >= 180 || total_brute >= 180)
 								user.visible_message("<span class='boldnotice'>[defib] buzzes: Resuscitation failed - Severe tissue damage detected.</span>")

code/game/objects/items/weapons/grenades/flashbang.dm

@@ -46,7 +46,7 @@
 
 	if(!eye_safety && ishuman(M))
 		var/mob/living/carbon/human/H = M
-		var/obj/item/organ/eyes/E = H.internal_organs_by_name["eyes"]
+		var/obj/item/organ/internal/eyes/E = H.internal_organs_by_name["eyes"]
 		flick("e_flash", M.flash)
 		if (E)
 			E.damage += eye_damage

code/game/objects/items/weapons/tools.dm

@@ -358,7 +358,7 @@
 	var/safety = user:eyecheck()
 	if(ishuman(user))
 		var/mob/living/carbon/human/H = user
-		var/obj/item/organ/eyes/E = H.internal_organs_by_name["eyes"]
+		var/obj/item/organ/internal/eyes/E = H.internal_organs_by_name["eyes"]
 		if(!istype(E)) // No eyes? No problem!
 			return
 		switch(safety)

code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm

@@ -16,7 +16,7 @@
 	if(buckled_mob && buckled_mob.buckled == src)
 		var/mob/living/M = buckled_mob
 
-		if(isalien(user))
+		if(user.get_int_organ(/obj/item/organ/internal/xenos/plasmavessel))
 			unbuckle_mob()
 			add_fingerprint(user)
 			return
@@ -50,9 +50,9 @@
 	if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.restrained() || usr.stat || M.buckled || istype(user, /mob/living/silicon/pai) )
 		return
 
-	if(isalien(M))
+	if(M.get_int_organ(/obj/item/organ/internal/alien/plasmavessel))
 		return
-	if(!isalien(user))
+	if(!user.get_int_organ(/obj/item/organ/internal/alien/plasmavessel))
 		return
 
 	unbuckle_mob()

code/modules/client/preferences.dm

@@ -1575,7 +1575,7 @@ datum/preferences
 					else
 						O.robotize()
 			else
-				var/obj/item/organ/I = character.internal_organs_by_name[name]
+				var/obj/item/organ/internal/I = character.internal_organs_by_name[name]
 				if(I)
 					if(status == "assisted")
 						I.mechassist()

code/modules/food/recipes_microwave.dm

@@ -76,7 +76,7 @@
 /datum/recipe/microwave/brainburger
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/bun,
-		/obj/item/organ/brain
+		/obj/item/organ/internal/brain
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/brainburger
 

code/modules/food/recipes_oven.dm

@@ -352,7 +352,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/dough,
 		/obj/item/weapon/reagent_containers/food/snacks/dough,
 		/obj/item/weapon/reagent_containers/food/snacks/dough,
-		/obj/item/organ/brain
+		/obj/item/organ/internal/brain
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/braincake
 

code/modules/mining/equipment_locker.dm

@@ -988,7 +988,7 @@
 
 /obj/item/weapon/hivelordstabilizer/afterattack(obj/item/M, mob/user)
 	var/obj/item/asteroid/hivelord_core/C = M
-	if(!istype(C, /obj/item/asteroid/hivelord_core))
+	if(!istype(C, /obj/item/organ/internal/hivelord_core))
 		user << "<span class='warning'>The stabilizer only works on hivelord cores.</span>"
 		return ..()
 	C.preserved = 1

code/modules/mob/language.dm

@@ -363,7 +363,7 @@
 	var/mob/living/carbon/M = other
 	if(!istype(M))
 		return 1
-	if(locate(/obj/item/organ/wryn/hivenode) in M.internal_organs)
+	if(locate(/obj/item/organ/internal/wryn/hivenode) in M.internal_organs)
 		return 1
 
 	return 0

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

@@ -34,7 +34,10 @@
 /mob/living/carbon/alien/New()
 	verbs += /mob/living/carbon/verb/mob_sleep
 	verbs += /mob/living/verb/lay_down
-	internal_organs += new /obj/item/organ/brain/xeno
+	internal_organs += new /obj/item/organ/internal/brain/xeno
+	internal_organs += new /obj/item/organ/internal/xenos/hivenode
+	for(var/obj/item/organ/internal/I in internal_organs)
+		I.Insert(src)
 	..()
 
 /mob/living/carbon/alien/get_default_language()
@@ -258,9 +261,11 @@ Des: Gives the client of the alien an image on each infected mob.
 	if (client)
 		for (var/mob/living/C in mob_list)
 			if(C.status_flags & XENO_HOST)
-				var/obj/item/alien_embryo/A = locate() in C
-				var/I = image('icons/mob/alien.dmi', loc = C, icon_state = "infected[A.stage]")
-				client.images += I
+				var/obj/item/organ/internal/body_egg/alien_embryo/A = C.get_int_organ(/obj/item/organ/internal/body_egg/alien_embryo)
+				var/I = image('icons/mob/alien.dmi', loc = owner, icon_state = "infected[stage]")
+				if(A)
+					var/I = image('icons/mob/alien.dmi', loc = owner, icon_state = "infected[stage]")
+					client.images += I
 	return
 
 
@@ -317,4 +322,4 @@ Des: Removes all infected images from the alien.
 
 				playsound(T, S, volume, 1, range)
 				return 1
-	return 0
+	return 0

code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm

@@ -13,8 +13,12 @@
 	if(src.name == "alien drone")
 		src.name = text("alien drone ([rand(1, 1000)])")
 	src.real_name = src.name
-	verbs.Add(/mob/living/carbon/alien/humanoid/proc/resin,/mob/living/carbon/alien/humanoid/proc/corrosive_acid)
-	..()
+	internal_organs += new /obj/item/organ/internal/xenos/plasmavessel/large
+ 	internal_organs += new /obj/item/organ/internal/xenos/resinspinner
+ 	internal_organs += new /obj/item/organ/internal/xenos/acid
+	//verbs.Add(/mob/living/carbon/alien/humanoid/proc/resin,/mob/living/carbon/alien/humanoid/proc/corrosive_acid)
+	//..()
+
 //Drones use the same base as generic humanoids.
 //Drone verbs