Reworks Aut'akh (#8880)

code/modules/organs/organ_icon.dm

@@ -15,7 +15,12 @@
 	s_tone = null
 	skin_color = null
 	hair_color = null
-	if(status & ORGAN_ROBOT && !(isipc(human)) && !(isautakh(human)))
+	var/limb_exception = FALSE
+	if(robotize_type)
+		var/datum/robolimb/R = all_robolimbs[robotize_type]
+		if(R.paintable)
+			limb_exception = TRUE
+	if(status & ORGAN_ROBOT && !(isipc(human)) && !limb_exception)
 		return
 	if(species && human.species && species.name != human.species.name)
 		return

code/modules/organs/robolimbs.dm

@@ -100,14 +100,10 @@ var/global/datum/robolimb/basic_robolimb
 
 /datum/robolimb/autakh
 	company = PROSTHETIC_AUTAKH
-	desc = "This limb has been designed by the Aut'akh sect, it was created to interact exclusively with their bodies and implants."
+	desc = "This limb has been designed by the Aut'akh unathi sect."
 	icon = 'icons/mob/human_races/unathi/r_autakh.dmi'
-	species_can_use = list("Aut'akh Unathi")
-	linked_frame = "Aut'akh Unathi"
-	unavailable_at_chargen = 1
+	species_can_use = list("Unathi")
 	paintable = 1
-	brute_mod = 1
-	burn_mod = 1
 
 /datum/robolimb/tesla
 	company = PROSTHETIC_TESLA

code/modules/organs/subtypes/augment.dm

@@ -8,8 +8,7 @@
 	is_augment = TRUE
 	species_restricted = list("Human","Off-Worlder Human",
 							"Tajara", "Zhan-Khazan Tajara", "M'sai Tajara",
-							"Unathi", "Aut'akh Unathi", "Skrell",
-							"Baseline Frame", "Hephaestus G1 Industrial Frame",
+							"Unathi", "Skrell", "Baseline Frame", "Hephaestus G1 Industrial Frame",
 							"Hephaestus G2 Industrial Frame", "Xion Industrial Frame",
 							"Zeng-Hu Mobility Frame", "Bishop Accessory Frame", "Shell Frame")
 	var/cooldown = 150

code/modules/organs/subtypes/autakh.dm

@@ -185,106 +185,74 @@
 	if(owner)
 		to_chat(owner, "<span class='notice'>\The [singular_name]'s retinal overlays clicks and shifts!</span>")
 
-/obj/item/organ/internal/adrenal
+/obj/item/organ/internal/augment/adrenal
 	name = "adrenal management system"
 	icon_state = "ams"
 	organ_tag = "adrenal"
 	parent_organ = BP_CHEST
-	robotic = 2
+	action_button_icon = "ams"
 	action_button_name = "Activate Adrenal Management System"
+	cooldown = 300
+	activable = TRUE
 
-/obj/item/organ/internal/adrenal/Initialize()
-	robotize()
+/obj/item/organ/internal/augment/adrenal/attack_self(var/mob/user)
 	. = ..()
 
-/obj/item/organ/internal/adrenal/refresh_action_button()
-	. = ..()
-	if(.)
-		action.button_icon_state = "ams"
-		if(action.button)
-			action.button.UpdateIcon()
+	if(!.)
+		return FALSE
 
-/obj/item/organ/internal/adrenal/attack_self(var/mob/user)
-	. = ..()
+	to_chat(owner, "<span class='notice'>\The [src] activates, releasing a stream of chemicals into your veins!</span>")
 
-	if(.)
+	if(owner.reagents)
 
-		if(owner.last_special > world.time)
-			to_chat(owner, "<span class='danger'>\The [src] is still recharging!</span>")
-			return
+		owner.vessel.remove_reagent("blood",rand(15,30))
+		owner.reagents.add_reagent("paracetamol", 5)
+		owner.reagents.add_reagent("norepinephrine", 5)
 
