From 4dd587a2b9ffc99029a962ae398c77b517d57e58 Mon Sep 17 00:00:00 2001 From: Drulikar Date: Fri, 28 Jul 2023 03:55:51 -0700 Subject: [PATCH 1/2] Fix banishing huggers and lesser drones. --- code/game/gamemodes/cm_initialize.dm | 5 +++++ code/modules/mob/living/carbon/xenomorph/xeno_defines.dm | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm index a7e8ab612bb4..efb92dd1678e 100644 --- a/code/game/gamemodes/cm_initialize.dm +++ b/code/game/gamemodes/cm_initialize.dm @@ -576,6 +576,11 @@ Additional game mode variables. to_chat(xeno_candidate, SPAN_WARNING("The selected hive does not have a hive core to spawn from!")) return + for(var/mob_name in hive.banished_ckeys) + if(hive.banished_ckeys[mob_name] == xeno_candidate.ckey) + to_chat(xeno_candidate, SPAN_WARNING("You are banished from the [hive], you may not rejoin unless the Queen re-admits you or dies.")) + return + hive.hive_location.spawn_lesser_drone(xeno_candidate) return TRUE diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm index b30ea73cd680..c8d30ed510b1 100644 --- a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm +++ b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm @@ -1019,6 +1019,10 @@ //This is to prevent people from joining as Forsaken Huggers on the pred ship to_chat(user, SPAN_WARNING("The hive has fallen, you can't join it!")) return FALSE + for(var/mob_name in banished_ckeys) + if(banished_ckeys[mob_name] == user.ckey) + to_chat(user, SPAN_WARNING("You are banished from the [name], you may not rejoin unless the Queen re-admits you or dies.")) + return update_hugger_limit() From ae172eee8c1af301d14605a2b54c63c28b1f2660 Mon Sep 17 00:00:00 2001 From: Drulikar Date: Fri, 28 Jul 2023 04:47:30 -0700 Subject: [PATCH 2/2] false --- code/modules/mob/living/carbon/xenomorph/xeno_defines.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm index c8d30ed510b1..f2981713c1e0 100644 --- a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm +++ b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm @@ -1022,7 +1022,7 @@ for(var/mob_name in banished_ckeys) if(banished_ckeys[mob_name] == user.ckey) to_chat(user, SPAN_WARNING("You are banished from the [name], you may not rejoin unless the Queen re-admits you or dies.")) - return + return FALSE update_hugger_limit()