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

Fixes a whole bunch of bugs. (#7984)

Browse Source
This commit is contained in:
Matt Atlas
2020-01-12 11:37:05 +01:00
committed by GitHub
parent 204b1614e3
commit 06dbe222ad
8 changed files with 56 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/station/monkey.dm
+3 -3
View File
@@ -53,11 +53,11 @@
/datum/species/monkey/handle_npc(var/mob/living/carbon/human/H)
if(H.stat != CONSCIOUS)
return
if(prob(33) && isturf(H.loc) && !H.pulledby) //won't move if being pulled
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))
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))
@@ -67,7 +67,7 @@
H.throw_item(T)
else
H.drop_item()
if(!held && !H.restrained() && prob(5))
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))