From f615b7afb7f1a8de7944845ab05e2a3df8a03f8f Mon Sep 17 00:00:00 2001 From: vacken12 <112196285+vacken12@users.noreply.github.com> Date: Sat, 7 Feb 2026 04:03:02 +0300 Subject: [PATCH 1/3] Add files via upload --- code/game/objects/items/weapons/grenades/atmosgrenade.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/grenades/atmosgrenade.dm b/code/game/objects/items/weapons/grenades/atmosgrenade.dm index af231a14ab42..fb670276be5a 100644 --- a/code/game/objects/items/weapons/grenades/atmosgrenade.dm +++ b/code/game/objects/items/weapons/grenades/atmosgrenade.dm @@ -10,7 +10,7 @@ . = ..() var/turf/simulated/target_turf = get_turf(src) if(istype(target_turf)) - target_turf.atmos_spawn_air(spawn_contents, spawn_amount) + src.release_air(target_turf) /obj/item/grenade/gas/proc/release_air(turf/simulated/target_turf) // Any proc that wants MILLA to be synchronous should not sleep. From 986a2e19b89da9dd1b5a210198f8583e8304480a Mon Sep 17 00:00:00 2001 From: vacken12 <112196285+vacken12@users.noreply.github.com> Date: Sat, 7 Feb 2026 16:41:04 +0300 Subject: [PATCH 2/3] Add files via upload --- code/datums/ai/monkey/monkey_controller.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/datums/ai/monkey/monkey_controller.dm b/code/datums/ai/monkey/monkey_controller.dm index b514a926a0a2..3318df854c3e 100644 --- a/code/datums/ai/monkey/monkey_controller.dm +++ b/code/datums/ai/monkey/monkey_controller.dm @@ -99,6 +99,8 @@ have ways of interacting with a specific mob and control it. var/pickpocket = FALSE for(var/mob/living/carbon/human/human in oview(5, living_pawn)) var/obj/item/held_weapon = GetBestWeapon(list(human.get_active_hand(), human.get_inactive_hand()) + weapon, list(living_pawn.get_active_hand(), living_pawn.get_inactive_hand())) + if(istype(held_weapon, /obj/item/gun/energy/vortex_shotgun)) + continue if(held_weapon == weapon) // It's just the same one, not a held one continue pickpocket = TRUE From 87dd50161c2ce801075a08ec4c5829d1a73948c7 Mon Sep 17 00:00:00 2001 From: dageavtobusnick <71216640+dageavtobusnick@users.noreply.github.com> Date: Sat, 28 Feb 2026 18:28:24 +0500 Subject: [PATCH 3/3] Apply suggestion from @dageavtobusnick --- code/game/objects/items/weapons/grenades/atmosgrenade.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/grenades/atmosgrenade.dm b/code/game/objects/items/weapons/grenades/atmosgrenade.dm index fb670276be5a..8f0098147dd3 100644 --- a/code/game/objects/items/weapons/grenades/atmosgrenade.dm +++ b/code/game/objects/items/weapons/grenades/atmosgrenade.dm @@ -10,7 +10,7 @@ . = ..() var/turf/simulated/target_turf = get_turf(src) if(istype(target_turf)) - src.release_air(target_turf) + release_air(target_turf) /obj/item/grenade/gas/proc/release_air(turf/simulated/target_turf) // Any proc that wants MILLA to be synchronous should not sleep.