From a2497d73d4e609b500f24b78517bfa03eafe8e58 Mon Sep 17 00:00:00 2001 From: Theos Date: Wed, 8 May 2024 22:51:32 -0400 Subject: [PATCH 1/3] Fix static anomalies the secondo ne Signed-off-by: Theos --- .../effects/anomalies/anomalies_static.dm | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/code/game/objects/effects/anomalies/anomalies_static.dm b/code/game/objects/effects/anomalies/anomalies_static.dm index a00babe5844a..1dc2497b8c34 100644 --- a/code/game/objects/effects/anomalies/anomalies_static.dm +++ b/code/game/objects/effects/anomalies/anomalies_static.dm @@ -39,19 +39,19 @@ playsound(src, 'sound/effects/walkietalkie.ogg', 75) if(stored_mob && looking.stat != DEAD && prob(25)) say_fucky_things() - if (!HAS_TRAIT(looking, TRAIT_MINDSHIELD) && looking.stat != DEAD || !looking.research_scanner && looking.stat != DEAD || !HAS_TRAIT(looking, TRAIT_DEAF)) - looking.adjustOrganLoss(ORGAN_SLOT_BRAIN, 10, 200) - playsound(src, 'sound/effects/stall.ogg', 50) - if(looking.getOrganLoss(ORGAN_SLOT_BRAIN) >= 150 && looking.stat != DEAD) - if(prob(20)) - var/mob/living/carbon/victim = looking - var/obj/effect/anomaly/tvstatic/planetary/expansion - expansion = new(get_turf(victim)) - visible_message(span_warning("The static overtakes [victim], taking their place!")) - victim.death() - expansion.stored_mob = victim - victim.forceMove(expansion) - return + if(HAS_TRAIT(looking, TRAIT_MINDSHIELD) || looking.stat == DEAD || looking.research_scanner || HAS_TRAIT(looking, TRAIT_DEAF)) + continue + looking.adjustOrganLoss(ORGAN_SLOT_BRAIN, 10, 200) + playsound(src, 'sound/effects/stall.ogg', 50) + if(looking.getOrganLoss(ORGAN_SLOT_BRAIN) >= 150 && looking.stat != DEAD) + if(prob(20)) + var/mob/living/carbon/victim = looking + var/obj/effect/anomaly/tvstatic/planetary/expansion + expansion = new(get_turf(victim)) + visible_message(" The static overtakes [victim], [expansion] taking their place!") + victim.death() + expansion.stored_mob = victim + victim.forceMove(expansion) /obj/effect/anomaly/tvstatic/Bumped(atom/movable/AM) From 21fd9e7cb96fa5594a04c5f3268cca2f265583c3 Mon Sep 17 00:00:00 2001 From: Theos Date: Wed, 8 May 2024 22:53:54 -0400 Subject: [PATCH 2/3] Update anomalies_static.dm Signed-off-by: Theos --- code/game/objects/effects/anomalies/anomalies_static.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/effects/anomalies/anomalies_static.dm b/code/game/objects/effects/anomalies/anomalies_static.dm index 1dc2497b8c34..0b0b00fadcf8 100644 --- a/code/game/objects/effects/anomalies/anomalies_static.dm +++ b/code/game/objects/effects/anomalies/anomalies_static.dm @@ -48,7 +48,7 @@ var/mob/living/carbon/victim = looking var/obj/effect/anomaly/tvstatic/planetary/expansion expansion = new(get_turf(victim)) - visible_message(" The static overtakes [victim], [expansion] taking their place!") + visible_message(span_warning(The static overtakes [victim], [expansion] taking their place!")) victim.death() expansion.stored_mob = victim victim.forceMove(expansion) From 7d706816f5d95a84b384f8e487e8eb50074f6011 Mon Sep 17 00:00:00 2001 From: Theos Date: Wed, 8 May 2024 22:54:13 -0400 Subject: [PATCH 3/3] Update anomalies_static.dm Signed-off-by: Theos --- code/game/objects/effects/anomalies/anomalies_static.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/effects/anomalies/anomalies_static.dm b/code/game/objects/effects/anomalies/anomalies_static.dm index 0b0b00fadcf8..ab574ee475dd 100644 --- a/code/game/objects/effects/anomalies/anomalies_static.dm +++ b/code/game/objects/effects/anomalies/anomalies_static.dm @@ -48,7 +48,7 @@ var/mob/living/carbon/victim = looking var/obj/effect/anomaly/tvstatic/planetary/expansion expansion = new(get_turf(victim)) - visible_message(span_warning(The static overtakes [victim], [expansion] taking their place!")) + visible_message(span_warning("The static overtakes [victim], [expansion] taking their place!")) victim.death() expansion.stored_mob = victim victim.forceMove(expansion)