Adds defines for organ slots

code/modules/surgery/organs/appendix.dm

@@ -2,7 +2,7 @@
 	name = "appendix"
 	icon_state = "appendix"
 	zone = "groin"
-	slot = "appendix"
+	slot = ORGAN_SLOT_APPENDIX
 	var/inflamed = 0
 
 /obj/item/organ/appendix/update_icon()

code/modules/surgery/organs/augments_arms.dm

@@ -2,7 +2,6 @@
 	name = "arm-mounted implant"
 	desc = "You shouldn't see this! Adminhelp and report this as an issue on github!"
 	zone = "r_arm"
-	slot = "r_arm_device"
 	icon_state = "implant-toolkit"
 	w_class = WEIGHT_CLASS_NORMAL
 	actions_types = list(/datum/action/item_action/organ_action/toggle)
@@ -20,9 +19,18 @@
 		holder = new holder(src)
 
 	update_icon()
-	slot = zone + "_device"
+	SetSlotFromZone()
 	items_list = contents.Copy()
 
+/obj/item/organ/cyberimp/arm/proc/SetSlotFromZone()
+	switch(zone)
+		if("l_arm")
+			slot = ORGAN_SLOT_LEFT_ARM_AUG
+		if("r_arm")
+			slot = ORGAN_SLOT_RIGHT_ARM_AUG
+		else
+			CRASH("Invalid zone for [type]")
+
 /obj/item/organ/cyberimp/arm/update_icon()
 	if(zone == "r_arm")
 		transform = null
@@ -40,7 +48,7 @@
 			zone = "l_arm"
 		else
 			zone = "r_arm"
-		slot = zone + "_device"
+		SetSlotFromZone()
 		to_chat(user, "<span class='notice'>You modify [src] to be installed on the [zone == "r_arm" ? "right" : "left"] arm.</span>")
 		update_icon()
 	else if(istype(W, /obj/item/card/emag))

code/modules/surgery/organs/augments_chest.dm

@@ -13,7 +13,7 @@
 	var/hunger_threshold = NUTRITION_LEVEL_STARVING
 	var/synthesizing = 0
 	var/poison_amount = 5
-	slot = "stomach"
+	slot = ORGAN_SLOT_STOMACH
 	origin_tech = "materials=2;powerstorage=2;biotech=2"
 
 /obj/item/organ/cyberimp/chest/nutriment/on_life()
@@ -51,7 +51,7 @@
 	icon_state = "chest_implant"
 	implant_color = "#AD0000"
 	origin_tech = "materials=5;programming=4;biotech=4"
-	slot = "heartdrive"
+	slot = ORGAN_SLOT_HEART_AID
 	var/revive_cost = 0
 	var/reviving = 0
 	var/cooldown = 0
@@ -120,7 +120,7 @@
 	name = "implantable thrusters set"
 	desc = "An implantable set of thruster ports. They use the gas from environment or subject's internals for propulsion in zero-gravity areas. \
 	Unlike regular jetpack, this device has no stabilization system."
-	slot = "thrusters"
+	slot = ORGAN_SLOT_THRUSTERS
 	icon_state = "imp_jetpack"
 	origin_tech = "materials=4;magnets=4;biotech=4;engineering=5"
 	implant_overlay = null

code/modules/surgery/organs/augments_eyes.dm

@@ -3,7 +3,7 @@
 	desc = "artificial photoreceptors with specialized functionality"
 	icon_state = "eye_implant"
 	implant_overlay = "eye_implant_overlay"
-	slot = "eye_sight"
+	slot = ORGAN_SLOT_EYES
 	zone = "eyes"
 	w_class = WEIGHT_CLASS_TINY
 
@@ -11,7 +11,7 @@
 /obj/item/organ/cyberimp/eyes/hud
 	name = "HUD implant"
 	desc = "These cybernetic eyes will display a HUD over everything you see. Maybe."
-	slot = "eye_hud"
+	slot = ORGAN_SLOT_HUD
 	var/HUD_type = 0
 
 /obj/item/organ/cyberimp/eyes/hud/Insert(var/mob/living/carbon/M, var/special = 0, drop_if_replaced = FALSE)

code/modules/surgery/organs/augments_internal.dm

@@ -44,7 +44,7 @@
 	var/active = 0
 	var/list/stored_items = list()
 	implant_color = "#DE7E00"
-	slot = "brain_antidrop"
+	slot = ORGAN_SLOT_BRAIN_ANTIDROP
 	origin_tech = "materials=4;programming=5;biotech=4"
 	actions_types = list(/datum/action/item_action/organ_action/toggle)
 
