grace period rework + overwatch fix

cmss13-devs · May 25, 2024 · 39aad11 · 39aad11
1 parent 2294031
commit 39aad11
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/code/datums/components/status_effect_component.dm b/code/datums/components/status_effect_component.dm
@@ -2,7 +2,11 @@
 
 /datum/component/status_effect
 	var/has_immunity = FALSE
-	var/grace_period = 20
+	var/grace_period = 5
+
+/datum/component/status_effect/InheritComponent(datum/component/C, i_am_original)
+	if(has_immunity)
+		grace_period = initial(grace_period)
 
 /datum/component/status_effect/Initialize()
 	. = ..()

diff --git a/code/modules/mob/living/carbon/xenomorph/XenoOverwatch.dm b/code/modules/mob/living/carbon/xenomorph/XenoOverwatch.dm
@@ -139,6 +139,13 @@
 	if (observed_xeno && (observed_xeno.stat == DEAD || QDELETED(observed_xeno)))
 		overwatch(null, TRUE)
 
+	if(observed_xeno && HAS_TRAIT(observed_xeno, TRAIT_HIVEMIND_INTERFERENCE))
+		to_chat(src, SPAN_XENOWARNING("Our sister's psychic connection is cut off!"))
+		overwatch(null, TRUE)
+
+	if(HAS_TRAIT(src, TRAIT_HIVEMIND_INTERFERENCE))
+		overwatch(null, TRUE)
+
 /mob/living/carbon/xenomorph/proc/overwatch_handle_mob_move_or_look(mob/living/carbon/xenomorph/mover, actually_moving, direction, specific_direction)
 	SIGNAL_HANDLER