Revert "Xenos can now always access hivemind"

This reverts commit 4424fe0.
cmss13-devs · Nov 6, 2023 · e93f206 · e93f206
1 parent 4424fe0
commit e93f206
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 0 deletions.
diff --git a/code/datums/keybinding/xenomorph.dm b/code/datums/keybinding/xenomorph.dm
@@ -195,6 +195,10 @@
 	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. You are alone."))
+		return
+
 	if(current_xeno.interference)
 		to_chat(current_xeno, SPAN_WARNING("A headhunter temporarily cut off your psychic connection!"))
 		return

diff --git a/code/modules/mob/living/carbon/human/human_abilities.dm b/code/modules/mob/living/carbon/human/human_abilities.dm
@@ -391,6 +391,10 @@ CULT
 /datum/action/human_action/activable/cult_leader/convert/use_ability(mob/M)
 	var/datum/hive_status/hive = get_hive()
 
+	if(!istype(hive))
+		to_chat(owner, SPAN_DANGER("There is no Queen. You are alone."))
+		return
+
 	if(!can_use_action())
 		return
 
@@ -436,6 +440,10 @@ CULT
 
 	var/datum/hive_status/hive = get_hive()
 
+	if(!istype(hive))
+		to_chat(owner, SPAN_DANGER("There is no Queen. You are alone."))
+		return
+
 	if(!can_use_action())
 		return
 

diff --git a/code/modules/mob/living/carbon/xenomorph/XenoOverwatch.dm b/code/modules/mob/living/carbon/xenomorph/XenoOverwatch.dm
@@ -26,6 +26,10 @@
 	if (X.caste_type == XENO_CASTE_QUEEN)
 		isQueen = TRUE
 
+	if(!X.hive.living_xeno_queen && !X.hive.allow_no_queen_actions)
+		to_chat(X, SPAN_WARNING("There is no Queen. You are alone."))
+		return
+
 	// We are already overwatching something
 	if (X.observed_xeno)
 		if (isQueen)
@@ -77,6 +81,10 @@
 		if(!hive)
 			return
 
+		if(!hive.living_xeno_queen && !hive.allow_no_queen_actions)
+			to_chat(src, SPAN_WARNING("There is no Queen. You are alone."))
+			return
+
 		if(targetXeno == src)
 			to_chat(src, SPAN_XENOWARNING("You can't watch yourself!"))
 			return

diff --git a/code/modules/mob/living/carbon/xenomorph/say.dm b/code/modules/mob/living/carbon/xenomorph/say.dm
@@ -104,6 +104,10 @@
 	if(!message || stat || !hive)
 		return
 
+	if(!hive.living_xeno_queen && !SSticker?.mode?.hardcore && !hive.allow_no_queen_actions && ROUND_TIME > SSticker.mode.round_time_evolution_ovipositor)
+		to_chat(src, SPAN_WARNING("There is no Queen. You are alone."))
+		return
+
 	log_hivemind("[key_name(src)] : [message]")
 
 	var/track = ""

diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm b/code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm
@@ -7,6 +7,10 @@
 	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."))
+		return
+
 	if(interference)
 		to_chat(src, SPAN_WARNING("A headhunter temporarily cut off your psychic connection!"))
 		return
@@ -28,6 +32,10 @@
 		to_chat(src, SPAN_NOTICE("You seem compelled to protect [english_list(iff_tag.faction_groups, "no one")]."))
 		return
 
+	if((!hive.living_xeno_queen || Check_WO()) && !hive.allow_no_queen_actions) //No Hive status on WO
+		to_chat(src, SPAN_WARNING("There is no Queen. You are alone."))
+		return
+
 	if(interference)
 		to_chat(src, SPAN_WARNING("A headhunter temporarily cut off your psychic connection!"))
 		return