Merge pull request #710 from ZomgPonies/limb

Port of the BS12 limb overhaul

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

@@ -362,7 +362,7 @@
 						M.visible_message("<span class='warning'>[M]'s body convulses a bit.")
 						playsound(get_turf(src), "bodyfall", 50, 1)
 						playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
-						for(var/datum/organ/external/O in H.organs)
+						for(var/obj/item/organ/external/O in H.organs)
 							total_brute	+= O.brute_dam
 							total_burn	+= O.burn_dam
 						if(H.health <= config.health_threshold_dead && total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !(NOCLONE in H.mutations))
@@ -471,7 +471,7 @@
 						M.visible_message("<span class='warning'>[M]'s body convulses a bit.")
 						playsound(get_turf(src), "bodyfall", 50, 1)
 						playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
-						for(var/datum/organ/external/O in H.organs)
+						for(var/obj/item/organ/external/O in H.organs)
 							total_brute	+= O.brute_dam
 							total_burn	+= O.burn_dam
 						if(H.health <= config.health_threshold_dead && total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !(NOCLONE in H.mutations))

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

@@ -38,7 +38,7 @@
 //Flash
 	if(!eye_safety)
 		var/mob/living/carbon/human/H = M
-		var/datum/organ/internal/eyes/E = H.internal_organs_by_name["eyes"]
+		var/obj/item/organ/eyes/E = H.internal_organs_by_name["eyes"]
 		flick("e_flash", M.flash)
 		E.damage += rand(1, 3)
 		M.Stun(max(10/distance, 3))

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

@@ -37,7 +37,7 @@
 			add_logs(user, C, "handcuffed")
 		else
 			user << "<span class='warning'>You fail to handcuff [C].</span>"
-			
+
 /obj/item/weapon/restraints/handcuffs/proc/apply_cuffs(mob/living/carbon/target, mob/user)
 	if(!target.handcuffed)
 		user.drop_item()
@@ -52,29 +52,29 @@
 
 var/last_chew = 0
 /mob/living/carbon/human/RestrainedClickOn(var/atom/A)
-	if (A != src) 
+	if (A != src)
 		return ..()
-	if (last_chew + 26 > world.time) 
+	if (last_chew + 26 > world.time)
 		return
 
 	var/mob/living/carbon/human/H = A
-	if (!H.handcuffed) 
+	if (!H.handcuffed)
 		return
-	if (H.a_intent != "harm") 
+	if (H.a_intent != "harm")
 		return
-	if (H.zone_sel.selecting != "mouth") 
+	if (H.zone_sel.selecting != "mouth")
 		return
-	if (H.wear_mask) 
+	if (H.wear_mask)
 		return
-	if (istype(H.wear_suit, /obj/item/clothing/suit/straight_jacket)) 
+	if (istype(H.wear_suit, /obj/item/clothing/suit/straight_jacket))
 		return
 
-	var/datum/organ/external/O = H.organs_by_name[H.hand ? "l_hand" : "r_hand"]
-	if (!O) 
+	var/obj/item/organ/external/O = H.organs_by_name[H.hand ? "l_hand" : "r_hand"]
+	if (!O)
 		return
 
-	var/s = "<span class='danger'>[H.name] chews on \his [O.display_name]!</span>"
-	H.visible_message(s, "<span class='userdanger'>You chew on your [O.display_name]!</span>")
+	var/s = "<span class='danger'>[H.name] chews on \his [O.name]!</span>"
+	H.visible_message(s, "<span class='userdanger'>You chew on your [O.name]!</span>")
 	H.attack_log += text("\[[time_stamp()]\] <font color='red'>[s] ([H.ckey])</font>")
 	log_attack("[s] ([H.ckey])")
 
@@ -135,14 +135,14 @@ var/last_chew = 0
 		else
 			user << "<span class='warning'>You need one rod to make a wired rod.</span>"
 			return
-	
+
 /obj/item/weapon/restraints/handcuffs/cable/zipties
 	name = "zipties"
 	desc = "Plastic, disposable zipties that can be used to restrain temporarily but are destroyed after use."
 	icon_state = "cuff_white"
 	breakouttime = 450 //Deciseconds = 45s
 	trashtype = /obj/item/weapon/restraints/handcuffs/cable/zipties/used
-	
+
 /obj/item/weapon/restraints/handcuffs/cable/zipties/cyborg/attack(mob/living/carbon/C, mob/user)
 	if(isrobot(user))
 		if(!C.handcuffed)
@@ -156,11 +156,11 @@ var/last_chew = 0
 					user << "<span class='notice'>You handcuff [C].</span>"
 					add_logs(user, C, "handcuffed")
 			else
