Forsaken Xenos can use hive status.

cmss13-devs · Feb 10, 2024 · 04c4cda · 04c4cda
1 parent ab81a85
commit 04c4cda
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 19 deletions.
diff --git a/code/datums/keybinding/xenomorph.dm b/code/datums/keybinding/xenomorph.dm
@@ -189,21 +189,9 @@
 	. = ..()
 	if(.)
 		return
-
-	var/mob/living/carbon/xenomorph/current_xeno = user?.mob
-
-	if(!current_xeno?.hive)
-		return
-
-	if((!current_xeno.hive.living_xeno_queen || SSmapping.configs[GROUND_MAP].map_name == MAP_WHISKEY_OUTPOST) && !current_xeno.hive.allow_no_queen_actions) //No Hive status on WO
-		to_chat(current_xeno, SPAN_WARNING("There is no Queen. We are alone."))
-		return
-
-	if(current_xeno.interference)
-		to_chat(current_xeno, SPAN_WARNING("A headhunter temporarily cut off our psychic connection!"))
-		return
-
-	current_xeno.hive.hive_ui.open_hive_status(current_xeno)
+	var/mob/living/carbon/xenomorph/xeno = user.mob
+	xeno.hive_status()
+	return TRUE
 
 /datum/keybinding/xenomorph/hide
 	hotkey_keys = list("Unbound")

diff --git a/code/modules/mob/living/carbon/xenomorph/hive_status_ui.dm b/code/modules/mob/living/carbon/xenomorph/hive_status_ui.dm
@@ -137,7 +137,7 @@
 		return UI_INTERACTIVE
 
 	// If the Queen died or is otherwise missing.
-	if(!assoc_hive.living_xeno_queen)
+	if(!assoc_hive.living_xeno_queen && !assoc_hive.allow_no_queen_actions)
 		return UI_CLOSE
 
 /datum/hive_status_ui/ui_data(mob/user)

diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm b/code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm
@@ -1,18 +1,18 @@
 //// Holds Xeno verbs that don't belong anywhere else.
 /mob/living/carbon/xenomorph/verb/hive_status()
 	set name = "Hive Status"
-	set desc = "Check the status of your current hive."
+	set desc = "Check the status of our current hive."
 	set category = "Alien"
 
 	if(!hive)
 		return
 
 	if((!hive.living_xeno_queen || SSmapping.configs[GROUND_MAP].map_name == MAP_WHISKEY_OUTPOST) && !hive.allow_no_queen_actions) //No Hive status on WO
-		to_chat(src, SPAN_WARNING("There is no Queen. You are alone."))
+		to_chat(src, SPAN_WARNING("There is no Queen. We are alone."))
 		return
 
 	if(interference)
-		to_chat(src, SPAN_WARNING("A headhunter temporarily cut off your psychic connection!"))
+		to_chat(src, SPAN_WARNING("A headhunter temporarily cut off our psychic connection!"))
 		return
 
 	hive.hive_ui.open_hive_status(src)