cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

POLARIS: Tweak weird MA override

Browse Source 
Not sure when this is used, but Leshana had a good suggestion for preventing it interfering with things.
This commit is contained in:
Arokha Sieyes
2018-02-24 11:40:59 -05:00
parent a43acad170
commit 9bc7510e26
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/datums/mutable_appearance.dm
View File

@@ -4,10 +4,11 @@
// Mutable appearances are children of images, just so you know.
/mutable_appearance/New()
/mutable_appearance/New(copy_from, ...)
..()
plane = FLOAT_PLANE // No clue why this is 0 by default yet images are on FLOAT_PLANE
// And yes this does have to be in the constructor, BYOND ignores it if you set it as a normal var
if(!copy_from)
plane = FLOAT_PLANE // No clue why this is 0 by default yet images are on FLOAT_PLANE
// And yes this does have to be in the constructor, BYOND ignores it if you set it as a normal var
// Helper similar to image()
/proc/mutable_appearance(icon, icon_state = "", layer = FLOAT_LAYER)

2
code/game/objects/items/weapons/storage/fancy.dm
View File

@@ -98,8 +98,6 @@
/obj/item/weapon/storage/fancy/crayons/update_icon()
var/mutable_appearance/ma = new(src)
ma.plane = plane
ma.layer = layer
ma.overlays = list()
for(var/obj/item/weapon/pen/crayon/crayon in contents)
ma.overlays += image('icons/obj/crayons.dmi',crayon.colourName)

4
code/modules/mob/living/carbon/human/update_icons.dm
View File

@@ -160,8 +160,6 @@ Please contact me on #coderbus IRC. ~Carn x
//0: We start with their existing appearance (this contains their verbs, important to keep those!)
var/mutable_appearance/ma_compiled = new(src)
ma_compiled.plane = plane //Required because of an override on mutable_appearance/New() that sets it to FLOAT_PLANE...for some reason.
ma_compiled.layer = layer
//1: HUDs because these are hidden behind a backplane. See update_icons_huds()
ma_compiled.overlays = list_huds //The first one can set instead of add
@@ -190,8 +188,6 @@ Please contact me on #coderbus IRC. ~Carn x
ma = passed_ma
else
ma = new(src)
ma.plane = plane //Required because of an override on mutable_appearance/New() that sets it to FLOAT_PLANE...for some reason.
ma.layer = layer
/* VOREStation Edit START - TODO - Consider switching to icon_scale
// First, get the correct size.