-				user << "<span class='warning'>You fail to handcuff [C].</span>"		
+				user << "<span class='warning'>You fail to handcuff [C].</span>"
 
 /obj/item/weapon/restraints/handcuffs/cable/zipties/used/attack()
 	return
-				
+
 //Legcuffs
 /obj/item/weapon/restraints/legcuffs
 	name = "leg cuffs"

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

@@ -155,7 +155,7 @@
 		user << "\red The nettle burns your bare hand!"
 		if(istype(user, /mob/living/carbon/human))
 			var/organ = ((user.hand ? "l_":"r_") + "arm")
-			var/datum/organ/external/affecting = user.get_organ(organ)
+			var/obj/item/organ/external/affecting = user.get_organ(organ)
 			if(affecting.take_damage(0,force))
 				user.UpdateDamageIcon()
 		else
@@ -182,7 +182,7 @@
 	if(!user.gloves)
 		if(istype(user, /mob/living/carbon/human))
 			var/organ = ((user.hand ? "l_":"r_") + "arm")
-			var/datum/organ/external/affecting = user.get_organ(organ)
+			var/obj/item/organ/external/affecting = user.get_organ(organ)
 			if(affecting.take_damage(0,force))
 				user.UpdateDamageIcon()
 		else

code/game/objects/items/weapons/implants/implant.dm

@@ -6,7 +6,7 @@
 	icon_state = "implant"
 	var/implanted = null
 	var/mob/living/imp_in = null
-	var/datum/organ/external/part = null
+	var/obj/item/organ/external/part = null
 	_color = "b"
 	var/allow_reagents = 0
 	var/malfunction = 0
@@ -33,7 +33,7 @@
 		return 0
 
 	proc/meltdown()	//breaks it down, making implant unrecongizible
-		imp_in << "\red You feel something melting inside [part ? "your [part.display_name]" : "you"]!"
+		imp_in << "\red You feel something melting inside [part ? "your [part.name]" : "you"]!"
 		if (part)
 			part.take_damage(burn = 15, used_weapon = "Electronics meltdown")
 		else
@@ -169,18 +169,18 @@ Implant Specifics:<BR>"}
 			if(ishuman(imp_in))
 				if (elevel == "Localized Limb")
 					if(part) //For some reason, small_boom() didn't work. So have this bit of working copypaste.
