diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 4367861c7f79..46d92aa9b6f8 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -37,7 +37,12 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ new /datum/stack_recipe("sofa (middle)", /obj/structure/chair/sofa, 1, one_per_turf = TRUE, on_floor = TRUE), new /datum/stack_recipe("sofa (left)", /obj/structure/chair/sofa/left, 1, one_per_turf = TRUE, on_floor = TRUE), new /datum/stack_recipe("sofa (right)", /obj/structure/chair/sofa/right, 1, one_per_turf = TRUE, on_floor = TRUE), - new /datum/stack_recipe("sofa (corner)", /obj/structure/chair/sofa/corner, 1, one_per_turf = TRUE, on_floor = TRUE) + new /datum/stack_recipe("sofa (corner)", /obj/structure/chair/sofa/corner, 1, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("red sofa (middle)", /obj/structure/chair/sofa/red, 1, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("red sofa (left)", /obj/structure/chair/sofa/left, 1, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("red sofa (right)", /obj/structure/chair/sofa/red/right, 1, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("red sofa (corner)", /obj/structure/chair/sofa/red/corner, 1, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("red sofa (internal corner)", /obj/structure/chair/sofa/red/internal_corner, 1, one_per_turf = TRUE, on_floor = TRUE) )), null, \ new/datum/stack_recipe("rack parts", /obj/item/rack_parts), \ diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 7a7c73b33fc6..a8d560796f7e 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -151,7 +151,7 @@ return ..() /obj/structure/chair/comfy/proc/GetArmrest() - return mutable_appearance('icons/obj/chairs.dmi', "comfychair_armrest") + return mutable_appearance(icon, "[icon_state]_armrest") /obj/structure/chair/comfy/Destroy() QDEL_NULL(armrest) diff --git a/code/game/objects/structures/beds_chairs/sofa.dm b/code/game/objects/structures/beds_chairs/sofa.dm index c811ceafcd2b..8ba787920546 100644 --- a/code/game/objects/structures/beds_chairs/sofa.dm +++ b/code/game/objects/structures/beds_chairs/sofa.dm @@ -1,5 +1,5 @@ /obj/structure/chair/sofa - name = "old ratty sofa" + name = "sofa" icon_state = "sofamiddle" icon = 'icons/obj/sofa.dmi' buildstackamount = 1 @@ -13,3 +13,19 @@ /obj/structure/chair/sofa/corner icon_state = "sofacorner" + +/obj/structure/chair/sofa/red + name = "comfortable sofa" + icon_state = "sofamiddle_red" + +/obj/structure/chair/sofa/red/left + icon_state = "sofaend_left_red" + +/obj/structure/chair/sofa/red/right + icon_state = "sofaend_right_red" + +/obj/structure/chair/sofa/red/corner + icon_state = "sofacorner_red" + +/obj/structure/chair/sofa/red/internal_corner + icon_state = "sofainternalcorner_red" diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 8ba938dae8ee..bcf75fe3a61d 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -63,7 +63,7 @@ desc = "A coniferous pine tree." icon = 'icons/obj/flora/pinetrees.dmi' icon_state = "pine_1" - var/list/icon_states = list("pine_1", "pine_2", "pine_3") + var/list/icon_states = list("pine_1", "pine_2", "pine_3", "pine_4") /obj/structure/flora/tree/pine/Initialize() . = ..() diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index 62aa60b70c11..72f5d1326ead 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -30,6 +30,9 @@ /obj/structure/filingcabinet/filingcabinet //not changing the path to avoid unnecessary map issues, but please don't name stuff like this in the future -Pete icon_state = "tallcabinet" +/obj/structure/filingcabinet/wide + icon_state = "widecabinet" + /obj/structure/filingcabinet/double name = "filing cabinets" icon_state = "doublefilingcabinet" @@ -37,6 +40,9 @@ /obj/structure/filingcabinet/double/grey icon_state = "doubletallcabinet" +/obj/structure/filingcabinet/double/grey + icon_state = "doublewidecabinet" + /obj/structure/filingcabinet/Initialize(mapload) . = ..() if(mapload) diff --git a/icons/obj/atmospherics/pipes/pressure_tank.dmi b/icons/obj/atmospherics/pipes/pressure_tank.dmi index 95103015cfd6..0554350af336 100644 Binary files a/icons/obj/atmospherics/pipes/pressure_tank.dmi and b/icons/obj/atmospherics/pipes/pressure_tank.dmi differ diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index 1473efdcd80f..df05a9d601e3 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ diff --git a/icons/obj/flora/pinetrees.dmi b/icons/obj/flora/pinetrees.dmi index 3ee4a89f079a..8a4f1649a481 100644 Binary files a/icons/obj/flora/pinetrees.dmi and b/icons/obj/flora/pinetrees.dmi differ diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi index 340bc0f9a5c6..e7cd9797591b 100644 Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ diff --git a/icons/obj/robotics.dmi b/icons/obj/robotics.dmi index 8d0627aa9583..268c69c66681 100644 Binary files a/icons/obj/robotics.dmi and b/icons/obj/robotics.dmi differ diff --git a/icons/obj/sofa.dmi b/icons/obj/sofa.dmi index 8a8cd951cb51..d738a32a70a5 100644 Binary files a/icons/obj/sofa.dmi and b/icons/obj/sofa.dmi differ diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi index e88a183d2c40..ec4b8bd200e6 100644 Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi index a984d69cf030..f5f04901af2a 100644 Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ diff --git a/icons/obj/watercloset.dmi b/icons/obj/watercloset.dmi index eae80ff576a4..6483f97570d1 100644 Binary files a/icons/obj/watercloset.dmi and b/icons/obj/watercloset.dmi differ