overwatch fix and interference overflow fix

cmss13-devs · May 25, 2024 · 91b6f0d · 91b6f0d
1 parent 5b376bc
commit 91b6f0d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/code/datums/components/hivemind_interference.dm b/code/datums/components/hivemind_interference.dm
@@ -23,6 +23,8 @@
 	else
 		interference += inter.interference
 
+	interference = min(interference, max_buildup)
+
 /datum/component/status_effect/interference/process(delta_time)
 	if(has_immunity)
 		return ..()

diff --git a/code/modules/mob/living/carbon/xenomorph/XenoOverwatch.dm b/code/modules/mob/living/carbon/xenomorph/XenoOverwatch.dm
@@ -89,6 +89,10 @@
 			to_chat(src, SPAN_XENOWARNING("We can't watch ourselves!"))
 			return
 
+		if(HAS_TRAIT(src, TRAIT_HIVEMIND_INTERFERENCE))
+			to_chat(src, SPAN_XENOWARNING("Our psychic connection is cut off!"))
+			return
+
 		if(HAS_TRAIT(targetXeno, TRAIT_HIVEMIND_INTERFERENCE))
 			to_chat(src, SPAN_XENOWARNING("Our sister's psychic connection is cut off!"))
 			return

diff --git a/code/modules/reagents/chemistry_properties/prop_negative.dm b/code/modules/reagents/chemistry_properties/prop_negative.dm
@@ -152,7 +152,7 @@
 		var/mob/living/carbon/xenomorph/xeno = M
 		if(potency > POTENCY_MAX_TIER_1) //Needs level 7+ to have any effect
 			xeno.AddComponent(/datum/component/status_effect/toxic_buildup, potency * volume * 0.25)
-			to_chat(X, SPAN_XENODANGER("The corrosive substance damages your carapace!"))
+			to_chat(xeno, SPAN_XENODANGER("The corrosive substance damages your carapace!"))
 
 /datum/chem_property/negative/corrosive/reaction_obj(obj/O, volume, potency)
 	if((istype(O,/obj/item) || istype(O,/obj/effect/glowshroom)) && prob(potency * 10))

diff --git a/code/modules/reagents/chemistry_properties/prop_positive.dm b/code/modules/reagents/chemistry_properties/prop_positive.dm
@@ -853,8 +853,8 @@
 	if(!isxeno(M))
 		return
 	var/mob/living/carbon/xenomorph/xeno = M
-	if(!HAS_TRAIT(xeno , TRAIT_HIVEMIND_INTERFERENCE))
-		to_chat(xeno , SPAN_XENOHIGHDANGER("Your awareness dims to a small area!"))
+	if(!HAS_TRAIT(xeno, TRAIT_HIVEMIND_INTERFERENCE))
+		to_chat(xeno, SPAN_XENOHIGHDANGER("Your awareness dims to a small area!"))
 	xeno.AddComponent(/datum/component/status_effect/interference, volume * potency, 90)
 
 /datum/chem_property/positive/neutralizing