-						imp_in.visible_message("\red Something beeps inside [imp_in][part ? "'s [part.display_name]" : ""]!")
+						imp_in.visible_message("\red Something beeps inside [imp_in][part ? "'s [part.name]" : ""]!")
 						playsound(loc, 'sound/items/countdown.ogg', 75, 1, -3)
 						sleep(25)
-						if (istype(part,/datum/organ/external/chest) ||	\
-							istype(part,/datum/organ/external/groin) ||	\
-							istype(part,/datum/organ/external/head))
+						if (istype(part,/obj/item/organ/external/chest) ||	\
+							istype(part,/obj/item/organ/external/groin) ||	\
+							istype(part,/obj/item/organ/external/head))
 							part.createwound(BRUISE, 60)	//mangle them instead
 							explosion(get_turf(imp_in), -1, -1, 2, 3)
 							del(src)
 						else
 							explosion(get_turf(imp_in), -1, -1, 2, 3)
-							part.droplimb(1)
+							part.droplimb()
 							del(src)
 				if (elevel == "Destroy Body")
 					explosion(get_turf(T), -1, 0, 1, 6)
@@ -234,18 +234,18 @@ Implant Specifics:<BR>"}
 
 	proc/small_boom()
 		if (ishuman(imp_in) && part)
-			imp_in.visible_message("\red Something beeps inside [imp_in][part ? "'s [part.display_name]" : ""]!")
+			imp_in.visible_message("\red Something beeps inside [imp_in][part ? "'s [part.name]" : ""]!")
 			playsound(loc, 'sound/items/countdown.ogg', 75, 1, -3)
 			spawn(25)
 				if (ishuman(imp_in) && part)
 					//No tearing off these parts since it's pretty much killing
 					//and you can't replace groins
-					if (istype(part,/datum/organ/external/chest) ||	\
-						istype(part,/datum/organ/external/groin) ||	\
-						istype(part,/datum/organ/external/head))
+					if (istype(part,/obj/item/organ/external/chest) ||	\
+						istype(part,/obj/item/organ/external/groin) ||	\
+						istype(part,/obj/item/organ/external/head))
 						part.createwound(BRUISE, 60)	//mangle them instead
 					else
-						part.droplimb(1)
+						part.droplimb()
 				explosion(get_turf(imp_in), -1, -1, 2, 3)
 				del(src)
 

code/game/objects/items/weapons/implants/implanter.dm

@@ -43,7 +43,7 @@
 					src.imp.implanted = 1
 					if (ishuman(M))
 						var/mob/living/carbon/human/H = M
-						var/datum/organ/external/affected = H.get_organ(user.zone_sel.selecting)
+						var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
 						affected.implants += src.imp
 						imp.part = affected
 						H.hud_updateflag |= 1 << IMPLOYAL_HUD

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

@@ -63,7 +63,7 @@
 				return
 
 			if( !H.shoes && ( !H.wear_suit || !(H.wear_suit.body_parts_covered & FEET) ) )
-				var/datum/organ/external/affecting = H.get_organ(pick("l_foot", "r_foot"))
+				var/obj/item/organ/external/affecting = H.get_organ(pick("l_foot", "r_foot"))
 				if(affecting.status & ORGAN_ROBOT)
 					return
 				H.Weaken(3)

code/game/objects/items/weapons/storage/bible.dm

@@ -35,7 +35,7 @@
 	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
 		var/heal_amt = 10
-		for(var/datum/organ/external/affecting in H.organs)
+		for(var/obj/item/organ/external/affecting in H.organs)
 			if(affecting.heal_damage(heal_amt, heal_amt))
 				H.UpdateDamageIcon()
 	return

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

@@ -68,7 +68,7 @@ LOOK FOR SURGERY.DM*/
 				if(M == user && prob(25))
 					user << "\red You mess up!"
 					if(istype(M, /mob/living/carbon/human))
-						var/datum/organ/external/affecting = M:get_organ("head")
+						var/obj/item/organ/external/affecting = M:get_organ("head")
 						if(affecting.take_damage(15))
 							M:UpdateDamageIcon()
 						M.updatehealth()
@@ -100,7 +100,7 @@ LOOK FOR SURGERY.DM*/
 					if(M == user && prob(25))
 						user << "\red You mess up!"
 						if(istype(M, /mob/living/carbon/human))
-							var/datum/organ/external/affecting = M:get_organ("chest")
+							var/obj/item/organ/external/affecting = M:get_organ("chest")
 							if(affecting.take_damage(30))
 								M:UpdateDamageIcon()
 						else
@@ -207,7 +207,7 @@ LOOK FOR SURGERY.DM*/
 				if(M == user && prob(25))
 					user << "\red You mess up!"
 					if(istype(M, /mob/living/carbon/human))
-						var/datum/organ/external/affecting = M:get_organ("head")
+						var/obj/item/organ/external/affecting = M:get_organ("head")
 						if(affecting.take_damage(15))
 							M:UpdateDamageIcon()
 						M.updatehealth()
@@ -231,7 +231,7 @@ LOOK FOR SURGERY.DM*/
 				if(M == user && prob(25))
 					user << "\red You mess up!"
 					if(istype(M, /mob/living/carbon/human))
-						var/datum/organ/external/affecting = M:get_organ("chest")
+						var/obj/item/organ/external/affecting = M:get_organ("chest")
 						if(affecting.take_damage(30))
 							M:UpdateDamageIcon()
 					else
@@ -331,7 +331,7 @@ LOOK FOR SURGERY.DM*/
 				if(M == user && prob(25))
 					user << "\red You mess up!"
 					if(istype(M, /mob/living/carbon/human))
-						var/datum/organ/external/affecting = M:get_organ("head")
+						var/obj/item/organ/external/affecting = M:get_organ("head")
 						if(affecting.take_damage(15))
 							M:UpdateDamageIcon()
 						M.updatehealth()
@@ -475,14 +475,14 @@ LOOK FOR SURGERY.DM*/
 				if(M == user && prob(25))
 					user << "\red You mess up!"
 					if(istype(M, /mob/living/carbon/human))
-						var/datum/organ/external/affecting = M:get_organ("head")
+						var/obj/item/organ/external/affecting = M:get_organ("head")
 						if(affecting.take_damage(15))
 							M:UpdateDamageIcon()
 					else
 						M.take_organ_damage(15)
 
 				if(istype(M, /mob/living/carbon/human))
-					var/datum/organ/external/affecting = M:get_organ("head")
+					var/obj/item/organ/external/affecting = M:get_organ("head")
 					affecting.take_damage(7)
 				else
 					M.take_organ_damage(7)
@@ -521,14 +521,14 @@ LOOK FOR SURGERY.DM*/
 				if(M == user && prob(25))
 					user << "\red You nick an artery!"
 					if(istype(M, /mob/living/carbon/human))
-						var/datum/organ/external/affecting = M:get_organ("head")
+						var/obj/item/organ/external/affecting = M:get_organ("head")
 						if(affecting.take_damage(75))
 							M:UpdateDamageIcon()
 					else
 						M.take_organ_damage(75)
 
 				if(istype(M, /mob/living/carbon/human))
-					var/datum/organ/external/affecting = M:get_organ("head")
+					var/obj/item/organ/external/affecting = M:get_organ("head")
 					affecting.take_damage(7)
 				else
 					M.take_organ_damage(7)
@@ -577,7 +577,7 @@ LOOK FOR SURGERY.DM*/
 				if(M == user && prob(25))
 					user << "\red You mess up!"
 					if(istype(M, /mob/living/carbon/human))
-						var/datum/organ/external/affecting = M:get_organ("head")
+						var/obj/item/organ/external/affecting = M:get_organ("head")
 						if(affecting.take_damage(15))
 							M:UpdateDamageIcon()
 					else
@@ -605,7 +605,7 @@ LOOK FOR SURGERY.DM*/
 					if(M == user && prob(25))
 						user << "\red You mess up!"
 						if(istype(M, /mob/living/carbon/human))
-							var/datum/organ/external/affecting = M:get_organ("chest")
+							var/obj/item/organ/external/affecting = M:get_organ("chest")
 							if(affecting.take_damage(15))
 								M:UpdateDamageIcon()
 						else
@@ -693,7 +693,7 @@ LOOK FOR SURGERY.DM*/
 				if(M == user && prob(25))
 					user << "\red You mess up!"
 					if(istype(M, /mob/living/carbon/human))
-						var/datum/organ/external/affecting = M:get_organ("head")
+						var/obj/item/organ/external/affecting = M:get_organ("head")
 						if(affecting.take_damage(40))
 							M:UpdateDamageIcon()
 						M.updatehealth()
@@ -701,7 +701,7 @@ LOOK FOR SURGERY.DM*/
 						M.take_organ_damage(40)
 
 				if(istype(M, /mob/living/carbon/human))
-					var/datum/organ/external/affecting = M:get_organ("head")
+					var/obj/item/organ/external/affecting = M:get_organ("head")
 					affecting.take_damage(7)
 				else
 					M.take_organ_damage(7)
@@ -778,7 +778,7 @@ LOOK FOR SURGERY.DM*/
 					if(M == user && prob(25))
 						user << "\red You mess up!"
 						if(istype(M, /mob/living/carbon/human))
-							var/datum/organ/external/affecting = M:get_organ("chest")
+							var/obj/item/organ/external/affecting = M:get_organ("chest")
 							if(affecting.take_damage(15))
 								M:UpdateDamageIcon()
 						else

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

@@ -79,7 +79,7 @@ Frequency:
 
 				src.temp += "<B>Extranneous Signals:</B><BR>"
 				for (var/obj/item/weapon/implant/tracking/W in world)
-					if (!W.implanted || !(istype(W.loc,/datum/organ/external) || ismob(W.loc)))
+					if (!W.implanted || !(istype(W.loc,/obj/item/organ/external) || ismob(W.loc)))
 						continue
 					else
 						var/mob/M = W.loc

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

@@ -369,7 +369,7 @@
 	var/safety = user:eyecheck()
 	if(istype(user, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = user
-		var/datum/organ/internal/eyes/E = H.internal_organs_by_name["eyes"]
+		var/obj/item/organ/eyes/E = H.internal_organs_by_name["eyes"]
 		if(H.species.flags & IS_SYNTHETIC)
 			return
 		switch(safety)
@@ -475,7 +475,7 @@
 /obj/item/weapon/weldingtool/attack(mob/M as mob, mob/user as mob)
 	if(hasorgans(M))
 
-		var/datum/organ/external/S = M:organs_by_name[user.zone_sel.selecting]
+		var/obj/item/organ/external/S = M:organs_by_name[user.zone_sel.selecting]
 
 		if (!S) return
 		if(!(S.status & ORGAN_ROBOT) || user.a_intent != "help")
@@ -493,7 +493,7 @@
 			if (WT.remove_fuel(0,null))
 				playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
 				S.heal_damage(15,0,0,1)
-				user.visible_message("\red \The [user] patches some dents on \the [M]'s [S.display_name] with \the [src].")
+				user.visible_message("\red \The [user] patches some dents on \the [M]'s [S.name] with \the [src].")
 				if(istype(M,/mob/living/carbon/human))
 					var/mob/living/carbon/human/H = M
 					H.updatehealth()