cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed monkeys suffocating. Also monkeys with harm in mind are not scoopable now for balance.

Browse Source
This commit is contained in:
Chinsky
2015-03-07 16:03:43 +03:00
parent ba6d0e9722
commit b730e8309e
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/mob/holder.dm
View File

@@ -15,6 +15,18 @@
processing_objects.Remove(src) 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() /obj/item/weapon/holder/process()
if(istype(loc,/turf) || !(contents.len)) if(istype(loc,/turf) || !(contents.len))

2
code/modules/mob/living/carbon/monkey/monkey.dm
View File

@@ -137,7 +137,7 @@
/mob/living/carbon/monkey/attack_hand(mob/living/carbon/human/M as mob) /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) help_shake_act(M)
get_scooped(M) get_scooped(M)
else else