[MIRROR] Properly checks flags with & instead of == [MDB IGNORE] (#16487)

* Properly checks flags with & instead of ==

* merge fixed for changeling

* skyrat equipment updated

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Tastyfish <crazychris32@gmail.com>
This commit is contained in:
SkyratBot
2022-09-28 16:38:59 -04:00
committed by GitHub
co-authored by John Willard Tastyfish
parent de331bbe60
commit 32db6d2411
84 changed files with 115 additions and 115 deletions
@@ -35,11 +35,11 @@
. += span_notice("The cuff's GPS signal is on.")
/obj/item/kheiral_cuffs/item_action_slot_check(slot)
return slot == ITEM_SLOT_GLOVES
return (slot & ITEM_SLOT_GLOVES)
/obj/item/kheiral_cuffs/equipped(mob/user, slot, initial)
. = ..()
if(slot != ITEM_SLOT_GLOVES)
if(!(slot & ITEM_SLOT_GLOVES))
return
on_wrist = TRUE
playsound(loc, 'sound/weapons/handcuffs.ogg', 30, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+3 -3
View File
@@ -131,7 +131,7 @@
var/mob/living/carbon/human/active_owner
/obj/item/clothing/neck/necklace/memento_mori/item_action_slot_check(slot)
return slot == ITEM_SLOT_NECK
return (slot & ITEM_SLOT_NECK)
/obj/item/clothing/neck/necklace/memento_mori/dropped(mob/user)
..()
@@ -568,7 +568,7 @@
/obj/item/clothing/gloves/gauntlets/equipped(mob/user, slot)
. = ..()
if(slot == ITEM_SLOT_GLOVES)
if(slot & ITEM_SLOT_GLOVES)
tool_behaviour = TOOL_MINING
RegisterSignal(user, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, .proc/rocksmash)
RegisterSignal(user, COMSIG_MOVABLE_BUMP, .proc/rocksmash)
@@ -729,7 +729,7 @@
/obj/item/clothing/glasses/godeye/equipped(mob/living/user, slot)
. = ..()
if(ishuman(user) && slot == ITEM_SLOT_EYES)
if(ishuman(user) && (slot & ITEM_SLOT_EYES))
ADD_TRAIT(src, TRAIT_NODROP, EYE_OF_GOD_TRAIT)
pain(user)
scan_ability.Grant(user)