mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 02:34:00 +00:00
Fixed monkeys suffocating. Also monkeys with harm in mind are not scoopable now for balance.
This commit is contained in:
@@ -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))
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user