[MIRROR] Replaced body zone magic strings with defines (#6004)

* Replaced body zone magic strings with defines * merge conflicts
2018-03-19 21:18:57 -05:00
parent 9338d18a28
commit 3d26cd4a6f
148 changed files with 687 additions and 672 deletions
@@ -1,29 +1,29 @@
-/mob/proc/getorgan(typepath)
-	return
-
-/mob/proc/getorganszone(zone)
-	return
-
-/mob/proc/getorganslot(slot)
-	return
-
-/mob/living/carbon/getorgan(typepath)
-	return (locate(typepath) in internal_organs)
-
-/mob/living/carbon/getorganszone(zone, subzones = 0)
-	var/list/returnorg = list()
-	if(subzones)
-		// Include subzones - groin for chest, eyes and mouth for head
-		if(zone == "head")
-			returnorg = getorganszone("eyes") + getorganszone("mouth")
-		if(zone == "chest")
-			returnorg = getorganszone("groin")
-
-	for(var/X in internal_organs)
-		var/obj/item/organ/O = X
-		if(zone == O.zone)
-			returnorg += O
-	return returnorg
-
-/mob/living/carbon/getorganslot(slot)
+/mob/proc/getorgan(typepath)
+	return
+
+/mob/proc/getorganszone(zone)
+	return
+
+/mob/proc/getorganslot(slot)
+	return
+
+/mob/living/carbon/getorgan(typepath)
+	return (locate(typepath) in internal_organs)
+
+/mob/living/carbon/getorganszone(zone, subzones = 0)
+	var/list/returnorg = list()
+	if(subzones)
+		// Include subzones - groin for chest, eyes and mouth for head
+		if(zone == BODY_ZONE_HEAD)
+			returnorg = getorganszone(BODY_ZONE_PRECISE_EYES) + getorganszone(BODY_ZONE_PRECISE_MOUTH)
+		if(zone == BODY_ZONE_CHEST)
+			returnorg = getorganszone(BODY_ZONE_PRECISE_GROIN)
+
+	for(var/X in internal_organs)
+		var/obj/item/organ/O = X
+		if(zone == O.zone)
+			returnorg += O
+	return returnorg
+
+/mob/living/carbon/getorganslot(slot)
 	return internal_organs_slot[slot]