cmss13-devs · Steelpoint · Sep 27, 2025 · Sep 27, 2025 · Sep 28, 2025 · Sep 28, 2025
diff --git a/code/__DEFINES/__game.dm b/code/__DEFINES/__game.dm
@@ -41,10 +41,14 @@
 #define MAP_LV759_HYBRISA_PROSPERA "LV-759 Hybrisa Prospera" // Highpop Only
 #define MAP_NEW_VARADERO "New Varadero"//ice colony underground but as its own map
 #define MAP_TYRARGO_RIFT "Tyrargo Rift"
+#define MAP_SEKHMET_SWAMP "SI-391 Sekhmet Swamp"
+#define MAP_CONAM_81_ABYSSAL "Con-Am 81 'Abyssal'"
+#define MAP_CAPE_RIVER "Cape River Mining Colony"
+#define MAP_NAVALIS "Navalis Platform 13"//multiz version
+#define MAP_WHITE_ANTRE_RESEARCH_FACILITY "White Antre Research Facility"
 #define MAP_CHINOOK "Chinook 91 GSO" //admin level
 #define MAP_ROSTOCK "SSV Rostock" //UPP Warship
 #define MAP_HUNTERSHIP "Hunter Ship"
-
 #define GAMEMODE_WHISKEY_OUTPOST "Whiskey Outpost"
 #define GAMEMODE_HIVE_WARS "Hive Wars"
 #define GAMEMODE_FACTION_CLASH_UPP_CM "Faction Clash UPP CM"

diff --git a/code/__DEFINES/dcs/signals/signals_global.dm b/code/__DEFINES/dcs/signals/signals_global.dm
@@ -96,3 +96,6 @@
 /// From /datum/controller/subsystem/hijack/proc/call_shuttle()
 #define COMSIG_GLOB_HIJACK_INBOUND "!hijack_inbound"
 
+
+/// From /obj/structure/machinery/door_control/abyssal_lockdown/use_button(mob/living/user,force)
+#define COMSIG_GLOB_ABYSSAL_LOCKDOWN "!abyssal_lockdown"
diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm
@@ -297,6 +297,25 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 #define JOB_HC_DEPUTY_DIRECTOR "HC Deputy Director"
 #define JOB_HC_DIRECTOR "HC Director"
 
+//-------- Con-Amalagated --------//
+
+#define JOB_CA_SEC "HC Security Guard"
+#define JOB_CA_SEC_SYNTH "HC Security Guard Synthetic"
+#define JOB_CA_TRAINEE "Corporate Trainee"
+#define JOB_CA_JUNIOR_EXECUTIVE "Corporate Junior Executive"
+#define JOB_CA_CORPORATE_LIAISON "Corporate Liaison"
+#define JOB_CA_EXECUTIVE "Corporate Executive"
+#define JOB_CA_SENIOR_EXECUTIVE "Corporate Senior Executive"
+#define JOB_CA_EXECUTIVE_SPECIALIST "Corporate Executive Specialist"
+#define JOB_CA_LEGAL_SPECIALIST "Corporate Legal Specialist"
+#define JOB_CA_EXECUTIVE_SUPERVISOR "Corporate Executive Supervisor"
+#define JOB_CA_LEGAL_SUPERVISOR "Corporate Legal Supervisor"
+#define JOB_CA_ASSISTANT_MANAGER "Corporate Assistant Manager"
+#define JOB_CA_DIVISION_MANAGER "Corporate Division Manager"
+#define JOB_CA_CHIEF_EXECUTIVE "Corporate Chief Executive"
+#define JOB_CA_DEPUTY_DIRECTOR "HC Deputy Director"
+#define JOB_CA_DIRECTOR "HC Director"
+
 //---- Contractors ----//
 #define JOB_CONTRACTOR "VAIPO Mercenary"
 #define JOB_CONTRACTOR_ST "VAIPO Mercenary"

diff --git a/code/__DEFINES/minimap.dm b/code/__DEFINES/minimap.dm
@@ -16,7 +16,8 @@
 #define MINIMAP_FLAG_XENO_FORSAKEN (1<<15)
 #define MINIMAP_FLAG_XENO_RENEGADE (1<<16)
 #define MINIMAP_FLAG_XENO_HUNTED (1<<17)
