From 4424fe012ad8ed764c0d6a5930ab1158a52242b9 Mon Sep 17 00:00:00 2001 From: private-tristan Date: Sun, 5 Nov 2023 21:59:54 -0500 Subject: [PATCH] Xenos can now always access hivemind --- code/datums/keybinding/xenomorph.dm | 4 ---- code/modules/mob/living/carbon/human/human_abilities.dm | 8 -------- code/modules/mob/living/carbon/xenomorph/XenoOverwatch.dm | 8 -------- code/modules/mob/living/carbon/xenomorph/say.dm | 4 ---- code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm | 8 -------- 5 files changed, 32 deletions(-) diff --git a/code/datums/keybinding/xenomorph.dm b/code/datums/keybinding/xenomorph.dm index 431b0a1e98..2595332625 100644 --- a/code/datums/keybinding/xenomorph.dm +++ b/code/datums/keybinding/xenomorph.dm @@ -195,10 +195,6 @@ 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 index fda4cea20a..1bef53f6a0 100644 --- a/code/modules/mob/living/carbon/human/human_abilities.dm +++ b/code/modules/mob/living/carbon/human/human_abilities.dm @@ -391,10 +391,6 @@ 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 @@ -440,10 +436,6 @@ 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 index 46e144a1b1..5e43e49a3f 100644 --- a/code/modules/mob/living/carbon/xenomorph/XenoOverwatch.dm +++ b/code/modules/mob/living/carbon/xenomorph/XenoOverwatch.dm @@ -26,10 +26,6 @@ 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) @@ -81,10 +77,6 @@ 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 index d1832d10b6..a36fa0a1ae 100644 --- a/code/modules/mob/living/carbon/xenomorph/say.dm +++ b/code/modules/mob/living/carbon/xenomorph/say.dm @@ -104,10 +104,6 @@ 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 index 94218b224e..4abe0432be 100644 --- a/code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm +++ b/code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm @@ -7,10 +7,6 @@ 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 @@ -32,10 +28,6 @@ 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