cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 23:58:07 +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/datums/components/embedded.dm
+2 -2
View File
@@ -312,9 +312,9 @@
pixelX -= 2
if(throwingdatum.init_dir in list(NORTH, WEST, NORTHWEST, SOUTHWEST))
overlay = mutable_appearance(icon=weapon.righthand_file,icon_state=weapon.item_state)
overlay = mutable_appearance(icon=weapon.righthand_file,icon_state=weapon.inhand_icon_state)
else
overlay = mutable_appearance(icon=weapon.lefthand_file,icon_state=weapon.item_state)
overlay = mutable_appearance(icon=weapon.lefthand_file,icon_state=weapon.inhand_icon_state)
var/matrix/M = matrix()
M.Translate(pixelX, pixelY)