cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-30 00:21:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Monkeys no longer interact with or throw things. (#8084)

Browse Source
This commit is contained in:
Matt Atlas
2020-01-27 14:00:35 -03:00
committed by Alberyk
parent 2086946d98
commit 90b03d4de5
2 changed files with 43 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/station/monkey.dm
+2 -22
View File
@@ -48,33 +48,13 @@
pass_flags = PASSTABLE
holder_type = /obj/item/holder/monkey
var/static/list/no_touchie = list(/obj/item/mirror)
/datum/species/monkey/handle_npc(var/mob/living/carbon/human/H)
if(H.stat != CONSCIOUS)
return
if(prob(33) && isturf(H.loc) && !H.pulledby && !ismob(H.loc)) //won't move if being pulled
step(H, pick(cardinal))
var/obj/held = H.get_active_hand()
if(held && prob(1) && !ismob(H.loc))
var/turf/T = get_random_turf_in_range(H, 7, 2)
if(T)
if(istype(held, /obj/item/gun) && prob(80))
var/obj/item/gun/G = held
G.Fire(T, H)
else
H.throw_item(T)
else
H.drop_item()
if(!held && !H.restrained() && prob(5) && !ismob(H.loc))
var/list/touchables = list()
for(var/obj/O in range(1,get_turf(H)))
if(O.simulated && O.Adjacent(H) && !is_type_in_list(O, no_touchie))
touchables += O
if(touchables.len)
var/obj/touchy = pick(touchables)
touchy.attack_hand(H)
if(prob(33) && H.canmove && isturf(H.loc) && !H.pulledby) //won't move if being pulled
step(H, pick(cardinal))
if(prob(1))
H.emote(pick("scratch","jump","roll","tail"))