diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index 79d0eba9f1..4f69bcc961 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -15,6 +15,18 @@ processing_objects.Remove(src) ..() +/obj/item/weapon/holder/return_air() + var/turf/T = get_turf(src) + return T.return_air() + +/obj/item/weapon/holder/handle_internal_lifeform(mob/lifeform_inside_me, breath_request) + var/turf/T = get_turf(src) + return T.remove_air(breath_request) + +/obj/item/weapon/holder/assume_air(var/mixture) + var/turf/T = get_turf(src) + return T.assume_air(mixture) + /obj/item/weapon/holder/process() if(istype(loc,/turf) || !(contents.len)) diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index 075fe4eb37..481fc486f8 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -137,7 +137,7 @@ /mob/living/carbon/monkey/attack_hand(mob/living/carbon/human/M as mob) - if (M.a_intent == "help") + if (M.a_intent == "help" && a_intent == "help") help_shake_act(M) get_scooped(M) else