@@ -101,7 +101,7 @@
 	name = "CNS Rebooter implant"
 	desc = "This implant will automatically give you back control over your central nervous system, reducing downtime when stunned."
 	implant_color = "#FFFF00"
-	slot = "brain_antistun"
+	slot = ORGAN_SLOT_BRAIN_ANTISTUN
 	origin_tech = "materials=5;programming=4;biotech=5"
 
 /obj/item/organ/cyberimp/brain/anti_stun/on_life()
@@ -133,7 +133,7 @@
 	name = "breathing tube implant"
 	desc = "This simple implant adds an internals connector to your back, allowing you to use internals without a mask and protecting you from being choked."
 	icon_state = "implant_mask"
-	slot = "breathing_tube"
+	slot = ORGAN_SLOT_BREATHING_TUBE
 	w_class = WEIGHT_CLASS_TINY
 	origin_tech = "materials=2;biotech=3"
 

code/modules/surgery/organs/ears.dm

@@ -3,7 +3,7 @@
 	icon_state = "ears"
 	desc = "There are three parts to the ear. Inner, middle and outer. Only one of these parts should be normally visible."
 	zone = "head"
-	slot = "ears"
+	slot = ORGAN_SLOT_EARS
 	gender = PLURAL
 
 	// `deaf` measures "ticks" of deafness. While > 0, the person is unable

code/modules/surgery/organs/eyes.dm

@@ -3,7 +3,7 @@
 	icon_state = "eyeballs"
 	desc = "I see you!"
 	zone = "eyes"
-	slot = "eye_sight"
+	slot = ORGAN_SLOT_EYES
 	gender = PLURAL
 
 	var/sight_flags = 0

code/modules/surgery/organs/heart.dm

@@ -3,7 +3,7 @@
 	desc = "I feel bad for the heartless bastard who lost this."
 	icon_state = "heart-on"
 	zone = "chest"
-	slot = "heart"
+	slot = ORGAN_SLOT_HEART
 	origin_tech = "biotech=5"
 	// Heart attack code is in code/modules/mob/living/carbon/human/life.dm
 	var/beating = 1

code/modules/surgery/organs/liver.dm

@@ -8,7 +8,7 @@
 	origin_tech = "biotech=3"
 	w_class = WEIGHT_CLASS_NORMAL
 	zone = "chest"
-	slot = "liver"
+	slot = ORGAN_SLOT_LIVER
 	desc = "Pairing suggestion: chianti and fava beans."
 	var/damage = 0 //liver damage, 0 is no damage, damage=maxHealth causes liver failure
 	var/alcohol_tolerance = ALCOHOL_RATE//affects how much damage the liver takes from alcohol

code/modules/surgery/organs/lungs.dm

@@ -12,7 +12,7 @@
 	name = "lungs"
 	icon_state = "lungs"
 	zone = "chest"
-	slot = "lungs"
+	slot = ORGAN_SLOT_LUNGS
 	gender = PLURAL
 	w_class = WEIGHT_CLASS_NORMAL
 

code/modules/surgery/organs/organ_internal.dm

@@ -118,7 +118,7 @@
 		var/has_liver = (!(NOLIVER in dna.species.species_traits))
 		var/has_stomach = (!(NOSTOMACH in dna.species.species_traits))
 
-		if(has_liver && !getorganslot("liver"))
+		if(has_liver && !getorganslot(ORGAN_SLOT_LIVER))
 			var/obj/item/organ/liver/LI
 
 			if(dna.species.mutantliver)
@@ -127,7 +127,7 @@
 				LI = new()
 			LI.Insert(src)
 
-		if(has_stomach && !getorganslot("stomach"))
+		if(has_stomach && !getorganslot(ORGAN_SLOT_STOMACH))
 			var/obj/item/organ/stomach/S
 
 			if(dna.species.mutantstomach)
@@ -136,15 +136,15 @@
 				S = new()
 			S.Insert(src)
 
-	if(breathes && !getorganslot("lungs"))
+	if(breathes && !getorganslot(ORGAN_SLOT_LUNGS))
 		var/obj/item/organ/lungs/L = new()
 		L.Insert(src)
 
-	if(blooded && !getorganslot("heart"))
+	if(blooded && !getorganslot(ORGAN_SLOT_HEART))
 		var/obj/item/organ/heart/H = new()
 		H.Insert(src)
 
-	if(!getorganslot("tongue"))
+	if(!getorganslot(ORGAN_SLOT_TONGUE))
 		var/obj/item/organ/tongue/T
 
 		if(dna && dna.species && dna.species.mutanttongue)
