Merge pull request #9535 from Ghommie/Ghommie-cit247

Fixing sniper rifles scope datum action oddity.
This commit is contained in:
kevinz000
2019-10-24 19:05:25 -07:00
committed by GitHub
16 changed files with 61 additions and 83 deletions
+2 -2
View File
@@ -192,7 +192,7 @@
remove_paddles(user)
update_icon()
/obj/item/defibrillator/item_action_slot_check(slot, mob/user)
/obj/item/defibrillator/item_action_slot_check(slot, mob/user, datum/action/A)
if(slot == user.getBackSlot())
return 1
@@ -243,7 +243,7 @@
w_class = WEIGHT_CLASS_NORMAL
slot_flags = ITEM_SLOT_BELT
/obj/item/defibrillator/compact/item_action_slot_check(slot, mob/user)
/obj/item/defibrillator/compact/item_action_slot_check(slot, mob/user, datum/action/A)
if(slot == user.getBeltSlot())
return TRUE