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/modules/antagonists/abductor/equipment/abduction_gear.dm
+1 -1
View File
@@ -55,7 +55,7 @@
var/datum/action/A = X
A.UpdateButtonIcon()
/obj/item/clothing/suit/armor/abductor/vest/item_action_slot_check(slot, mob/user)
/obj/item/clothing/suit/armor/abductor/vest/item_action_slot_check(slot, mob/user, datum/action/A)
if(slot == SLOT_WEAR_SUIT) //we only give the mob the ability to activate the vest if he's actually wearing it.
return 1
code/modules/antagonists/clockcult/clock_items/judicial_visor.dm
+1 -1
View File
@@ -27,7 +27,7 @@
qdel(blaster)
return ..()
/obj/item/clothing/glasses/judicial_visor/item_action_slot_check(slot, mob/user)
/obj/item/clothing/glasses/judicial_visor/item_action_slot_check(slot, mob/user, datum/action/A)
if(slot != SLOT_GLASSES)
return 0
return ..()