cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-31 08:37:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
BongaTheProto
2022-02-27 14:38:06 -05:00
parent 1bdc66f54a 8377263b10
commit 54aec9bd98
246 changed files with 1442 additions and 1072 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/elements/earhealing.dm
+1 -1
View File
@@ -19,7 +19,7 @@
user_by_item -= target
/datum/element/earhealing/proc/equippedChanged(datum/source, mob/living/carbon/user, slot)
if(((slot == SLOT_EARS_LEFT) || (slot == SLOT_EARS_RIGHT)) && istype(user)) //skyrat edit
if(((slot == ITEM_SLOT_EARS_LEFT) || slot == ITEM_SLOT_EARS_RIGHT) && istype(user))
user_by_item[source] = user
else
user_by_item -= source
code/datums/elements/polychromic.dm
+1 -1
View File
@@ -144,7 +144,7 @@
return TRUE
/datum/element/polychromic/proc/grant_user_action(atom/source, mob/user, slot)
if(slot == SLOT_IN_BACKPACK || slot == SLOT_LEGCUFFED || slot == SLOT_HANDCUFFED || slot == SLOT_GENERC_DEXTROUS_STORAGE)
if(slot == ITEM_SLOT_BACKPACK || slot == ITEM_SLOT_LEGCUFFED || slot == ITEM_SLOT_HANDCUFFED || slot == ITEM_SLOT_DEX_STORAGE)
return
var/datum/action/polychromic/P = actions_by_atom[source]
if(!P)
code/datums/elements/spellcasting.dm
+1 -1
View File
@@ -34,7 +34,7 @@
stacked_spellcasting_by_user -= target
/datum/element/spellcasting/proc/on_equip(datum/source, mob/equipper, slot)
if(!(cast_slots & slotdefine2slotbit(slot)))
if(!(cast_slots & slot))
return
users_by_item[source] = equipper
if(!stacked_spellcasting_by_user[equipper])