mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 11:43:31 +00:00
Merge pull request #4944 from VOREStation/pol-matweak
Tweak weird MA override
This commit is contained in:
@@ -4,8 +4,9 @@
|
||||
|
||||
// Mutable appearances are children of images, just so you know.
|
||||
|
||||
/mutable_appearance/New()
|
||||
/mutable_appearance/New(copy_from, ...)
|
||||
..()
|
||||
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
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -159,8 +159,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
|
||||
@@ -189,8 +187,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
|
||||
|
||||
// First, get the correct size.
|
||||
var/desired_scale = icon_scale
|
||||
|
||||
Reference in New Issue
Block a user