From a3c824dcc8bc152e775cefc4731ed5e95d4b7e3c Mon Sep 17 00:00:00 2001 From: VirgoBot <39653486+VirgoBot@users.noreply.github.com> Date: Thu, 22 Sep 2022 21:07:39 -0400 Subject: [PATCH] [MIRROR] Fixes directional overlays on padded comfy and rounded chairs (ABLE TO BE MERGED) (#13010) * Fixes directional overlays on padded comfy and rounded chairs * Fixes mirror conflicts (#13411) * Update chairs.dm * Update chairs.dm Co-authored-by: Cerebulon Co-authored-by: Poojawa Co-authored-by: C.L --- .../structures/stool_bed_chair_nest/chairs.dm | 99 +++++++++++++++---- .../materials/materials/metals/steel.dm | 26 ++--- 2 files changed, 92 insertions(+), 33 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 5466582125..d21dfc0579 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -93,14 +93,52 @@ color = null applies_material_colour = 0 -// Leaving this in for the sake of compilation. /obj/structure/bed/chair/comfy + name = "comfy chair" desc = "It's a chair. It looks comfy." icon_state = "comfychair" base_icon = "comfychair" -/obj/structure/bed/chair/comfy/brown/New(var/newloc,var/newmaterial) - ..(newloc,"steel","leather") +/obj/structure/bed/chair/comfy/update_icon() + ..() + var/image/I = image(icon, "[base_icon]_over") + I.layer = ABOVE_MOB_LAYER + I.plane = MOB_PLANE + I.color = material.icon_colour + add_overlay(I) + if(padding_material) + I = image(icon, "[base_icon]_padding_over") + I.layer = ABOVE_MOB_LAYER + I.plane = MOB_PLANE + 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/red/Initialize(var/ml,var/newmaterial) + . = ..(ml, MAT_STEEL, "carpet") + +/obj/structure/bed/chair/comfy/teal/Initialize(var/ml,var/newmaterial) + . = ..(ml, MAT_STEEL, "teal") + +/obj/structure/bed/chair/comfy/black/Initialize(var/ml,var/newmaterial) + . = ..(ml, MAT_STEEL, "black") + +/obj/structure/bed/chair/comfy/green/Initialize(var/ml,var/newmaterial) + . = ..(ml, MAT_STEEL, "green") + +/obj/structure/bed/chair/comfy/purp/Initialize(var/ml,var/newmaterial) + . = ..(ml, MAT_STEEL, "purple") + +/obj/structure/bed/chair/comfy/blue/Initialize(var/ml,var/newmaterial) + . = ..(ml, MAT_STEEL, "blue") + +/obj/structure/bed/chair/comfy/beige/Initialize(var/ml,var/newmaterial) + . = ..(ml, MAT_STEEL, "beige") + +/obj/structure/bed/chair/comfy/lime/Initialize(var/ml,var/newmaterial) + . = ..(ml, MAT_STEEL, "lime") /obj/structure/bed/chair/comfy/red/New(var/newloc,var/newmaterial) ..(newloc,"steel","carpet") @@ -108,29 +146,50 @@ /obj/structure/bed/chair/comfy/teal/New(var/newloc,var/newmaterial) ..(newloc,"steel","teal") -/obj/structure/bed/chair/comfy/black/New(var/newloc,var/newmaterial) - ..(newloc,"steel","black") +/obj/structure/bed/chair/comfy/yellow/Initialize(var/ml,var/newmaterial) + . = ..(ml, MAT_STEEL, "yellow") -/obj/structure/bed/chair/comfy/green/New(var/newloc,var/newmaterial) - ..(newloc,"steel","green") +/obj/structure/bed/chair/comfy/orange/Initialize(var/ml,var/newmaterial) + . = ..(ml, MAT_STEEL, "orange") -/obj/structure/bed/chair/comfy/purp/New(var/newloc,var/newmaterial) - ..(newloc,"steel","purple") +/obj/structure/bed/chair/comfy/rounded + name = "rounded chair" + desc = "It's a rounded chair. It looks comfy." + icon_state = "roundedchair" + base_icon = "roundedchair" -/obj/structure/bed/chair/comfy/blue/New(var/newloc,var/newmaterial) - ..(newloc,"steel","blue") +/obj/structure/bed/chair/comfy/rounded/brown/Initialize(var/ml,var/newmaterial) + . = ..(ml, MAT_STEEL, MAT_LEATHER) -/obj/structure/bed/chair/comfy/beige/New(var/newloc,var/newmaterial) - ..(newloc,"steel","beige") +/obj/structure/bed/chair/comfy/rounded/red/Initialize(var/ml,var/newmaterial) + . = ..(ml, MAT_STEEL, "carpet") -/obj/structure/bed/chair/comfy/lime/New(var/newloc,var/newmaterial) - ..(newloc,"steel","lime") +/obj/structure/bed/chair/comfy/rounded/teal/Initialize(var/ml,var/newmaterial) + . = ..(ml, MAT_STEEL, "teal") -/obj/structure/bed/chair/comfy/yellow/New(var/newloc,var/newmaterial) - ..(newloc,"steel","yellow") +/obj/structure/bed/chair/comfy/rounded/black/Initialize(var/ml,var/newmaterial) + . = ..(ml, MAT_STEEL, "black") -/obj/structure/bed/chair/comfy/orange/New(var/newloc,var/newmaterial) - ..(newloc,"steel","orange") +/obj/structure/bed/chair/comfy/rounded/green/Initialize(var/ml,var/newmaterial) + . = ..(ml, 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/blue/Initialize(var/ml,var/newmaterial) + . = ..(ml, 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/lime/Initialize(var/ml,var/newmaterial) + . = ..(ml, 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/orange/Initialize(var/ml,var/newmaterial) + . = ..(ml, MAT_STEEL, "orange") /obj/structure/bed/chair/office anchored = FALSE @@ -146,7 +205,7 @@ /obj/structure/bed/chair/office/Moved(atom/old_loc, direction, forced = FALSE) . = ..() - + playsound(src, 'sound/effects/roll.ogg', 100, 1) /obj/structure/bed/chair/office/handle_buckled_mob_movement(atom/new_loc, direction, movetime) diff --git a/code/modules/materials/materials/metals/steel.dm b/code/modules/materials/materials/metals/steel.dm index cc6a58792a..bab89514bd 100644 --- a/code/modules/materials/materials/metals/steel.dm +++ b/code/modules/materials/materials/metals/steel.dm @@ -15,19 +15,19 @@ new /datum/stack_recipe("dark office chair", /obj/structure/bed/chair/office/dark, 5, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), new /datum/stack_recipe("light office chair", /obj/structure/bed/chair/office/light, 5, one_per_turf = 1, on_floor = 1, recycle_material = "[name]") )), - new /datum/stack_recipe_list("comfy chairs", list( - new /datum/stack_recipe("beige comfy chair", /obj/structure/bed/chair/comfy/beige, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), - new /datum/stack_recipe("black comfy chair", /obj/structure/bed/chair/comfy/black, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), - new /datum/stack_recipe("brown comfy chair", /obj/structure/bed/chair/comfy/brown, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), - new /datum/stack_recipe("lime comfy chair", /obj/structure/bed/chair/comfy/lime, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), - new /datum/stack_recipe("teal comfy chair", /obj/structure/bed/chair/comfy/teal, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), - new /datum/stack_recipe("red comfy chair", /obj/structure/bed/chair/comfy/red, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), - new /datum/stack_recipe("blue comfy chair", /obj/structure/bed/chair/comfy/blue, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), - new /datum/stack_recipe("purple comfy chair", /obj/structure/bed/chair/comfy/purp, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), - new /datum/stack_recipe("green comfy chair", /obj/structure/bed/chair/comfy/green, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), - new /datum/stack_recipe("yellow comfy chair", /obj/structure/bed/chair/comfy/yellow, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), - new /datum/stack_recipe("orange comfy chair", /obj/structure/bed/chair/comfy/orange, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), - )), + new /datum/stack_recipe_list("rounded chairs", list( + new /datum/stack_recipe("beige rounded chair", /obj/structure/bed/chair/comfy/rounded/beige, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), + new /datum/stack_recipe("black rounded chair", /obj/structure/bed/chair/comfy/rounded/black, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), + new /datum/stack_recipe("brown rounded chair", /obj/structure/bed/chair/comfy/rounded/brown, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), + new /datum/stack_recipe("lime rounded chair", /obj/structure/bed/chair/comfy/rounded/lime, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), + new /datum/stack_recipe("teal rounded chair", /obj/structure/bed/chair/comfy/rounded/teal, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), + new /datum/stack_recipe("red rounded chair", /obj/structure/bed/chair/comfy/rounded/red, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), + new /datum/stack_recipe("blue rounded chair", /obj/structure/bed/chair/comfy/rounded/blue, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), + new /datum/stack_recipe("purple rounded chair", /obj/structure/bed/chair/comfy/rounded/purple, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), + new /datum/stack_recipe("green rounded chair", /obj/structure/bed/chair/comfy/rounded/green, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), + new /datum/stack_recipe("yellow rounded chair", /obj/structure/bed/chair/comfy/rounded/yellow, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), + new /datum/stack_recipe("orange rounded chair", /obj/structure/bed/chair/comfy/rounded/orange, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), + )), new /datum/stack_recipe_list("airlock assemblies", list( new /datum/stack_recipe("standard airlock assembly", /obj/structure/door_assembly, 4, time = 50, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), new /datum/stack_recipe("command airlock assembly", /obj/structure/door_assembly/door_assembly_com, 4, time = 50, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"),