cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-30 07:26:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync2018

Browse Source 
# Conflicts:
#	code/game/objects/structures/signs.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/organs/organ_icon.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
This commit is contained in:
Arokha Sieyes
2017-12-26 23:07:58 -05:00
parent b13cf41ff9 522a3b5f98
commit d998f36c38
72 changed files with 16321 additions and 15298 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/games/cards.dm
+5 -1
View File
@@ -65,7 +65,11 @@
..()
/obj/item/weapon/deck/attack_hand(mob/user as mob)
draw_card()
var/mob/living/carbon/human/H = user
if(istype(src.loc, /obj/item/weapon/storage) || src == H.r_store || src == H.l_store || src.loc == user) // so objects can be removed from storage containers or pockets. also added a catch-all, so if it's in the mob you'll pick it up.
..()
else // but if they're not, or are in your hands, you can still draw cards.
draw_card()
/obj/item/weapon/deck/verb/draw_card()