cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-03 05:51:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11927 from comma/devfix

Browse Source 
Devfixes
This commit is contained in:
Ccomp5950
2016-01-07 13:03:26 -05:00
parent 2f67cb18d8 7b4289e072
commit 97c0635fad
6 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1385,7 +1385,7 @@
/mob/living/carbon/human/MouseDrop(var/atom/over_object)
var/mob/living/carbon/human/H = over_object
if(holder_type && istype(H) && !H.lying && !issmall(H) && Adjacent(H))
if(H.a_intent == I_HELP && holder_type && istype(H) && !H.lying && !issmall(H) && Adjacent(H))
get_scooped(H, (usr == src))
return
return ..()

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

@@ -39,7 +39,7 @@
push_flags = MONKEY|SLIME|SIMPLE_ANIMAL|ALIEN
pass_flags = PASSTABLE
holder_type = /obj/item/weapon/holder
/datum/species/monkey/handle_npc(var/mob/living/carbon/human/H)
if(H.stat != CONSCIOUS)
return