-		if(owner.stat || owner.paralysis || owner.stunned || owner.weakened)
-			to_chat(owner, "<span class='danger'>You can not use \the [src] in your current state!</span>")
-			return
+/obj/item/organ/internal/augment/adrenal/do_broken_act()
+	if(owner.reagents)
+		owner.reagents.add_reagent("toxin", 25)
+	return TRUE
 
-		owner.last_special = world.time + 500
-		to_chat(owner, "<span class='notice'>\The [src] activates, releasing a stream of chemicals into your veins!</span>")
+/obj/item/organ/internal/augment/adrenal/do_bruised_act()
+	if(owner.reagents)
+		owner.reagents.add_reagent("toxin", 10)
+	return FALSE
 
-		if(owner.reagents)
 
-			if(is_bruised())
-				owner.reagents.add_reagent("toxin", 10)
-
-			if(is_broken())
-				owner.reagents.add_reagent("toxin", 25)
-				return
-
-			owner.vessel.remove_reagent("blood",rand(15,30))
-			owner.reagents.add_reagent("paracetamol", 5)
-			owner.reagents.add_reagent("norepinephrine", 5)
-
-/obj/item/organ/internal/haemodynamic
+/obj/item/organ/internal/augment/haemodynamic
 	name = "haemodynamic control system"
 	icon_state = "stabilizer"
 	organ_tag = "haemodynamic"
 	parent_organ = BP_CHEST
-	robotic = 1
 	action_button_name = "Activate Haemodynamic Control System"
+	action_button_icon = "stabilizer"
+	cooldown = 300
+	activable = TRUE
 
-/obj/item/organ/internal/haemodynamic/Initialize()
-	mechassist()
+/obj/item/organ/internal/augment/haemodynamic/attack_self(var/mob/user)
 	. = ..()
 
-/obj/item/organ/internal/haemodynamic/Initialize()
-	robotize()
-	. = ..()
+	if(!.)
+		return FALSE
 
-/obj/item/organ/internal/haemodynamic/refresh_action_button()
-	. = ..()
-	if(.)
-		action.button_icon_state = "stabilizer"
-		if(action.button)
-			action.button.UpdateIcon()
+	owner.adjustNutritionLoss(300)
+	owner.adjustHydrationLoss(300)
 
-/obj/item/organ/internal/haemodynamic/attack_self(var/mob/user)
-	. = ..()
+	to_chat(owner, "<span class='notice'>\The [src] activates, releasing a stream of chemicals into your veins!</span>")
 
-	if(.)
+	if(owner.reagents)
+		owner.reagents.add_reagent("coagulant", 15)
 
-		if(owner.last_special > world.time)
-			to_chat(owner, "<span class='danger'>\The [src] is still recharging!</span>")
-			return
+/obj/item/organ/internal/augment/haemodynamic/do_broken_act()
+	if(owner.reagents)
+		owner.vessel.remove_reagent("blood",rand(50,75))
+	return TRUE
 
-		if(owner.stat || owner.paralysis || owner.stunned || owner.weakened)
-			to_chat(owner, "<span class='danger'>You can not use \the [src] in your current state!</span>")
-			return
-
-		owner.last_special = world.time + 500
-
-		owner.adjustNutritionLoss(300)
-		owner.adjustHydrationLoss(300)
-
-		if(is_broken())
-			owner.vessel.remove_reagent("blood",rand(50,75))
-			return
-
-		to_chat(owner, "<span class='notice'>\The [src] activates, releasing a stream of chemicals into your veins!</span>")
-
-		if(is_bruised())
-			owner.vessel.remove_reagent("blood",rand(25,50))
-
-		if(owner.reagents)
-			owner.reagents.add_reagent("coagulant", 15)
+/obj/item/organ/internal/augment/haemodynamic/do_bruised_act()
+	if(owner.reagents)
+		owner.vessel.remove_reagent("blood",rand(25,50))
+	return FALSE
 
 //limb implants