shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10016 from deathride58/mousedropfixes

Browse Source 
Mousedrop fixes - Adds return value to item mousedrop and fixes bugs with the few things that override it
This commit is contained in:
Putnam3145
2019-11-30 22:51:42 -08:00
committed by GitHub
parent 953ef607e2 6b3f992d8e
commit 1d91e1acf4
8 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items.dm
+3 -2
View File
@@ -393,13 +393,14 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
return
if(over == src)
return usr.client.Click(src, src_location, src_control, params)
var/list/directaccess = usr.DirectAccess()
var/list/directaccess = usr.DirectAccess() //This, specifically, is what requires the copypaste. If this were after the adjacency check, then it'd be impossible to use items in your inventory, among other things.
//If this were before the above checks, then trying to click on items would act a little funky and signal overrides wouldn't work.
if((usr.CanReach(src) || (src in directaccess)) && (usr.CanReach(over) || (over in directaccess)))
if(!usr.get_active_held_item())
usr.UnarmedAttack(src, TRUE)
if(usr.get_active_held_item() == src)
melee_attack_chain(usr, over)
return
return TRUE //returning TRUE as a "is this overridden?" flag
if(!Adjacent(usr) || !over.Adjacent(usr))
return // should stop you from dragging through windows