Merge pull request #710 from ZomgPonies/limb

Port of the BS12 limb overhaul

code/datums/cargoprofile.dm

@@ -656,7 +656,7 @@
 		var/bruteloss = M.bruteloss
 		if(istype(M,/mob/living/carbon/human))
 			var/mob/living/carbon/human/C = M
-			for(var/datum/organ/external/L in C.organs)
+			for(var/obj/item/organ/external/L in C.organs)
 				bruteloss += L.brute_dam
 		if(bruteloss < 100) // requires tenderization
 			M.apply_damage(rand(5,15),BRUTE)
@@ -765,7 +765,7 @@
 			if(maxpunches > 1 && prob(50)) // Follow through on a miss, 50% chance
 				return punch(M,maxpunches - 1) + 1
 			return 1
-		var/datum/organ/external/affecting = M.get_organ(ran_zone("chest",50))
+		var/obj/item/organ/external/affecting = M.get_organ(ran_zone("chest",50))
 		var/armor_block = M.run_armor_check(affecting, "melee")
 
 		playsound(master.loc, "punch", 25, 1, -1)

code/datums/datacore.dm

@@ -140,15 +140,8 @@ proc/get_id_photo(var/mob/living/carbon/human/H)
 	temp = new /icon(icobase, "head_[g]")
 	preview_icon.Blend(temp, ICON_OVERLAY)
 
-	for(var/datum/organ/external/E in H.organs)
-		if(E.status & ORGAN_CUT_AWAY || E.status & ORGAN_DESTROYED) continue
-		var/o_icobase=icobase
-		if(E.status & ORGAN_PEG)
-			o_icobase='icons/mob/human_races/o_peg.dmi'
-		temp = new /icon(o_icobase, "[E.name]")
-		if(E.status & ORGAN_ROBOT)
-			temp.MapColors(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0))
-		preview_icon.Blend(temp, ICON_OVERLAY)
+	for(var/obj/item/organ/external/E in H.organs)
+		preview_icon.Blend(E.get_icon(), ICON_OVERLAY)
 
 	//Tail
 	if(H.species.tail && H.species.flags & HAS_TAIL)

code/datums/mind.dm

@@ -73,7 +73,7 @@ datum/mind
 			current.mind = null
 
 			nanomanager.user_transferred(current, new_character)
-			
+
 		if(new_character.mind)		//remove any mind currently in our new body's mind variable
 			new_character.mind.current = null
 
@@ -609,7 +609,7 @@ datum/mind
 			switch(href_list["implant"])
 				if("remove")
 					for(var/obj/item/weapon/implant/loyalty/I in H.contents)
-						for(var/datum/organ/external/organs in H.organs)
+						for(var/obj/item/organ/external/organs in H.organs)
 							if(I in organs.implants)
 								I.Destroy()
 					H << "\blue <Font size =3><B>Your loyalty implant has been deactivated.</B></FONT>"
@@ -617,7 +617,7 @@ datum/mind
 					var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
 					L.imp_in = H
 					L.implanted = 1
-					var/datum/organ/external/affected = H.organs_by_name["head"]
+					var/obj/item/organ/external/affected = H.organs_by_name["head"]
 					affected.implants += L
 					L.part = affected
 

code/datums/spells/inflict_handler.dm

@@ -29,7 +29,7 @@
 				if(ishuman(target) || ismonkey(target))
 					var/mob/living/carbon/C = target
 					if(C.brain_op_stage != 4) // Their brain is already taken out
-						var/obj/item/brain/B = new(C.loc)
+						var/obj/item/organ/brain/B = new(C.loc)
 						B.transfer_identity(C)
 				target.gib()
 			if("disintegrate")

code/datums/spells/summonitem.dm

@@ -22,7 +22,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/brain)) //Yeah, sadly this doesn't work due to the organ system.
+				if(istype(item, /obj/item/organ/brain)) //Yeah, sadly this doesn't work due to the organ system.
 					break
 				marked_item = 		item
 				message += "You mark [item] for recall.</span>"