cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 05:02:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes deck of cards bringing up unnecesary prompt when picked up

Browse Source
This commit is contained in:
Heroman3003
2019-04-08 10:49:56 +10:00
parent 70628015e5
commit f65ac4fce9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/games/cards.dm
View File

@@ -254,8 +254,9 @@
return return
/obj/item/weapon/deck/verb_pickup(mob/user as mob) // Snowflaked so pick up verb work as intended /obj/item/weapon/deck/verb_pickup() // Snowflaked so pick up verb work as intended
if((user == usr && (!( usr.restrained() ) && (!( usr.stat ) && (usr.contents.Find(src) || in_range(src, usr)))))) var/mob/user = usr
if((istype(user) && (!( usr.restrained() ) && (!( usr.stat ) && (usr.contents.Find(src) || in_range(src, usr))))))
if(!istype(usr, /mob/living/simple_mob)) if(!istype(usr, /mob/living/simple_mob))
if( !usr.get_active_hand() ) //if active hand is empty if( !usr.get_active_hand() ) //if active hand is empty
var/mob/living/carbon/human/H = user var/mob/living/carbon/human/H = user