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

Renames a few variables. Also reorders icon fallback order again. (#51060)

Browse Source 
* Renames a few variables. Also reorders fallback order again.
Renames item_state to inhand_icon_state
Renames mob_overlay_icon to worn_icon
Renames mob_overlay_state to worn_icon_state
worn_icon_state/mob_overlay_state now never gets used for inhands.

* Fixes some comments

* Fixes map issue

* Restart lints

* Properly resolves conflicts
This commit is contained in:
nemvar
2020-05-25 06:47:19 +02:00
committed by GitHub
parent d0d430e964
commit 6ef421be42
356 changed files with 1938 additions and 1938 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/BrokenInhands.dm
+5 -5
View File
@@ -10,10 +10,10 @@
var/list/Rstates = IR.IconStates()
var/icon/J = new(O.icon)
var/list/istates = J.IconStates()
if(!Lstates.Find(O.icon_state) && !Lstates.Find(O.item_state))
if(!Lstates.Find(O.icon_state) && !Lstates.Find(O.inhand_icon_state))
if(O.icon_state)
text += "[O.type] WANTS IN LEFT HAND CALLED\n\"[O.icon_state]\".\n"
if(!Rstates.Find(O.icon_state) && !Rstates.Find(O.item_state))
if(!Rstates.Find(O.icon_state) && !Rstates.Find(O.inhand_icon_state))
if(O.icon_state)
text += "[O.type] WANTS IN RIGHT HAND CALLED\n\"[O.icon_state]\".\n"
@@ -21,9 +21,9 @@
if(O.icon_state)
if(!istates.Find(O.icon_state))
text += "[O.type] MISSING NORMAL ICON CALLED\n\"[O.icon_state]\" IN \"[O.icon]\"\n"
if(O.item_state)
if(!istates.Find(O.item_state))
text += "[O.type] MISSING NORMAL ICON CALLED\n\"[O.item_state]\" IN \"[O.icon]\"\n"
if(O.inhand_icon_state)
if(!istates.Find(O.inhand_icon_state))
text += "[O.type] MISSING NORMAL ICON CALLED\n\"[O.inhand_icon_state]\" IN \"[O.icon]\"\n"
text+="\n"
qdel(O)
if(text)