-#define MINIMAP_FLAG_ALL (1<<18) - 1
+#define MINIMAP_FLAG_XENO_K_SERIES (1<<18)
+#define MINIMAP_FLAG_ALL (1<<19) - 1
 #define MINIMAP_FLAG_ALL_XENOS (MINIMAP_FLAG_XENO|MINIMAP_FLAG_XENO_CORRUPTED|MINIMAP_FLAG_XENO_ALPHA|MINIMAP_FLAG_XENO_BRAVO|MINIMAP_FLAG_XENO_CHARLIE|MINIMAP_FLAG_XENO_DELTA|MINIMAP_FLAG_XENO_FERAL|MINIMAP_FLAG_XENO_TAMED|MINIMAP_FLAG_XENO_MUTATED|MINIMAP_FLAG_XENO_FORSAKEN|MINIMAP_FLAG_XENO_RENEGADE|MINIMAP_FLAG_XENO_HUNTED)
 
 ///The minimap zoom scale
@@ -106,6 +107,9 @@ GLOBAL_LIST_INIT(all_minimap_flags, bitfield2list(MINIMAP_FLAG_ALL))
 #define MINIMAP_AREA_OOB "#3a3a3a"
 #define MINIMAP_AREA_COMMS "#00b3ffe7"
 
+// Abyssal
+#define MINIMAP_AREA_SPACE "#1a1a1a"
+
 // Ceiling colors
 #define MINIMAP_CEILING_TIER_GLASS "#b2e6f19a"
 #define MINIMAP_CEILING_TIER_1 "#606060a2"

diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
@@ -56,6 +56,8 @@
 #define AREA_NOSECURECADES (1<<8)
 /// Flags the area, preventing the creation of xeno tunnels, overwriting can_dig_xeno_tunnel.
 #define AREA_NOTUNNEL (1<<9)
+/// Flags the area as not being a valid location for a para-drop to land on..
+#define AREA_NO_PARA (1<<7)
 
 /// Default number of ticks for do_after
 #define DA_DEFAULT_NUM_TICKS 5

diff --git a/code/__DEFINES/mob_hud.dm b/code/__DEFINES/mob_hud.dm
@@ -72,6 +72,7 @@
 #define MOB_HUD_XENO_HIVE_HUNTED 38
 #define MOB_HUD_XENO_HIVE_RENEGADE 39
 #define MOB_HUD_XENO_HIVE_TUTORIAL 40
+#define MOB_HUD_XENO_HIVE_K_SERIES 41
 
 //for SL/FTL/LZ targeting on locator huds
 #define TRACKER_SL "track_sl"

diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
@@ -130,6 +130,7 @@
 #define XENO_HIVE_BRAVO "xeno_hive_bravo"
 #define XENO_HIVE_CHARLIE "xeno_hive_charlie"
 #define XENO_HIVE_DELTA "xeno_hive_delta"
+#define XENO_HIVE_K_SERIES "xeno_hive_k_series"
 #define XENO_HIVE_FERAL "xeno_hive_feral"
 #define XENO_HIVE_TAMED "xeno_hive_tamed"
 #define XENO_HIVE_MUTATED "xeno_hive_mutated"
@@ -140,7 +141,7 @@
 
 #define XENO_HIVE_TUTORIAL "xeno_hive_tutorial"
 
-#define ALL_XENO_HIVES list(XENO_HIVE_NORMAL, XENO_HIVE_CORRUPTED, XENO_HIVE_ALPHA, XENO_HIVE_BRAVO, XENO_HIVE_CHARLIE, XENO_HIVE_DELTA, XENO_HIVE_FERAL, XENO_HIVE_TAMED, XENO_HIVE_MUTATED, XENO_HIVE_FORSAKEN, XENO_HIVE_YAUTJA, XENO_HIVE_RENEGADE, XENO_HIVE_TUTORIAL)
+#define ALL_XENO_HIVES list(XENO_HIVE_NORMAL, XENO_HIVE_CORRUPTED, XENO_HIVE_ALPHA, XENO_HIVE_BRAVO, XENO_HIVE_CHARLIE, XENO_HIVE_DELTA, XENO_HIVE_K_SERIES, XENO_HIVE_FERAL, XENO_HIVE_TAMED, XENO_HIVE_MUTATED, XENO_HIVE_FORSAKEN, XENO_HIVE_YAUTJA, XENO_HIVE_RENEGADE, XENO_HIVE_TUTORIAL)
 
 //=================================================
 

diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm
@@ -259,6 +259,7 @@ DEFINE_BITFIELD(whitelist_status, list(
 #define FACTION_IASF "Imperial Armed Space Force"
 #define FACTION_PAP "People's Armed Police"
 #define FACTION_HYPERDYNE "Hyperdyne Corporation"
+#define FACTION_CONAM "Con-Amalagated Corporation"
 #define FACTION_WY_DEATHSQUAD "WY Death Squad"
 #define FACTION_MERCENARY "Mercenary"
 #define FACTION_FREELANCER "Freelancer"
@@ -290,6 +291,7 @@ DEFINE_BITFIELD(whitelist_status, list(
 #define FACTION_LIST_ERT_ALL list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY, FACTION_CLF, FACTION_CONTRACTOR, FACTION_UPP, FACTION_FREELANCER, FACTION_MERCENARY, FACTION_DUTCH, FACTION_MILITARY_CASTE, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_MARSHAL, FACTION_TWE, FACTION_HUNTED, FACTION_HUNTED_CLF, FACTION_HUNTED_UPP, FACTION_HUNTED_TWE, FACTION_HUNTED_MERC, FACTION_HUNTED_PMC, FACTION_HUNTED_MISC)
 #define FACTION_LIST_WY list(FACTION_PMC, FACTION_HUNTED_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY)
 #define FACTION_LIST_HYPERDYNE list(FACTION_HYPERDYNE)
+#define FACTION_LIST_CONAM list(FACTION_CONAM)
 #define FACTION_LIST_UPP list(FACTION_UPP, FACTION_HUNTED_UPP)
 #define FACTION_LIST_CLF list(FACTION_CLF, FACTION_HUNTED_CLF)
 #define FACTION_LIST_TWE list(FACTION_TWE, FACTION_HUNTED_TWE, FACTION_IASF)

diff --git a/code/__DEFINES/sounds.dm b/code/__DEFINES/sounds.dm
@@ -143,3 +143,15 @@
 
 #define SCAPE_PL_TYRARGO_SEWER list('sound/ambience/tyrargo_underground_1.ogg','sound/ambience/tyrargo_underground_2.ogg','sound/ambience/tyrargo_underground_3.ogg','sound/ambience/tyrargo_underground_4.ogg')
 #define SCAPE_PL_TYRARGO_ALERT list('sound/ambience/tyrargo_alert_1.ogg', 'sound/ambience/tyrargo_alert_2.ogg', 'sound/ambience/tyrargo_alert_3.ogg', 'sound/ambience/tyrargo_alert_4.ogg', 'sound/ambience/tyrargo_alert_5.ogg', 'sound/ambience/tyrargo_alert_6.ogg')
+
+// White Antre Soundscapes
+#define AMBIENCE_ANTRE 'sound/ambience/venir_hallway.ogg'
+#define AMBIENCE_ANTRE_ADJACENT 'sound/ambience/venir_hallway_adjacent.ogg'
+
+// Abyssal Soundscapes
+
+#define SCAPE_ABYSSAL_INTERIOR list('sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg')
+#define SCAPE_ABYSSAL_EXTERIOR list('sound/ambience/ambispace.ogg')
+
+// Cape River
+#define AMBIENCE_CULT 'sound/soundscape/eerie1.ogg'
diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm
@@ -361,6 +361,7 @@ DEFINE_BITFIELD(flags_area, list(
 	"AREA_YAUTJA_HUNTING_GROUNDS" = AREA_YAUTJA_HUNTING_GROUNDS,
 	"AREA_YAUTJA_HANGABLE" = AREA_YAUTJA_HANGABLE,
 	"AREA_NOSECURECADES" = AREA_NOSECURECADES,
+	"AREA_NO_PARA" = AREA_NO_PARA
 ))
 
 DEFINE_BITFIELD(disabilities, list(

diff --git a/code/_globalvars/global_lists.dm b/code/_globalvars/global_lists.dm
@@ -218,6 +218,7 @@ GLOBAL_LIST_INIT_TYPED(hive_datum, /datum/hive_status, list(
 	XENO_HIVE_BRAVO = new /datum/hive_status/bravo(),
 	XENO_HIVE_CHARLIE = new /datum/hive_status/charlie(),
 	XENO_HIVE_DELTA = new /datum/hive_status/delta(),
+	XENO_HIVE_K_SERIES = new /datum/hive_status/kseries(),
 	XENO_HIVE_FERAL = new /datum/hive_status/feral(),
 	XENO_HIVE_TAMED = new /datum/hive_status/corrupted/tamed(),
 	XENO_HIVE_MUTATED = new /datum/hive_status/mutated(),

diff --git a/code/controllers/subsystem/minimap.dm b/code/controllers/subsystem/minimap.dm
@@ -2192,6 +2192,8 @@ SUBSYSTEM_DEF(minimaps)
 			return MINIMAP_FLAG_XENO_CHARLIE
 		if(XENO_HIVE_DELTA)
 			return MINIMAP_FLAG_XENO_DELTA
+		if(XENO_HIVE_K_SERIES)
+			return MINIMAP_FLAG_XENO_K_SERIES
 		if(XENO_HIVE_FERAL)
 			return MINIMAP_FLAG_XENO_FERAL
 		if(XENO_HIVE_TAMED)

diff --git a/code/datums/factions/conam.dm b/code/datums/factions/conam.dm
@@ -0,0 +1,31 @@
+/datum/faction/conam
+	name = "Con-Amalagated Corporation"
+	faction_tag = FACTION_CONAM
+	base_icon_file = 'icons/mob/hud/factions/conam.dmi'
+
+/datum/faction/conam/modify_hud_holder(image/holder, mob/living/carbon/human/user)
+	var/icon/override_icon_file
+	var/hud_icon_state
+	var/obj/item/card/id/id_card = user.get_idcard()
+	var/role
+	if(user.mind)
+		role = user.job
+	else if(id_card)
+		role = id_card.rank
+	switch(role)
+		if(JOB_CA_TRAINEE)
+			hud_icon_state = "trainee"
+		if(JOB_CA_JUNIOR_EXECUTIVE)
+			hud_icon_state = "junior_exec"
+		if(JOB_CA_CORPORATE_LIAISON)
+			hud_icon_state = "liaison"
+		if(JOB_CA_EXECUTIVE)
+			hud_icon_state = "liaison"
+		if(JOB_CA_SENIOR_EXECUTIVE)
+			hud_icon_state = "senior_exec"
+		if(JOB_CA_EXECUTIVE_SPECIALIST, JOB_CA_LEGAL_SPECIALIST)
+			hud_icon_state = "exec_spec"
+		if(JOB_CA_EXECUTIVE_SUPERVISOR, JOB_CA_LEGAL_SUPERVISOR)
+			hud_icon_state = "exec_super"
+	if(hud_icon_state)
+		holder.overlays += image(override_icon_file ? override_icon_file : base_icon_file, user, "hc_[hud_icon_state]")
diff --git a/code/datums/mob_hud.dm b/code/datums/mob_hud.dm
@@ -16,6 +16,7 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, flatten_numeric_alist(alist(
 	MOB_HUD_XENO_HIVE_BRAVO = new /datum/mob_hud/xeno/xeno_hive_bravo(),
 	MOB_HUD_XENO_HIVE_CHARLIE = new /datum/mob_hud/xeno/xeno_hive_charlie(),
 	MOB_HUD_XENO_HIVE_DELTA = new /datum/mob_hud/xeno/xeno_hive_delta(),
+	MOB_HUD_XENO_HIVE_K_SERIES = new /datum/mob_hud/xeno/xeno_hive_k_series(),
 	MOB_HUD_XENO_HIVE_FERAL = new /datum/mob_hud/xeno/xeno_hive_feral(),
 	MOB_HUD_XENO_HIVE_TAMED = new /datum/mob_hud/xeno/xeno_hive_tamed(),
 	MOB_HUD_XENO_HIVE_MUTATED = new /datum/mob_hud/xeno/xeno_hive_mutated(),
@@ -200,6 +201,7 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, flatten_numeric_alist(alist(
 /datum/mob_hud/xeno/xeno_hive_forsaken
 /datum/mob_hud/xeno/xeno_hive_yautja
 /datum/mob_hud/xeno/xeno_hive_hunted
+/datum/mob_hud/xeno/xeno_hive_k_series
 /datum/mob_hud/xeno/xeno_hive_renegade
 /datum/mob_hud/xeno/xeno_hive_tutorial
 
@@ -244,6 +246,9 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, flatten_numeric_alist(alist(
 /datum/mob_hud/faction/hyperdyne
 	faction_to_check = FACTION_HYPERDYNE
 
+/datum/mob_hud/faction/conam
+	faction_to_check = FACTION_CONAM
+
 /datum/mob_hud/faction/twe
 	faction_to_check = FACTION_TWE
 
@@ -356,6 +361,8 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, flatten_numeric_alist(alist(
 			hud = GLOB.huds[MOB_HUD_XENO_HIVE_CHARLIE]
 		if(XENO_HIVE_DELTA)
 			hud = GLOB.huds[MOB_HUD_XENO_HIVE_DELTA]
+		if(XENO_HIVE_K_SERIES)
+			hud = GLOB.huds[MOB_HUD_XENO_HIVE_K_SERIES]
 		if(XENO_HIVE_FERAL)
 			hud = GLOB.huds[MOB_HUD_XENO_HIVE_FERAL]
 		if(XENO_HIVE_TAMED)

diff --git a/code/datums/weather/weather_events/navalis_platform_13.dm b/code/datums/weather/weather_events/navalis_platform_13.dm
@@ -0,0 +1,38 @@
+/datum/weather_event/light_rain
+	name = "Tropical Storm"
+	display_name = "Tropical Storm"
+	length = 4 MINUTES
+	fullscreen_type = /atom/movable/screen/fullscreen/weather/low
+
+	turf_overlay_icon_state = "strata_storm"
+	turf_overlay_alpha = 40
+
+	effect_message = null
+	damage_per_tick = 0
+
+	has_process = TRUE
+	lightning_chance = 1
+
+	ambience = 'sound/ambience/rainforest.ogg'
+
+	fire_smothering_strength = 1
+
+/datum/weather_event/monsoon
+	name = "Monsoon Warning"
+	display_name = "Monsoon Warning"
+	length = 6 MINUTES
+	fullscreen_type = /atom/movable/screen/fullscreen/weather/high
+
+	turf_overlay_icon_state = "strata_storm"
+	turf_overlay_alpha = 115
+
+	effect_message = null
+	damage_per_tick = 0
+
+
+	ambience = 'sound/ambience/varadero_storm.ogg'
+
+	has_process = TRUE
+	lightning_chance = 6
+
+	fire_smothering_strength = 4
diff --git a/code/datums/weather/weather_map_holders/navalis_platform_13.dm b/code/datums/weather/weather_map_holders/navalis_platform_13.dm
@@ -0,0 +1,20 @@
+/datum/weather_ss_map_holder/navalis_platform_13
+	name = "Navalis Map Holder"
+
+	warn_time = 1 MINUTES
+	min_time_between_events = 30 MINUTES
+	min_time_between_checks = 0
+	min_check_variance = 0
+
+	no_weather_turf_icon_state = "strata_clearsky"
+
+	potential_weather_events = list(
+		/datum/weather_event/light_rain,
+		/datum/weather_event/monsoon,
+	)
+
+/datum/weather_ss_map_holder/navalis_platform_13/should_affect_area(area/A)
+	return !CEILING_IS_PROTECTED(A.ceiling, CEILING_GLASS)
+
+/datum/weather_ss_map_holder/navalis_platform_13/should_start_event()
+	return TRUE
diff --git a/code/defines/procs/announcement.dm b/code/defines/procs/announcement.dm
@@ -2,11 +2,46 @@
 #define UPP_COMMAND_ANNOUNCE "UPP Command Announcement"
 #define CLF_COMMAND_ANNOUNCE "CLF Command Announcement"
 #define PMC_COMMAND_ANNOUNCE "PMC Command Announcement"
+#define VENIR_ANNOUNCE "White Antre Central Announcement"
 #define QUEEN_ANNOUNCE "The words of the Queen reverberate in your head..."
+#define QUEEN_LORE_ANNOUNCE "The words of the Queen reverberate in your head..."
 #define QUEEN_MOTHER_ANNOUNCE "Queen Mother Psychic Directive"
 #define XENO_GENERAL_ANNOUNCE "You sense something unusual..." //general xeno announcement that don't involve Queen, for nuke for example
 #define HIGHER_FORCE_ANNOUNCE SPAN_ANNOUNCEMENT_HEADER_BLUE("Unknown Higher Force")
 
+//civilian white antre announcement
+/proc/venir_announcement(message, title = VENIR_ANNOUNCE, sound_to_play = sound('sound/misc/notice2.ogg'), faction_to_display = FACTION_SURVIVOR)
+	var/list/targets = GLOB.human_mob_list + GLOB.dead_mob_list
+	if(faction_to_display == FACTION_SURVIVOR)
+		for(var/mob/M in targets)
+			if(isobserver(M)) //observers see everything
+				continue
+			var/mob/living/carbon/human/H = M
+			if(!istype(H) || H.stat != CONSCIOUS || isyautja(H) || ismarinejob(H) || is_mainship_level(H.z)) //base human checks
+				targets.Remove(H)
+				continue
+
+	else if(faction_to_display == "Everyone (-Yautja)")
+		for(var/mob/M in targets)
+			if(isobserver(M)) //observers see everything
+				continue
+			var/mob/living/carbon/human/H = M
+			if(!istype(H) || H.stat != CONSCIOUS || isyautja(H))
+				targets.Remove(H)
+
+	else
+		for(var/mob/M in targets)
+			if(isobserver(M)) //observers see everything
+				continue
+			var/mob/living/carbon/human/H = M
+			if(!istype(H) || H.stat != CONSCIOUS || isyautja(H) || ismarinejob(H))
+				targets.Remove(H)
+				continue
+			if(H.faction != faction_to_display)
+				targets.Remove(H)
+
+	announcement_helper(message, title, targets, sound_to_play)
+
 //xenomorph hive announcement
 /proc/xeno_announcement(message, hivenumber, title = QUEEN_ANNOUNCE)
 	var/list/targets = GLOB.living_xeno_list + GLOB.dead_mob_list
@@ -27,6 +62,26 @@
 
 		announcement_helper(message, title, targets, sound(get_sfx("queen"),wait = 0,volume = 50))
 
+//xenomorph lore announcement
+/proc/xeno_lore_announcement(message, hivenumber, title = QUEEN_LORE_ANNOUNCE, sound_to_play = sound('sound/ambience/containment_breach1.ogg'))
+	var/list/targets = GLOB.living_xeno_list + GLOB.dead_mob_list
+	if(hivenumber == "everything")
+		for(var/mob/M in targets)
+			var/mob/living/carbon/xenomorph/X = M
+			if(!isobserver(X) && !istype(X)) //filter out any potential non-xenomorphs/observers mobs
+				targets.Remove(X)
+
+		announcement_helper(message, title, targets, sound_to_play)
+	else
+		for(var/mob/M in targets)
+			if(isobserver(M))
+				continue
+			var/mob/living/carbon/X = M
+			if(!istype(X) || !X.ally_of_hivenumber(hivenumber)) //additionally filter out those of wrong hive
+				targets.Remove(X)
+
+		announcement_helper(message, title, targets, sound_to_play)
+
 
 //general marine announcement
 /proc/marine_announcement(message, title = COMMAND_ANNOUNCE, sound_to_play = sound('sound/misc/notice2.ogg'), faction_to_display = FACTION_MARINE, add_PMCs = FALSE, signature, logging = ARES_LOG_MAIN)