no messages on hijack delete

cmss13-devs · Aug 2, 2023 · c3b6e3b · c3b6e3b
1 parent 48336c4
commit c3b6e3b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/code/modules/cm_aliens/structures/special/pylon_core.dm b/code/modules/cm_aliens/structures/special/pylon_core.dm
@@ -99,6 +99,9 @@
 	if(activated)
 		activated = FALSE
 
+		if(hijack_delete)
+			return ..()
+
 		marine_announcement("ALERT.\n\nEnergy build up around communication relay at [get_area(src)] halted.", "[MAIN_AI_SYSTEM] Biological Scanner") // Ask lore team for a better AI system name, honestly a second look for these announcements may be good - Morrow
 
 		for(var/hivenumber in GLOB.hive_datum)

diff --git a/code/modules/cm_aliens/structures/special_structure.dm b/code/modules/cm_aliens/structures/special_structure.dm
@@ -39,6 +39,9 @@
 
 	plane = FLOOR_PLANE
 
+	/// Tells the structure if they are being deleted because of hijack
+	var/hijack_delete = FALSE
+
 /obj/effect/alien/resin/special/Initialize(mapload, hive_ref)
 	. = ..()
 	maxhealth = health

diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
@@ -898,6 +898,7 @@
 		for(var/obj/effect/alien/resin/special/S in hive_structures[name_ref])
 			if(get_area(S) == hijacked_dropship)
 				continue
+			S.hijack_delete = TRUE
 			hive_structures[name_ref] -= S
 			qdel(S)
 	for(var/mob/living/carbon/xenomorph/xeno as anything in totalXenos)