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 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.