@@ -155,7 +155,7 @@
 		// if they have no mutant tongues, give them a regular one
 		T.Insert(src)
 
-	if(!getorganslot("eye_sight"))
+	if(!getorganslot(ORGAN_SLOT_EYES))
 		var/obj/item/organ/eyes/E
 
 		if(dna && dna.species && dna.species.mutanteyes)
@@ -165,7 +165,7 @@
 			E = new()
 		E.Insert(src)
 
-	if(!getorganslot("ears"))
+	if(!getorganslot(ORGAN_SLOT_EARS))
 		var/obj/item/organ/ears/ears
 		if(dna && dna.species && dna.species.mutantears)
 			ears = new dna.species.mutantears

code/modules/surgery/organs/stomach.dm

@@ -4,7 +4,7 @@
 	origin_tech = "biotech=4"
 	w_class = WEIGHT_CLASS_NORMAL
 	zone = "chest"
-	slot = "stomach"
+	slot = ORGAN_SLOT_STOMACH
 	attack_verb = list("gored", "squished", "slapped", "digested")
 	desc = "Onaka ga suite imasu."
 	var/disgust_metabolism = 1

code/modules/surgery/organs/tails.dm

@@ -2,7 +2,7 @@
 	name = "tail"
 	desc = "What did you cut this off of?"
 	zone = "groin"
-	slot = "tail"
+	slot = ORGAN_SLOT_TAIL
 
 /obj/item/organ/tail/cat
 	name = "cat tail"

code/modules/surgery/organs/tongue.dm

@@ -3,7 +3,7 @@
 	desc = "A fleshy muscle mostly used for lying."
 	icon_state = "tonguenormal"
 	zone = "mouth"
-	slot = "tongue"
+	slot = ORGAN_SLOT_TONGUE
 	attack_verb = list("licked", "slobbered", "slapped", "frenched", "tongued")
 	var/list/languages_possible
 	var/say_mod = null
@@ -82,7 +82,7 @@
 	var/mob/living/carbon/human/user = usr
 	var/rendered = "<span class='abductor'><b>[user.name]:</b> [message]</span>"
 	for(var/mob/living/carbon/human/H in GLOB.living_mob_list)
-		var/obj/item/organ/tongue/T = H.getorganslot("tongue")
+		var/obj/item/organ/tongue/T = H.getorganslot(ORGAN_SLOT_TONGUE)
 		if(!T || T.type != type)
 			continue
 		if(H.dna && H.dna.species.id == "abductor" && user.dna && user.dna.species.id == "abductor")

code/modules/surgery/organs/vocal_cords.dm

@@ -7,7 +7,7 @@
 	name = "vocal cords"
 	icon_state = "appendix"
 	zone = "mouth"
-	slot = "vocal_cords"
+	slot = ORGAN_SLOT_VOICE
 	gender = PLURAL
 	var/list/spans = null
 
@@ -24,15 +24,13 @@
 	name = "adamantine resonator"
 	desc = "Fragments of adamantine exists in all golems, stemming from their origins as purely magical constructs. These are used to \"hear\" messages from their leaders."
 	zone = "head"
-	slot = "adamantine_resonator"
+	slot = ORGAN_SLOT_ADAMANTINE_RESONATOR
 	icon_state = "adamantine_resonator"
 
 /obj/item/organ/vocal_cords/adamantine
 	name = "adamantine vocal cords"
 	desc = "When adamantine resonates, it causes all nearby pieces of adamantine to resonate as well. Adamantine golems use this to broadcast messages to nearby golems."
 	actions_types = list(/datum/action/item_action/organ_action/use/adamantine_vocal_cords)
-	zone = "mouth"
-	slot = "vocal_cords"
 	icon_state = "adamantine_cords"
 
 /datum/action/item_action/organ_action/use/adamantine_vocal_cords/Trigger()
@@ -48,7 +46,7 @@
 	for(var/m in GLOB.player_list)
 		if(iscarbon(m))
 			var/mob/living/carbon/C = m
-			if(C.getorganslot("adamantine_resonator"))
+			if(C.getorganslot(ORGAN_SLOT_ADAMANTINE_RESONATOR))
 				to_chat(C, msg)
 		if(isobserver(m))
 			var/link = FOLLOW_LINK(m, owner)
@@ -59,8 +57,6 @@
 	name = "divine vocal cords"
 	desc = "They carry the voice of an ancient god."
 	icon_state = "voice_of_god"
-	zone = "mouth"
-	slot = "vocal_cords"
 	actions_types = list(/datum/action/item_action/organ_action/colossus)
 	var/next_command = 0
 	var/cooldown_mod = 1