Aut'akh unathi fixes: limbs and loadout (#6091)

code/modules/client/preference_setup/loadout/loadout_xeno.dm

@@ -53,7 +53,7 @@
 	gear_tweaks = list(gear_tweak_free_color_choice)
 
 /datum/gear/autakh_engineering
-	display_name = "engineering grasper (Aut'akh Unathi)"
+	display_name = "engineering grasper"
 	description = "An Aut'akh augment limb, this one is outfitted with a limited toolkit."
 	path = /obj/item/organ/external/hand/right/autakh/tool
 	whitelisted = list("Aut'akh Unathi")
@@ -61,8 +61,8 @@
 	cost = 3
 	allowed_roles = list("Station Engineer", "Chief Engineer", "Atmospheric Technician", "Engineering Apprentice", "Roboticist")
 
-/datum/gear/autakh_engineering
-	display_name = "mining grasper (Aut'akh Unathi)"
+/datum/gear/autakh_mining
+	display_name = "mining grasper"
 	description = "An Aut'akh augment limb, this one is outfitted with a mining drill."
 	path = /obj/item/organ/external/hand/right/autakh/tool/mining
 	whitelisted = list("Aut'akh Unathi")
@@ -71,7 +71,7 @@
 	allowed_roles = list("Shaft Miner")
 
 /datum/gear/autakh_medical
-	display_name = "medical grasper (Aut'akh Unathi)"
+	display_name = "medical grasper"
 	description = "An Aut'akh augment limb, this one is outfitted with a health scanner."
 	path = /obj/item/organ/external/hand/right/autakh/medical
 	whitelisted = list("Aut'akh Unathi")
@@ -80,7 +80,7 @@
 	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Paramedic", "Medical Resident", "Psychiatrist", "Chemist")
 
 /datum/gear/autakh_security
-	display_name = "security grasper (Aut'akh Unathi)"
+	display_name = "security grasper"
 	description = "An Aut'akh augment limb, this one is outfitted with an electroshock weapon."
 	path = /obj/item/organ/external/hand/right/autakh/security
 	whitelisted = list("Aut'akh Unathi")
@@ -381,24 +381,24 @@
 	display_name = "cloth footwraps"
 	path = /obj/item/clothing/shoes/footwraps
 	sort_category = "Xenowear"
-	whitelisted = list("Vaurca Worker", "Vaurca Warrior", "Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
+	whitelisted = list("Vaurca Worker", "Vaurca Warrior", "Unathi", "Aut'akh Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
 
 /datum/gear/shoes/toeless
 	display_name = "toe-less jackboots"
 	path = /obj/item/clothing/shoes/jackboots/unathi
 	sort_category = "Xenowear"
-	whitelisted = list("Vaurca Worker", "Vaurca Warrior", "Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
+	whitelisted = list("Vaurca Worker", "Vaurca Warrior", "Unathi", "Aut'akh Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
 
 /datum/gear/shoes/workboots_toeless
 	display_name = "toeless workboots"
 	path = /obj/item/clothing/shoes/workboots/toeless
 	sort_category = "Xenowear"
-	whitelisted = list("Vaurca Worker", "Vaurca Warrior", "Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
+	whitelisted = list("Vaurca Worker", "Vaurca Warrior", "Unathi", "Aut'akh Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
 
 /datum/gear/shoes/caligae
 	display_name = "caligae"
 	path = /obj/item/clothing/shoes/caligae
-	whitelisted = list("Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara", "Aut'akh Unathi")
+	whitelisted = list("Unathi", "Aut'akh Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
 	sort_category = "Xenowear"
 
 /datum/gear/shoes/caligae/New()

code/modules/mob/living/carbon/human/human_powers.dm

@@ -961,24 +961,25 @@
 			to_chat(src,"<span class='warning'>Your body fails to interface with this alien technology.</span>")
 			return
 
+		if(organs_by_name[O.limb_name])
+			to_chat(src,"<span class='warning'>You already have a limb of this type.</span>")
+			return
 
-	var/obj/item/organ/external/E = get_organ(zone_sel.selecting)
+		if(!organs_by_name[O.parent_organ])
+			to_chat(src,"<span class='warning'>You are unable to find a place to attach \the [O] to your body.</span>")
+			return
 
-	if(E)
-		to_chat(src,"<span class='warning'>You are not missing that limb.</span>")
-		return
+		last_special = world.time + 20
 
-	last_special = world.time + 20
+		src.drop_from_inventory(O)
+		O.replaced(src)
+		src.update_body()
+		src.updatehealth()
+		src.UpdateDamageIcon()
 
-	src.drop_from_inventory(O)
-	O.replaced(src)
-	src.update_body()
-	src.updatehealth()
-	src.UpdateDamageIcon()
+		update_body()
+		updatehealth()
+		UpdateDamageIcon()
 
-	update_body()
-	updatehealth()
-	UpdateDamageIcon()
-
-	visible_message("<span class='notice'>\The [src] attaches \the [O] to \his body!</span>",
-			"<span class='notice'>You attach \the [O] to your body!</span>")
+		visible_message("<span class='notice'>\The [src] attaches \the [O] to \his body!</span>",
+				"<span class='notice'>You attach \the [O] to your body!</span>")

code/modules/organs/organ_external.dm

@@ -212,6 +212,9 @@
 				break
 			parent.update_damages()
 
+	action_button_name = initial(action_button_name)
+	owner.update_action_buttons()
+
 /****************************************************
 			   DAMAGE PROCS
 ****************************************************/

code/modules/organs/subtypes/autakh.dm

@@ -162,7 +162,7 @@
 
 /obj/item/organ/eyes/autakh/flash_act()
 	if(owner)
-		to_chat(owner, "<span class='notice'>\The [src]'s retinal overlays are overloaded by the strong light!</span>")
+		to_chat(owner, "<span class='notice'>Your [singular_name]'s retinal overlays are overloaded by the strong light!</span>")
 		owner.eye_blind = 5
 		owner.eye_blurry = 5
 		spark(get_turf(owner), 3)
@@ -183,7 +183,7 @@
 	disabled = FALSE
 
 	if(owner)
-		to_chat(owner, "<span class='notice'>\The [src]'s retinal overlays clicks and shifts!</span>")
+		to_chat(owner, "<span class='notice'>\The [singular_name]'s retinal overlays clicks and shifts!</span>")
 
 /obj/item/organ/adrenal
 	name = "adrenal management system"

html/changelogs/alberyk-autakhfix.yml

@@ -0,0 +1,7 @@
+author: Alberyk
+
+delete-after: True
+
+changes: 
+  - bugfix: "Aut'akh graspers can now be selected in the loadout."
+  - bugfix: "Aut'akh limbs should behave in a more sane way when removed or replaced."