cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 08:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes the non bitflag slot defines (#47742)

Browse Source 
Removes the non bitflag slot defines
This commit is contained in:
Emmett Gaines
2019-11-17 17:52:11 -08:00
committed by Rob Bailey
parent d6816fddb6
commit 5481515dff
145 changed files with 577 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/equipment/wormhole_jaunter.dm
+2 -2
View File
@@ -58,7 +58,7 @@
var/mob/M = loc
if(istype(M))
var/triggered = FALSE
if(M.get_item_by_slot(SLOT_BELT) == src)
if(M.get_item_by_slot(ITEM_SLOT_BELT) == src)
if(power == 1)
triggered = TRUE
else if(power == 2 && prob(50))
@@ -70,7 +70,7 @@
activate(M)
/obj/item/wormhole_jaunter/proc/chasm_react(mob/user)
if(user.get_item_by_slot(SLOT_BELT) == src)
if(user.get_item_by_slot(ITEM_SLOT_BELT) == src)
to_chat(user, "<span class='notice'>Your [name] activates, saving you from the chasm!</span>")
SSblackbox.record_feedback("tally", "jaunter", 1, "Chasm") // chasm automatic activation
activate(user, FALSE)
code/modules/mining/lavaland/necropolis_chests.dm
+1 -1
View File
@@ -208,7 +208,7 @@
var/mob/living/carbon/human/active_owner
/obj/item/clothing/neck/necklace/memento_mori/item_action_slot_check(slot)
return slot == SLOT_NECK
return slot == ITEM_SLOT_NECK
/obj/item/clothing/neck/necklace/memento_mori/dropped(mob/user)
..()