From 2c58d5866e2fb4b9bd9247dab9fa51487c92a97d Mon Sep 17 00:00:00 2001 From: ModDownloading Date: Sun, 17 May 2026 13:10:36 -0500 Subject: [PATCH 1/2] Remove enscribed runes from ambush mob gear. Removed setup_equip_block call from ambush logic. --- code/modules/mob/living/ambush.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/mob/living/ambush.dm b/code/modules/mob/living/ambush.dm index b6b77a1e48f..10615e0fa96 100644 --- a/code/modules/mob/living/ambush.dm +++ b/code/modules/mob/living/ambush.dm @@ -155,10 +155,6 @@ GLOBAL_VAR_INIT(ambush_mobconsider_cooldown, 2 MINUTES) // Cooldown for each ind playsound_local(src, pick('sound/misc/jumphumans (1).ogg','sound/misc/jumphumans (2).ogg','sound/misc/jumphumans (3).ogg'), 100) shake_camera(src, 2, 2) -/mob/living/proc/setup_equip_block() - for(var/obj/item/clothing/clothing in contents) - clothing.AddElement(/datum/element/faction_restricted_equip) - // Return whether a mob is blocked from being ambushed /mob/living/proc/get_will_block_ambush() if(!ambushable()) From 57261e0bf5210e2ce7b09daf9bab0020b8be4aa5 Mon Sep 17 00:00:00 2001 From: ModDownloading Date: Mon, 18 May 2026 19:53:15 -0400 Subject: [PATCH 2/2] Remove callback --- code/modules/mob/living/ambush.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/ambush.dm b/code/modules/mob/living/ambush.dm index 10615e0fa96..f55651877b0 100644 --- a/code/modules/mob/living/ambush.dm +++ b/code/modules/mob/living/ambush.dm @@ -145,7 +145,6 @@ GLOBAL_VAR_INIT(ambush_mobconsider_cooldown, 2 MINUTES) // Cooldown for each ind H.del_on_deaggro = 44 SECONDS H.last_aggro_loss = world.time H.add_faction("ambush") - addtimer(CALLBACK(H, PROC_REF(setup_equip_block)), 3 SECONDS) mustype = 2 if(!spawns) return @@ -155,6 +154,10 @@ GLOBAL_VAR_INIT(ambush_mobconsider_cooldown, 2 MINUTES) // Cooldown for each ind playsound_local(src, pick('sound/misc/jumphumans (1).ogg','sound/misc/jumphumans (2).ogg','sound/misc/jumphumans (3).ogg'), 100) shake_camera(src, 2, 2) +/mob/living/proc/setup_equip_block() + for(var/obj/item/clothing/clothing in contents) + clothing.AddElement(/datum/element/faction_restricted_equip) + // Return whether a mob is blocked from being ambushed /mob/living/proc/get_will_block_ambush() if(!ambushable())