From 724b82404f6d452393ef9da23a21a7b8d9ae8ba9 Mon Sep 17 00:00:00 2001
From: TotalEpicness <42422230+PhantomEpicness@users.noreply.github.com>
Date: Fri, 10 May 2024 23:19:29 -1000
Subject: [PATCH] Apply suggestions from code review

Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com>
---
 code/modules/mob/living/carbon/xenomorph/XenoProcs.dm        | 4 ++--
 .../carbon/xenomorph/abilities/queen/queen_abilities.dm      | 1 +
 .../living/carbon/xenomorph/abilities/queen/queen_powers.dm  | 3 +++
 code/modules/mob/living/carbon/xenomorph/castes/Queen.dm     | 5 ++++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm
index d4949efd4393..12f793b5066c 100644
--- a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm
+++ b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm
@@ -408,8 +408,8 @@
 	else
 		to_chat(src, SPAN_WARNING("There's nothing in our belly that needs regurgitating."))
 
-/// Checks if the target object can be obscured by other objects within the same time. Used for Eggs
-/mob/living/carbon/xenomorph/proc/check_if_can_be_obscured(turf/target_turf, obj/checked_obj)
+/// Returns true if the object would be obscured by other objects in the same turf. Used for Eggs
+/mob/living/carbon/xenomorph/proc/check_if_obscured(turf/target_turf, obj/checked_obj)
 	for(var/obj/object in target_turf.contents)
 		if(object.layer > checked_obj.layer)
 			return TRUE
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_abilities.dm
index 77bffca04a1b..f9b483c47431 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_abilities.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_abilities.dm
@@ -206,5 +206,6 @@
 
 /datum/action/xeno_action/onclick/egg_autoplant/give_to(mob/living/carbon/xenomorph/queen/Q)
 	. = ..()
+	button.icon_state = Q.egg_autoplant ? "template_active" : "template"
 	if(!Q.ovipositor)
 		hide_from(Q)
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm
index 071b9a81f3f9..84ab16a2140e 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm
@@ -863,6 +863,9 @@
 		else
 			egg_autoplant = TRUE
 			to_chat(src, SPAN_XENONOTICE("You enable automatic egg planting."))
+	var/datum/action/xeno_action/onclick/egg_autoplant/ability = get_xeno_action_by_type(src, /datum/action/xeno_action/onclick/egg_autoplant)
+	if(ability)
+		ability.button.icon_state = egg_autoplant ? "template_active" : "template"
 
 /datum/action/xeno_action/onclick/egg_autoplant/use_ability()
 	var/mob/living/carbon/xenomorph/queen/queen = owner
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
index 1c6c15833abb..963224dc8b89 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
@@ -552,8 +552,11 @@
 	if(suitable_turfs.len == 0)
 		to_chat(src, SPAN_XENONOTICE("There is no more suitable ground to plant eggs! Automatic planting disabled!"))
 		egg_autoplant = FALSE
+		var/datum/action/xeno_action/onclick/egg_autoplant/ability = get_xeno_action_by_type(src, /datum/action/xeno_action/onclick/egg_autoplant)
+		if(ability)
+			ability.button.icon_state = "template"
 		return
-	if(!src.check_plasma(30)) // Skip this cycle if we don't have enough plasma
+	if(!check_plasma(30)) // Skip this cycle if we don't have enough plasma
 		return
 
 	if(!do_after(src, 1 SECONDS, INTERRUPT_INCAPACITATED, BUSY_ICON_BUILD)) // mostly intended as a visual effect