From 8b9abe582c15dc27ea5569c63d049ffaf10b7a62 Mon Sep 17 00:00:00 2001 From: Heroman Date: Thu, 29 Dec 2022 16:43:48 +1000 Subject: [PATCH] Fixes comfy chair colors --- .../structures/stool_bed_chair_nest/chairs.dm | 102 +++++++++--------- .../stool_bed_chair_nest/chairs_vr.dm | 4 +- .../stool_bed_chair_nest/wheelchair.dm | 4 +- 3 files changed, 52 insertions(+), 58 deletions(-) diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index daee0ca1798..6ffa0f37e7f 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -9,8 +9,8 @@ buckle_lying = 0 //force people to sit up in chairs when buckled var/propelled = 0 // Check for fire-extinguisher-driven chairs -/obj/structure/bed/chair/Initialize() - . = ..() +/obj/structure/bed/chair/New(var/newloc, var/new_material, var/new_padding_material) + ..() update_layer() /obj/structure/bed/chair/attackby(obj/item/weapon/W as obj, mob/user as mob) @@ -113,44 +113,38 @@ I.color = padding_material.icon_colour add_overlay(I) -/obj/structure/bed/chair/comfy/brown/Initialize(var/ml,var/newmaterial) - . = ..(ml, MAT_STEEL, MAT_LEATHER) +/obj/structure/bed/chair/comfy/brown/New(var/newloc, var/new_material, var/new_padding_material) + ..(newloc, MAT_STEEL, MAT_LEATHER) -/obj/structure/bed/chair/comfy/red/Initialize(var/ml,var/newmaterial) - . = ..(ml, MAT_STEEL, "carpet") +/obj/structure/bed/chair/comfy/red/New(var/newloc, var/new_material, var/new_padding_material) + ..(newloc, MAT_STEEL, "carpet") -/obj/structure/bed/chair/comfy/teal/Initialize(var/ml,var/newmaterial) - . = ..(ml, MAT_STEEL, "teal") +/obj/structure/bed/chair/comfy/teal/New(var/newloc, var/new_material, var/new_padding_material) + ..(newloc, MAT_STEEL, "teal") -/obj/structure/bed/chair/comfy/black/Initialize(var/ml,var/newmaterial) - . = ..(ml, MAT_STEEL, "black") +/obj/structure/bed/chair/comfy/black/New(var/newloc, var/new_material, var/new_padding_material) + ..(newloc, MAT_STEEL, "black") -/obj/structure/bed/chair/comfy/green/Initialize(var/ml,var/newmaterial) - . = ..(ml, MAT_STEEL, "green") +/obj/structure/bed/chair/comfy/green/New(var/newloc, var/new_material, var/new_padding_material) + ..(newloc, MAT_STEEL, "green") -/obj/structure/bed/chair/comfy/purp/Initialize(var/ml,var/newmaterial) - . = ..(ml, MAT_STEEL, "purple") +/obj/structure/bed/chair/comfy/purp/New(var/newloc, var/new_material, var/new_padding_material) + ..(newloc, MAT_STEEL, "purple") -/obj/structure/bed/chair/comfy/blue/Initialize(var/ml,var/newmaterial) - . = ..(ml, MAT_STEEL, "blue") +/obj/structure/bed/chair/comfy/blue/New(var/newloc, var/new_material, var/new_padding_material) + ..(newloc, MAT_STEEL, "blue") -/obj/structure/bed/chair/comfy/beige/Initialize(var/ml,var/newmaterial) - . = ..(ml, MAT_STEEL, "beige") +/obj/structure/bed/chair/comfy/beige/New(var/newloc, var/new_material, var/new_padding_material) + ..(newloc, MAT_STEEL, "beige") -/obj/structure/bed/chair/comfy/lime/Initialize(var/ml,var/newmaterial) - . = ..(ml, MAT_STEEL, "lime") +/obj/structure/bed/chair/comfy/lime/New(var/newloc, var/new_material, var/new_padding_material) + ..(newloc, MAT_STEEL, "lime") -/obj/structure/bed/chair/comfy/red/New(var/newloc,var/newmaterial) - ..(newloc,"steel","carpet") +/obj/structure/bed/chair/comfy/yellow/New(var/newloc, var/new_material, var/new_padding_material) + ..(newloc, MAT_STEEL, "yellow") -/obj/structure/bed/chair/comfy/teal/New(var/newloc,var/newmaterial) - ..(newloc,"steel","teal") - -/obj/structure/bed/chair/comfy/yellow/Initialize(var/ml,var/newmaterial) - . = ..(ml, MAT_STEEL, "yellow") - -/obj/structure/bed/chair/comfy/orange/Initialize(var/ml,var/newmaterial) - . = ..(ml, MAT_STEEL, "orange") +/obj/structure/bed/chair/comfy/orange/New(var/newloc, var/new_material, var/new_padding_material) + ..(newloc, MAT_STEEL, "orange") /obj/structure/bed/chair/comfy/rounded name = "rounded chair" @@ -158,38 +152,38 @@ icon_state = "roundedchair" base_icon = "roundedchair" -/obj/structure/bed/chair/comfy/rounded/brown/Initialize(var/ml,var/newmaterial) - . = ..(ml, MAT_STEEL, MAT_LEATHER) +/obj/structure/bed/chair/comfy/rounded/brown/New(var/newloc, var/new_material, var/new_padding_material) + ..(newloc, MAT_STEEL, MAT_LEATHER) -/obj/structure/bed/chair/comfy/rounded/red/Initialize(var/ml,var/newmaterial) - . = ..(ml, MAT_STEEL, "carpet") +/obj/structure/bed/chair/comfy/rounded/red/New(var/newloc, var/new_material, var/new_padding_material) + ..(newloc, MAT_STEEL, "carpet") -/obj/structure/bed/chair/comfy/rounded/teal/Initialize(var/ml,var/newmaterial) - . = ..(ml, MAT_STEEL, "teal") +/obj/structure/bed/chair/comfy/rounded/teal/New(var/newloc, var/new_material, var/new_padding_material) + ..(newloc, MAT_STEEL, "teal") -/obj/structure/bed/chair/comfy/rounded/black/Initialize(var/ml,var/newmaterial) - . = ..(ml, MAT_STEEL, "black") +/obj/structure/bed/chair/comfy/rounded/black/New(var/newloc, var/new_material, var/new_padding_material) + ..(newloc, MAT_STEEL, "black") -/obj/structure/bed/chair/comfy/rounded/green/Initialize(var/ml,var/newmaterial) - . = ..(ml, MAT_STEEL, "green") +/obj/structure/bed/chair/comfy/rounded/green/New(var/newloc, var/new_material, var/new_padding_material) + ..(newloc, MAT_STEEL, "green") -/obj/structure/bed/chair/comfy/rounded/purple/Initialize(var/ml,var/newmaterial) - . = ..(ml, MAT_STEEL, "purple") +/obj/structure/bed/chair/comfy/rounded/purple/New(var/newloc, var/new_material, var/new_padding_material) + ..(newloc, MAT_STEEL, "purple") -/obj/structure/bed/chair/comfy/rounded/blue/Initialize(var/ml,var/newmaterial) - . = ..(ml, MAT_STEEL, "blue") +/obj/structure/bed/chair/comfy/rounded/blue/New(var/newloc, var/new_material, var/new_padding_material) + ..(newloc, MAT_STEEL, "blue") -/obj/structure/bed/chair/comfy/rounded/beige/Initialize(var/ml,var/newmaterial) - . = ..(ml, MAT_STEEL, "beige") +/obj/structure/bed/chair/comfy/rounded/beige/New(var/newloc, var/new_material, var/new_padding_material) + ..(newloc, MAT_STEEL, "beige") -/obj/structure/bed/chair/comfy/rounded/lime/Initialize(var/ml,var/newmaterial) - . = ..(ml, MAT_STEEL, "lime") +/obj/structure/bed/chair/comfy/rounded/lime/New(var/newloc, var/new_material, var/new_padding_material) + ..(newloc, MAT_STEEL, "lime") -/obj/structure/bed/chair/comfy/rounded/yellow/Initialize(var/ml,var/newmaterial) - . = ..(ml, MAT_STEEL, "yellow") +/obj/structure/bed/chair/comfy/rounded/yellow/New(var/newloc, var/new_material, var/new_padding_material) + ..(newloc, MAT_STEEL, "yellow") -/obj/structure/bed/chair/comfy/rounded/orange/Initialize(var/ml,var/newmaterial) - . = ..(ml, MAT_STEEL, "orange") +/obj/structure/bed/chair/comfy/rounded/orange/New(var/newloc, var/new_material, var/new_padding_material) + ..(newloc, MAT_STEEL, "orange") /obj/structure/bed/chair/office anchored = FALSE @@ -356,8 +350,8 @@ color = null var/padding_color = "#CC0000" -/obj/structure/bed/chair/sofa/bench/Initialize() - . = ..() +/obj/structure/bed/chair/sofa/bench/New(var/newloc, var/new_material, var/new_padding_material) + ..() var/mutable_appearance/MA // If we're north-facing, metal goes above mob, padding overlay goes below mob. if((dir & NORTH) && !corner_piece) diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs_vr.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs_vr.dm index a9cd5e4a103..d47df1f421b 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs_vr.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs_vr.dm @@ -6,8 +6,8 @@ base_icon = "modern_chair" applies_material_colour = 0 -/obj/structure/bed/chair/modern_chair/Initialize() - . = ..() +/obj/structure/bed/chair/modern_chair/New(var/newloc, var/new_material, var/new_padding_material) + ..() var/image/I = image(icon, "[base_icon]_over") I.layer = ABOVE_MOB_LAYER I.plane = MOB_PLANE diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm index 2521055dadd..142cd8928ec 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm @@ -13,8 +13,8 @@ var/min_mob_buckle_size = MOB_SMALL var/max_mob_buckle_size = MOB_LARGE -/obj/structure/bed/chair/wheelchair/Initialize() - . = ..() +/obj/structure/bed/chair/wheelchair/New(var/newloc, var/new_material, var/new_padding_material) + ..() update_icon() /obj/structure/bed/chair/wheelchair/motor