diff --git a/code/datums/mutable_appearance.dm b/code/datums/mutable_appearance.dm index 1cb3a97d9f..16d10ae035 100644 --- a/code/datums/mutable_appearance.dm +++ b/code/datums/mutable_appearance.dm @@ -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) diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 94e2e559db..8b31517fd0 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -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) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 3b6a790a34..657b9005d7 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -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. diff --git a/code/modules/mob/living/simple_animal/vore/shadekin/shadekin.dm b/code/modules/mob/living/simple_animal/vore/shadekin/shadekin.dm index 7748ca2254..5594a6f1bc 100644 --- a/code/modules/mob/living/simple_animal/vore/shadekin/shadekin.dm +++ b/code/modules/mob/living/simple_animal/vore/shadekin/shadekin.dm @@ -225,8 +225,6 @@ eyeimage = image(icon,null,eye_icon_state) var/mutable_appearance/ma = new(src) - ma.plane = plane - ma.layer = layer ma.overlays += tailimage ma.overlays += eyeimage appearance = ma diff --git a/code/modules/vore/fluffstuff/guns/nsfw.dm b/code/modules/vore/fluffstuff/guns/nsfw.dm index 9ed2b96600..4d8a529d04 100644 --- a/code/modules/vore/fluffstuff/guns/nsfw.dm +++ b/code/modules/vore/fluffstuff/guns/nsfw.dm @@ -114,8 +114,6 @@ /obj/item/weapon/gun/projectile/nsfw/update_icon() var/mutable_appearance/ma = new(src) - ma.plane = plane //This is especially weird as new(src) should take these, but it doens't? - ma.layer = layer //Instead it ends up on FLOAT_PLANE update_charge() if(!chambered) @@ -179,8 +177,6 @@ /obj/item/ammo_magazine/nsfw_mag/update_icon() var/mutable_appearance/ma = new(src) - ma.plane = plane //This is especially weird as new(src) should take these, but it doens't? - ma.layer = layer //Instead it ends up on FLOAT_PLANE if(!stored_ammo.len) ma.overlays = list()