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

Merge pull request #9535 from Ghommie/Ghommie-cit247

Browse Source 
Fixing sniper rifles scope datum action oddity.
This commit is contained in:
kevinz000
2019-10-24 19:05:25 -07:00
committed by GitHub
parent debe707432 fe71e2984c
commit da502aa31d
16 changed files with 61 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items.dm
+2 -2
View File
@@ -407,12 +407,12 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
SEND_SIGNAL(src, COMSIG_ITEM_EQUIPPED, user, slot)
for(var/X in actions)
var/datum/action/A = X
if(item_action_slot_check(slot, user)) //some items only give their actions buttons when in a specific slot.
if(item_action_slot_check(slot, user, A)) //some items only give their actions buttons when in a specific slot.
A.Grant(user)
item_flags |= IN_INVENTORY
//sometimes we only want to grant the item's action if it's equipped in a specific slot.
/obj/item/proc/item_action_slot_check(slot, mob/user)
/obj/item/proc/item_action_slot_check(slot, mob/user, datum/action/A)
if(slot == SLOT_IN_BACKPACK || slot == SLOT_LEGCUFFED) //these aren't true slots, so avoid granting actions there
return FALSE
return TRUE