cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 11:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10210 from Dave-TH/deck_fix

Browse Source 
Card Deck Fix
This commit is contained in:
variableundefined
2018-11-13 13:02:25 +08:00
committed by GitHub
parent 9d1083223a 28405c7c2d
commit 4711732caa
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/games/cards.dm
+11 -15
View File
@@ -220,24 +220,20 @@
if(M.incapacitated() || !Adjacent(M))
return
if(over_object == M)
if(over_object == M || istype(over_object, /obj/screen))
if(!remove_item_from_storage(M))
M.unEquip(src)
M.put_in_hands(src)
if(over_object != M)
switch(over_object.name)
if("r_hand")
M.put_in_r_hand(src)
if("l_hand")
M.put_in_l_hand(src)
else
M.put_in_hands(src)
else if(istype(over_object, /obj/screen))
switch(over_object.name)
if("r_hand")
if(!remove_item_from_storage(M))
M.unEquip(src)
M.put_in_r_hand(src)
if("l_hand")
if(!remove_item_from_storage(M))
M.unEquip(src)
M.put_in_l_hand(src)
add_fingerprint(M)
usr.visible_message("<span class='notice'>[usr] picks up the deck.</span>")
add_fingerprint(M)
usr.visible_message("<span class='notice'>[usr] picks up the deck.</span>")
/obj/item/pack
name = "Card Pack"