diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm index ab7e9956676..8b51151bc30 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm @@ -43,7 +43,7 @@ /turf/open/floor/iron/cafeteria, /area/ruin/pizzeria/kitchen) "bV" = ( -/obj/structure/chair/sofa/left{ +/obj/structure/chair/sofa/left/brown{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -85,7 +85,7 @@ /turf/open/floor/iron/cafeteria, /area/ruin/pizzeria/kitchen) "cH" = ( -/obj/structure/chair/sofa/corner{ +/obj/structure/chair/sofa/corner/brown{ dir = 4 }, /obj/effect/turf_decal/tile/red{ @@ -480,7 +480,7 @@ /turf/open/floor/iron/cafeteria, /area/ruin/pizzeria/kitchen) "qo" = ( -/obj/structure/chair/sofa/right{ +/obj/structure/chair/sofa/right/brown{ dir = 8 }, /obj/item/trash/can, @@ -633,7 +633,7 @@ /turf/open/floor/plating, /area/ruin/pizzeria) "wd" = ( -/obj/structure/chair/sofa/left{ +/obj/structure/chair/sofa/left/brown{ dir = 8 }, /obj/effect/turf_decal/tile/yellow{ @@ -1335,7 +1335,7 @@ /turf/open/floor/iron/checker, /area/ruin/pizzeria) "Qg" = ( -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/left/brown, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -1400,7 +1400,7 @@ /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) "Sw" = ( -/obj/structure/chair/sofa, +/obj/structure/chair/sofa/middle/brown, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -1548,7 +1548,7 @@ }, /area/ruin/pizzeria) "VK" = ( -/obj/structure/chair/sofa/right{ +/obj/structure/chair/sofa/right/brown{ dir = 4 }, /obj/effect/turf_decal/tile/red{ @@ -1619,7 +1619,7 @@ }, /area/ruin/pizzeria) "Xc" = ( -/obj/structure/chair/sofa/right{ +/obj/structure/chair/sofa/right/brown{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm index 772b2f1cda9..b33a5698196 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm @@ -13,7 +13,7 @@ /turf/open/floor/plating/icemoon, /area/ruin/plasma_facility/operations) "ak" = ( -/obj/structure/chair/sofa/left{ +/obj/structure/chair/sofa/left/brown{ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/simple/general/hidden, @@ -2063,7 +2063,7 @@ /turf/open/floor/plating/icemoon, /area/ruin/plasma_facility/operations) "IU" = ( -/obj/structure/chair/sofa/right{ +/obj/structure/chair/sofa/right/brown{ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/simple/general/hidden, diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm index 99b4b0623d5..8d851421f1c 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm @@ -151,7 +151,7 @@ /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "nR" = ( -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/left/brown, /turf/closed/mineral/snowmountain/cavern/icemoon, /area/icemoon/underground/explored) "oB" = ( @@ -182,7 +182,7 @@ /area/icemoon/underground/explored) "pP" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/chair/sofa/right{ +/obj/structure/chair/sofa/right/brown{ dir = 1 }, /turf/open/floor/wood, @@ -274,7 +274,7 @@ /turf/open/floor/carpet, /area/ruin/powered) "yb" = ( -/obj/structure/chair/sofa/left{ +/obj/structure/chair/sofa/left/brown{ dir = 1 }, /turf/open/floor/wood, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index 77e7e0c00b8..cb122411337 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm @@ -609,7 +609,7 @@ /turf/open/floor/iron/grimy, /area/ruin/powered/beach) "tn" = ( -/obj/structure/chair/sofa/right, +/obj/structure/chair/sofa/right/brown, /turf/open/floor/wood, /area/ruin/powered/beach) "tB" = ( @@ -942,7 +942,7 @@ /turf/open/misc/beach/sand, /area/ruin/powered/beach) "FR" = ( -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/left/brown, /turf/open/floor/wood, /area/ruin/powered/beach) "FZ" = ( diff --git a/_maps/RandomRuins/SpaceRuins/derelict7.dmm b/_maps/RandomRuins/SpaceRuins/derelict7.dmm index 0d46aa78026..cfe88ab87c9 100644 --- a/_maps/RandomRuins/SpaceRuins/derelict7.dmm +++ b/_maps/RandomRuins/SpaceRuins/derelict7.dmm @@ -105,7 +105,7 @@ }, /area/ruin/space/has_grav) "kI" = ( -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/left/brown, /turf/open/floor/carpet/airless, /area/ruin/space/has_grav) "lQ" = ( diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index 32e1c4743b4..a6305720483 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -717,7 +717,7 @@ /area/ruin/space/has_grav/listeningstation) "LR" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/chair/sofa/right{ +/obj/structure/chair/sofa/right/brown{ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -885,7 +885,7 @@ /area/ruin/space/has_grav/listeningstation) "TO" = ( /obj/structure/cable, -/obj/structure/chair/sofa/left{ +/obj/structure/chair/sofa/left/brown{ dir = 4 }, /turf/open/floor/plating, diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index 786a955abea..9cae0f89b7e 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -267,7 +267,7 @@ /turf/open/floor/wood/tile, /area/ruin/space/has_grav/hotel) "cB" = ( -/obj/structure/chair/sofa/left{ +/obj/structure/chair/sofa/left/brown{ dir = 8 }, /turf/open/floor/carpet/lone, @@ -518,7 +518,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "fv" = ( -/obj/structure/chair/sofa/left{ +/obj/structure/chair/sofa/left/brown{ dir = 8 }, /obj/structure/cable, @@ -721,7 +721,7 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/hotel) "hq" = ( -/obj/structure/chair/sofa/right{ +/obj/structure/chair/sofa/right/brown{ dir = 4 }, /obj/machinery/light_switch/directional/south, @@ -1390,7 +1390,7 @@ /turf/template_noop, /area/template_noop) "mj" = ( -/obj/structure/chair/sofa/right{ +/obj/structure/chair/sofa/right/brown{ dir = 4 }, /obj/machinery/airalarm/directional/west, @@ -1426,7 +1426,7 @@ /turf/open/floor/iron/sepia, /area/ruin/space/has_grav/hotel/pool) "mM" = ( -/obj/structure/chair/sofa/left{ +/obj/structure/chair/sofa/left/brown{ dir = 8 }, /obj/machinery/airalarm/directional/east, @@ -2933,7 +2933,7 @@ /turf/open/floor/carpet/red, /area/ruin/space/has_grav/hotel/guestroom/room_3) "EP" = ( -/obj/structure/chair/sofa/left{ +/obj/structure/chair/sofa/left/brown{ dir = 4 }, /obj/machinery/airalarm/directional/west, @@ -3019,7 +3019,7 @@ /turf/open/floor/iron/dark/side, /area/ruin/space/has_grav/hotel/dock) "FV" = ( -/obj/structure/chair/sofa/left{ +/obj/structure/chair/sofa/left/brown{ dir = 4 }, /turf/open/floor/carpet/royalblue, @@ -3146,7 +3146,7 @@ /turf/open/floor/wood/parquet, /area/ruin/space/has_grav/hotel/guestroom/room_1) "Ho" = ( -/obj/structure/chair/sofa/right{ +/obj/structure/chair/sofa/right/brown{ dir = 4 }, /obj/structure/cable, @@ -3489,7 +3489,7 @@ /turf/open/floor/wood/tile, /area/ruin/space/has_grav/hotel) "Mz" = ( -/obj/structure/chair/sofa/left{ +/obj/structure/chair/sofa/left/brown{ dir = 4 }, /obj/machinery/airalarm/directional/west, @@ -3949,7 +3949,7 @@ /turf/open/floor/iron/sepia, /area/ruin/space/has_grav/hotel/pool) "RV" = ( -/obj/structure/chair/sofa/right{ +/obj/structure/chair/sofa/right/brown{ dir = 8 }, /obj/machinery/airalarm/directional/east, @@ -4094,7 +4094,7 @@ /turf/open/floor/iron/grimy, /area/ruin/space/has_grav/hotel) "TQ" = ( -/obj/structure/chair/sofa/right{ +/obj/structure/chair/sofa/right/brown{ dir = 8 }, /turf/open/floor/carpet/orange, @@ -4399,7 +4399,7 @@ /turf/open/floor/iron/sepia, /area/ruin/space/has_grav/hotel/guestroom/room_4) "Xf" = ( -/obj/structure/chair/sofa/right{ +/obj/structure/chair/sofa/right/brown{ dir = 8 }, /obj/machinery/airalarm/directional/east, diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 5a5e2dfb5c4..91107830e2f 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -1071,7 +1071,7 @@ /area/station/cargo/office) "amQ" = ( /obj/effect/landmark/start/hangover, -/obj/structure/chair/sofa/right{ +/obj/structure/chair/sofa/right/brown{ dir = 4 }, /obj/effect/turf_decal/tile/red{ @@ -1485,7 +1485,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/structure/chair/sofa/right{ +/obj/structure/chair/sofa/right/brown{ dir = 8 }, /obj/effect/landmark/start/paramedic, @@ -19107,7 +19107,7 @@ /turf/open/floor/iron, /area/station/commons/fitness/recreation) "eCU" = ( -/obj/structure/chair/sofa/left{ +/obj/structure/chair/sofa/left/brown{ dir = 8 }, /obj/structure/sign/departments/psychology/directional/east, @@ -32539,7 +32539,7 @@ /area/station/command/corporate_showroom) "hTr" = ( /obj/effect/landmark/start/hangover, -/obj/structure/chair/sofa/left{ +/obj/structure/chair/sofa/left/brown{ dir = 4 }, /obj/effect/turf_decal/tile/red{ @@ -32735,7 +32735,7 @@ /turf/open/floor/iron, /area/station/engineering/atmos/hfr_room) "hWC" = ( -/obj/structure/chair/sofa/corner, +/obj/structure/chair/sofa/corner/brown, /obj/structure/noticeboard/directional/east, /turf/open/floor/carpet/blue, /area/station/medical/psychology) @@ -42756,7 +42756,7 @@ /area/station/engineering/supermatter/room) "koc" = ( /obj/effect/landmark/start/hangover, -/obj/structure/chair/sofa/left{ +/obj/structure/chair/sofa/left/brown{ dir = 8 }, /obj/effect/turf_decal/tile/red{ @@ -45314,7 +45314,7 @@ /turf/open/floor/iron/dark, /area/station/science/xenobiology) "kWt" = ( -/obj/structure/chair/sofa/right, +/obj/structure/chair/sofa/right/brown, /obj/item/toy/plush/moth{ name = "Moffee" }, @@ -53116,7 +53116,7 @@ /turf/open/floor/iron/dark, /area/station/command/gateway) "mRa" = ( -/obj/structure/chair/sofa/right, +/obj/structure/chair/sofa/right/brown, /obj/effect/landmark/start/hangover, /turf/open/floor/wood/tile, /area/station/service/library/artgallery) @@ -55906,7 +55906,7 @@ /area/station/science/breakroom) "nCS" = ( /obj/effect/landmark/start/hangover, -/obj/structure/chair/sofa/right{ +/obj/structure/chair/sofa/right/brown{ dir = 8 }, /obj/effect/turf_decal/tile/red{ @@ -57452,7 +57452,7 @@ "nWF" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/status_display/ai/directional/north, -/obj/structure/chair/sofa, +/obj/structure/chair/sofa/middle/brown, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, @@ -61525,7 +61525,7 @@ /area/station/engineering/atmos/storage) "pbQ" = ( /obj/machinery/newscaster/directional/north, -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/left/brown, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, @@ -64536,7 +64536,7 @@ /area/station/security/checkpoint/medical/medsci) "pLG" = ( /obj/effect/landmark/start/hangover, -/obj/structure/chair/sofa/right{ +/obj/structure/chair/sofa/right/brown{ dir = 8 }, /obj/effect/turf_decal/tile/red{ @@ -77484,7 +77484,7 @@ /area/station/hallway/primary/port) "sTQ" = ( /obj/effect/landmark/start/hangover, -/obj/structure/chair/sofa/left{ +/obj/structure/chair/sofa/left/brown{ dir = 4 }, /obj/effect/turf_decal/tile/red{ @@ -78372,7 +78372,7 @@ /turf/open/floor/iron/dark, /area/station/service/chapel/office) "tdZ" = ( -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/left/brown, /turf/open/floor/wood/tile, /area/station/service/library/artgallery) "teo" = ( @@ -92403,7 +92403,7 @@ /turf/open/floor/iron, /area/station/cargo/miningoffice) "wwm" = ( -/obj/structure/chair/sofa/left{ +/obj/structure/chair/sofa/left/brown{ dir = 8 }, /obj/effect/turf_decal/tile/red{ @@ -93586,7 +93586,7 @@ /area/station/medical/pharmacy) "wLy" = ( /obj/effect/turf_decal/tile/blue, -/obj/structure/chair/sofa/left{ +/obj/structure/chair/sofa/left/brown{ dir = 8 }, /obj/effect/landmark/start/paramedic, @@ -97193,7 +97193,7 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) "xGS" = ( -/obj/structure/chair/sofa/right, +/obj/structure/chair/sofa/right/brown, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/light/directional/north, @@ -98864,7 +98864,7 @@ /area/station/science/robotics/mechbay) "ydB" = ( /obj/effect/landmark/start/hangover, -/obj/structure/chair/sofa/right{ +/obj/structure/chair/sofa/right/brown{ dir = 4 }, /obj/effect/turf_decal/tile/red{ diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 7d5080474cc..26b085f44c8 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -24923,7 +24923,7 @@ /turf/open/floor/iron, /area/station/science/ordnance) "hDg" = ( -/obj/structure/chair/sofa/left{ +/obj/structure/chair/sofa/left/brown{ dir = 8 }, /obj/machinery/light/directional/east, @@ -30382,7 +30382,7 @@ }, /area/mine/eva/lower) "jnM" = ( -/obj/structure/chair/sofa, +/obj/structure/chair/sofa/middle/brown, /turf/open/floor/carpet/blue, /area/station/security/prison/work) "jnS" = ( @@ -34964,7 +34964,7 @@ /turf/open/floor/iron, /area/station/engineering/storage) "kIu" = ( -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/left/brown, /obj/machinery/light/directional/north, /obj/effect/landmark/start/psychologist, /turf/open/floor/carpet/blue, @@ -35481,7 +35481,7 @@ /turf/open/floor/wood, /area/station/hallway/secondary/service) "kPt" = ( -/obj/structure/chair/sofa/left{ +/obj/structure/chair/sofa/left/brown{ dir = 4 }, /obj/effect/turf_decal/tile/bar, @@ -37167,7 +37167,7 @@ /turf/open/floor/wood/large, /area/station/command/heads_quarters/hos) "loN" = ( -/obj/structure/chair/sofa/right, +/obj/structure/chair/sofa/right/brown, /obj/item/toy/plush/moth{ name = "Dr. Moff" }, @@ -41759,7 +41759,7 @@ /turf/closed/wall/ice, /area/icemoon/surface/outdoors/nospawn) "mSU" = ( -/obj/structure/chair/sofa/right{ +/obj/structure/chair/sofa/right/brown{ desc = "Hey, did you know you can get a pineapple on your burger here?"; dir = 1; name = "The Regular's Sofa" @@ -45530,7 +45530,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/structure/chair/sofa/left{ +/obj/structure/chair/sofa/left/brown{ dir = 1 }, /obj/effect/landmark/start/hangover, @@ -49179,7 +49179,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/structure/chair/sofa/left{ +/obj/structure/chair/sofa/left/brown{ desc = "Hey, did you know you can get a pineapple on your burger here?"; dir = 1; name = "The Regular's Sofa" @@ -65027,7 +65027,7 @@ }, /obj/machinery/airalarm/directional/south, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/chair/sofa/right{ +/obj/structure/chair/sofa/right/brown{ dir = 1 }, /obj/machinery/newscaster/directional/east, @@ -65703,7 +65703,7 @@ /turf/open/floor/iron, /area/station/commons/dorms) "ulm" = ( -/obj/structure/chair/sofa/corner, +/obj/structure/chair/sofa/corner/brown, /obj/structure/cable, /turf/open/floor/carpet/blue, /area/station/security/prison/work) @@ -68998,7 +68998,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/chair/sofa/right, +/obj/structure/chair/sofa/right/brown, /turf/open/floor/carpet/blue, /area/station/security/prison/work) "vnT" = ( @@ -74063,7 +74063,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/structure/chair/sofa/right{ +/obj/structure/chair/sofa/right/brown{ dir = 1 }, /obj/machinery/computer/security/telescreen/entertainment/directional/south, @@ -75584,7 +75584,7 @@ dir = 8 }, /obj/machinery/light/small/directional/south, -/obj/structure/chair/sofa/left{ +/obj/structure/chair/sofa/left/brown{ dir = 1 }, /turf/open/floor/iron/white, @@ -78676,7 +78676,7 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/fore/lesser) "ykr" = ( -/obj/structure/chair/sofa/right{ +/obj/structure/chair/sofa/right/brown{ dir = 4 }, /obj/effect/turf_decal/tile/bar, diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index ca1a90f988e..e87bf01f3ce 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -6010,8 +6010,7 @@ /turf/open/floor/iron/dark, /area/station/medical/chemistry) "bRV" = ( -/obj/structure/chair/sofa/left{ - color = "#c45c57"; +/obj/structure/chair/sofa/left/maroon{ dir = 8 }, /obj/effect/turf_decal/tile/neutral, @@ -10528,8 +10527,7 @@ /area/station/commons/vacant_room/commissary) "diG" = ( /obj/structure/cable, -/obj/structure/chair/sofa/right{ - color = "#c45c57"; +/obj/structure/chair/sofa/right/maroon{ dir = 4 }, /obj/machinery/light/directional/south, @@ -12587,8 +12585,7 @@ /turf/open/floor/plating, /area/station/maintenance/solars/port/fore) "dLu" = ( -/obj/structure/chair/sofa/left{ - color = "#c45c57"; +/obj/structure/chair/sofa/left/maroon{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -23610,8 +23607,7 @@ /turf/open/floor/iron/dark, /area/station/maintenance/department/crew_quarters/bar) "gNB" = ( -/obj/structure/chair/sofa/right{ - color = "#c45c57"; +/obj/structure/chair/sofa/right/maroon{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -28241,8 +28237,7 @@ /turf/open/floor/iron/showroomfloor, /area/station/science/genetics) "hZt" = ( -/obj/structure/chair/sofa/right{ - color = "#c45c57"; +/obj/structure/chair/sofa/right/maroon{ dir = 8 }, /obj/effect/turf_decal/tile/neutral, @@ -29367,8 +29362,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "inT" = ( -/obj/structure/chair/sofa/left{ - color = "#c45c57"; +/obj/structure/chair/sofa/left/maroon{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -36719,9 +36713,7 @@ /area/station/hallway/primary/starboard) "kur" = ( /obj/machinery/light/small/directional/north, -/obj/structure/chair/sofa{ - color = "#c45c57" - }, +/obj/structure/chair/sofa/middle/maroon, /obj/structure/sign/poster/contraband/random/directional/north, /turf/open/floor/wood, /area/station/maintenance/starboard/fore) @@ -42745,8 +42737,7 @@ /turf/open/floor/plating, /area/station/medical/storage) "mfw" = ( -/obj/structure/chair/sofa/right{ - color = "#c45c57"; +/obj/structure/chair/sofa/right/maroon{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -43832,9 +43823,7 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) "muR" = ( -/obj/structure/chair/sofa/right{ - color = "#c45c57" - }, +/obj/structure/chair/sofa/right/maroon, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/maintenance/starboard/fore) @@ -45075,8 +45064,7 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "mOj" = ( -/obj/structure/chair/sofa/right{ - color = "#c45c57"; +/obj/structure/chair/sofa/right/maroon{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -45880,8 +45868,7 @@ /area/station/service/chapel/monastery) "nal" = ( /obj/structure/cable, -/obj/structure/chair/sofa/left{ - color = "#c45c57"; +/obj/structure/chair/sofa/left/maroon{ dir = 8 }, /obj/machinery/light/directional/south, @@ -46893,8 +46880,7 @@ /turf/open/floor/wood, /area/station/maintenance/port/fore) "nqZ" = ( -/obj/structure/chair/sofa/right{ - color = "#c45c57"; +/obj/structure/chair/sofa/right/maroon{ dir = 8 }, /obj/effect/turf_decal/tile/neutral, @@ -48040,8 +48026,7 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "nHG" = ( -/obj/structure/chair/sofa/left{ - color = "#c45c57"; +/obj/structure/chair/sofa/left/maroon{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -50204,8 +50189,7 @@ /turf/closed/wall/rust, /area/station/commons/toilet/restrooms) "osA" = ( -/obj/structure/chair/sofa/left{ - color = "#c45c57"; +/obj/structure/chair/sofa/left/maroon{ dir = 8 }, /obj/effect/turf_decal/tile/neutral, @@ -54277,8 +54261,7 @@ /turf/open/floor/iron/dark, /area/station/maintenance/department/bridge) "pyW" = ( -/obj/structure/chair/sofa/right{ - color = "#c45c57"; +/obj/structure/chair/sofa/right/maroon{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -55279,8 +55262,7 @@ /turf/closed/wall, /area/station/maintenance/disposal/incinerator) "pNk" = ( -/obj/structure/chair/sofa/left{ - color = "#c45c57"; +/obj/structure/chair/sofa/left/maroon{ dir = 8 }, /obj/effect/turf_decal/tile/neutral, @@ -58767,8 +58749,7 @@ /turf/open/floor/plating, /area/station/engineering/atmos/storage/gas) "qPv" = ( -/obj/structure/chair/sofa/left{ - color = "#c45c57"; +/obj/structure/chair/sofa/left/maroon{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -61712,7 +61693,7 @@ /area/station/cargo/sorting) "rEM" = ( /obj/structure/cable, -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/left/brown, /obj/item/toy/plush/moth{ name = "Big Moffer" }, @@ -69951,8 +69932,7 @@ /turf/open/floor/iron/dark, /area/station/security/office) "tVh" = ( -/obj/structure/chair/sofa/left{ - color = "#c45c57"; +/obj/structure/chair/sofa/left/maroon{ dir = 8 }, /obj/effect/decal/cleanable/blood/old, @@ -79087,7 +79067,7 @@ /turf/open/floor/iron, /area/station/command/bridge) "wtF" = ( -/obj/structure/chair/sofa/right, +/obj/structure/chair/sofa/right/brown, /obj/structure/sign/poster/official/love_ian{ pixel_y = 32 }, @@ -80583,8 +80563,7 @@ /turf/open/floor/iron/showroomfloor, /area/station/security/medical) "wOb" = ( -/obj/structure/chair/sofa/right{ - color = "#c45c57"; +/obj/structure/chair/sofa/right/maroon{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -82147,9 +82126,7 @@ /turf/open/floor/grass, /area/station/service/chapel) "xlG" = ( -/obj/structure/chair/sofa/corner{ - color = "#c45c57" - }, +/obj/structure/chair/sofa/corner/maroon, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index a49463c1dba..f3ad55a3bba 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -17579,7 +17579,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "gzJ" = ( -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/left/brown, /turf/open/floor/carpet, /area/station/medical/psychology) "gzO" = ( @@ -50980,7 +50980,7 @@ /obj/structure/sign/poster/official/get_your_legs{ pixel_y = 32 }, -/obj/structure/chair/sofa/right, +/obj/structure/chair/sofa/right/brown, /obj/item/toy/plush/moth{ name = "Mender Moff" }, diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index 7ceca1855dd..ca023c86f6f 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -686,7 +686,7 @@ }, /area/mine/cafeteria) "eP" = ( -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/left/brown, /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 1 }, @@ -2558,7 +2558,7 @@ /turf/open/floor/plating, /area/mine/maintenance/service) "oe" = ( -/obj/structure/chair/sofa/corner{ +/obj/structure/chair/sofa/corner/brown{ dir = 4 }, /obj/effect/turf_decal/tile/bar/opposingcorners{ @@ -2716,7 +2716,7 @@ /turf/open/misc/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "pe" = ( -/obj/structure/chair/sofa, +/obj/structure/chair/sofa/middle/brown, /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 1 }, @@ -5122,7 +5122,7 @@ }, /area/mine/production) "Fd" = ( -/obj/structure/chair/sofa/right{ +/obj/structure/chair/sofa/right/brown{ dir = 4 }, /obj/effect/turf_decal/tile/bar/opposingcorners{ diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 986cbc533e0..cb843d8e508 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -148,7 +148,7 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/structure/chair/sofa/right{ +/obj/structure/chair/sofa/right/brown{ dir = 4 }, /obj/structure/sign/poster/contraband/revolver{ @@ -11389,7 +11389,7 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/structure/chair/sofa/left{ +/obj/structure/chair/sofa/left/brown{ dir = 4 }, /turf/open/floor/iron, diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 500881f42d7..32e3db9c0c1 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -3455,7 +3455,7 @@ /turf/open/floor/iron, /area/station/cargo/miningdock/cafeteria) "bvm" = ( -/obj/structure/chair/sofa/corner{ +/obj/structure/chair/sofa/corner/brown{ dir = 8 }, /turf/open/floor/iron/cafeteria{ @@ -14671,7 +14671,7 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/structure/chair/sofa/corner, +/obj/structure/chair/sofa/corner/brown, /turf/open/floor/iron, /area/station/cargo/miningdock/cafeteria) "fmf" = ( @@ -17409,7 +17409,7 @@ /turf/open/floor/iron/dark, /area/station/service/chapel/office) "gnI" = ( -/obj/structure/chair/sofa/right{ +/obj/structure/chair/sofa/right/brown{ dir = 8 }, /obj/structure/sign/calendar/directional/east, @@ -35961,7 +35961,7 @@ /turf/open/floor/iron, /area/station/security/office) "mTe" = ( -/obj/structure/chair/sofa/left{ +/obj/structure/chair/sofa/left/brown{ dir = 8 }, /obj/structure/sign/clock/directional/east, @@ -36806,7 +36806,7 @@ /turf/open/floor/iron/white, /area/station/science/xenobiology) "ngS" = ( -/obj/structure/chair/sofa{ +/obj/structure/chair/sofa/middle/brown{ dir = 8 }, /obj/machinery/light/directional/east, @@ -39188,7 +39188,7 @@ /turf/open/floor/iron/dark, /area/station/medical/break_room) "obR" = ( -/obj/structure/chair/sofa/right{ +/obj/structure/chair/sofa/right/brown{ dir = 8 }, /turf/open/floor/iron/cafeteria{ @@ -44650,7 +44650,7 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/structure/chair/sofa/corner{ +/obj/structure/chair/sofa/corner/brown{ dir = 8 }, /turf/open/floor/iron, @@ -50694,7 +50694,7 @@ /turf/open/floor/iron, /area/station/engineering/main) "scY" = ( -/obj/structure/chair/sofa/left{ +/obj/structure/chair/sofa/left/brown{ dir = 1 }, /turf/open/floor/iron/cafeteria{ @@ -53246,7 +53246,7 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/structure/chair/sofa/left{ +/obj/structure/chair/sofa/left/brown{ dir = 1 }, /turf/open/floor/iron, @@ -64732,7 +64732,7 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/structure/chair/sofa/right, +/obj/structure/chair/sofa/right/brown, /turf/open/floor/iron, /area/station/cargo/miningdock/cafeteria) "xjr" = ( @@ -66055,7 +66055,7 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/structure/chair/sofa{ +/obj/structure/chair/sofa/middle/brown{ dir = 8 }, /turf/open/floor/iron, diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm index 727b13769c2..0b112999017 100644 --- a/code/__DEFINES/colors.dm +++ b/code/__DEFINES/colors.dm @@ -143,6 +143,15 @@ #define COLOR_ASSEMBLY_BLUE "#38559E" #define COLOR_ASSEMBLY_PURPLE "#6F6192" +///Colors for grayscale tools +#define COLOR_TOOL_BLUE "#1861d5" +#define COLOR_TOOL_RED "#951710" +#define COLOR_TOOL_PINK "#d5188d" +#define COLOR_TOOL_BROWN "#a05212" +#define COLOR_TOOL_GREEN "#0e7f1b" +#define COLOR_TOOL_CYAN "#18a2d5" +#define COLOR_TOOL_YELLOW "#d58c18" + ///Colors for xenobiology vatgrowing #define COLOR_SAMPLE_YELLOW "#c0b823" #define COLOR_SAMPLE_PURPLE "#342941" @@ -168,33 +177,33 @@ * Important note: colors can end up significantly different from the basic html picture, especially when saturated */ /// Bright but quickly dissipating neon green. rgb(100, 200, 100) -#define LIGHT_COLOR_GREEN "#64C864" +#define LIGHT_COLOR_GREEN "#64C864" /// Electric green. rgb(0, 255, 0) -#define LIGHT_COLOR_ELECTRIC_GREEN "#00FF00" +#define LIGHT_COLOR_ELECTRIC_GREEN "#00FF00" /// Cold, diluted blue. rgb(100, 150, 250) -#define LIGHT_COLOR_BLUE "#6496FA" +#define LIGHT_COLOR_BLUE "#6496FA" /// Light blueish green. rgb(125, 225, 175) -#define LIGHT_COLOR_BLUEGREEN "#7DE1AF" +#define LIGHT_COLOR_BLUEGREEN "#7DE1AF" /// Diluted cyan. rgb(125, 225, 225) -#define LIGHT_COLOR_CYAN "#7DE1E1" +#define LIGHT_COLOR_CYAN "#7DE1E1" /// Electric cyan rgb(0, 255, 255) #define LIGHT_COLOR_ELECTRIC_CYAN "#00FFFF" /// More-saturated cyan. rgb(64, 206, 255) #define LIGHT_COLOR_LIGHT_CYAN "#40CEFF" /// Saturated blue. rgb(51, 117, 248) -#define LIGHT_COLOR_DARK_BLUE "#6496FA" +#define LIGHT_COLOR_DARK_BLUE "#6496FA" /// Diluted, mid-warmth pink. rgb(225, 125, 225) -#define LIGHT_COLOR_PINK "#E17DE1" +#define LIGHT_COLOR_PINK "#E17DE1" /// Dimmed yellow, leaning kaki. rgb(225, 225, 125) -#define LIGHT_COLOR_YELLOW "#E1E17D" +#define LIGHT_COLOR_YELLOW "#E1E17D" /// Clear brown, mostly dim. rgb(150, 100, 50) -#define LIGHT_COLOR_BROWN "#966432" +#define LIGHT_COLOR_BROWN "#966432" /// Mostly pure orange. rgb(250, 150, 50) -#define LIGHT_COLOR_ORANGE "#FA9632" +#define LIGHT_COLOR_ORANGE "#FA9632" /// Light Purple. rgb(149, 44, 244) -#define LIGHT_COLOR_PURPLE "#952CF4" +#define LIGHT_COLOR_PURPLE "#952CF4" /// Less-saturated light purple. rgb(155, 81, 255) -#define LIGHT_COLOR_LAVENDER "#9B51FF" +#define LIGHT_COLOR_LAVENDER "#9B51FF" ///slightly desaturated bright yellow. #define LIGHT_COLOR_HOLY_MAGIC "#FFF743" /// deep crimson @@ -202,17 +211,17 @@ /* These ones aren't a direct colour like the ones above, because nothing would fit */ /// Warm orange color, leaning strongly towards yellow. rgb(250, 160, 25) -#define LIGHT_COLOR_FIRE "#FAA019" +#define LIGHT_COLOR_FIRE "#FAA019" /// Very warm yellow, leaning slightly towards orange. rgb(196, 138, 24) -#define LIGHT_COLOR_LAVA "#C48A18" +#define LIGHT_COLOR_LAVA "#C48A18" /// Bright, non-saturated red. Leaning slightly towards pink for visibility. rgb(250, 100, 75) -#define LIGHT_COLOR_FLARE "#FA644B" +#define LIGHT_COLOR_FLARE "#FA644B" /// Weird color, between yellow and green, very slimy. rgb(175, 200, 75) #define LIGHT_COLOR_SLIME_LAMP "#AFC84B" /// Extremely diluted yellow, close to skin color (for some reason). rgb(250, 225, 175) -#define LIGHT_COLOR_TUNGSTEN "#FAE1AF" +#define LIGHT_COLOR_TUNGSTEN "#FAE1AF" /// Barely visible cyan-ish hue, as the doctor prescribed. rgb(240, 250, 250) -#define LIGHT_COLOR_HALOGEN "#F0FAFA" +#define LIGHT_COLOR_HALOGEN "#F0FAFA" //The GAGS greyscale_colors for each department's computer/machine circuits #define CIRCUIT_COLOR_GENERIC "#1A7A13" @@ -279,6 +288,9 @@ #define COLOR_CARP_SILVER "#fdfbf3" #define COLOR_CARP_DARK_BLUE "#3a384d" +#define SOFA_BROWN "#a75400" +#define SOFA_MAROON "#830000" + GLOBAL_LIST_INIT(cable_colors, list( CABLE_COLOR_BLUE = CABLE_HEX_COLOR_BLUE, CABLE_COLOR_CYAN = CABLE_HEX_COLOR_CYAN, diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 41da9b60c20..d104d2f07c6 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -32,7 +32,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ new/datum/stack_recipe("teal comfy chair", /obj/structure/chair/comfy/teal, 2, one_per_turf = TRUE, on_solid_ground = TRUE), \ )), \ new/datum/stack_recipe_list("sofas", list( - new /datum/stack_recipe("sofa (middle)", /obj/structure/chair/sofa, 1, one_per_turf = TRUE, on_solid_ground = TRUE), + new /datum/stack_recipe("sofa (middle)", /obj/structure/chair/sofa/middle, 1, one_per_turf = TRUE, on_solid_ground = TRUE), new /datum/stack_recipe("sofa (left)", /obj/structure/chair/sofa/left, 1, one_per_turf = TRUE, on_solid_ground = TRUE), new /datum/stack_recipe("sofa (right)", /obj/structure/chair/sofa/right, 1, one_per_turf = TRUE, on_solid_ground = TRUE), new /datum/stack_recipe("sofa (corner)", /obj/structure/chair/sofa/corner, 1, one_per_turf = TRUE, on_solid_ground = TRUE) diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm index bb769f1a0ba..af74bdf1d2e 100644 --- a/code/game/objects/items/tools/screwdriver.dm +++ b/code/game/objects/items/tools/screwdriver.dm @@ -35,13 +35,13 @@ var/random_color = TRUE /// List of possible random colors var/static/list/screwdriver_colors = list( - "blue" = "#1861d5", - "red" = "#ff0000", - "pink" = "#d5188d", - "brown" = "#a05212", - "green" = "#0e7f1b", - "cyan" = "#18a2d5", - "yellow" = "#ffa500" + COLOR_TOOL_BLUE, + COLOR_TOOL_RED, + COLOR_TOOL_PINK, + COLOR_TOOL_BROWN, + COLOR_TOOL_GREEN, + COLOR_TOOL_CYAN, + COLOR_TOOL_YELLOW, ) /obj/item/screwdriver/suicide_act(mob/living/user) @@ -50,8 +50,7 @@ /obj/item/screwdriver/Initialize(mapload) if(random_color) - var/our_color = pick(screwdriver_colors) - set_greyscale(colors=list(screwdriver_colors[our_color])) + set_greyscale(colors = list(pick(screwdriver_colors))) . = ..() AddElement(/datum/element/eyestab) AddElement(/datum/element/falling_hazard, damage = force, wound_bonus = wound_bonus, hardhat_safety = TRUE, crushes = FALSE, impact_sound = hitsound) diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm index 6eae41a2cc7..551881d71f8 100644 --- a/code/game/objects/items/tools/wirecutters.dm +++ b/code/game/objects/items/tools/wirecutters.dm @@ -33,19 +33,18 @@ var/random_color = TRUE /// List of possible random colors var/static/list/wirecutter_colors = list( - "blue" = "#1861d5", - "red" = "#951710", - "pink" = "#d5188d", - "brown" = "#a05212", - "green" = "#0e7f1b", - "cyan" = "#18a2d5", - "yellow" = "#d58c18" + COLOR_TOOL_BLUE, + COLOR_TOOL_RED, + COLOR_TOOL_PINK, + COLOR_TOOL_BROWN, + COLOR_TOOL_GREEN, + COLOR_TOOL_CYAN, + COLOR_TOOL_YELLOW, ) /obj/item/wirecutters/Initialize(mapload) if(random_color) - var/our_color = pick(wirecutter_colors) - set_greyscale(colors=list(wirecutter_colors[our_color])) + set_greyscale(colors = list(pick(wirecutter_colors))) AddElement(/datum/element/falling_hazard, damage = force, wound_bonus = wound_bonus, hardhat_safety = TRUE, crushes = FALSE, impact_sound = hitsound) diff --git a/code/game/objects/structures/beds_chairs/sofa.dm b/code/game/objects/structures/beds_chairs/sofa.dm index 3d934f19546..40a69666a57 100644 --- a/code/game/objects/structures/beds_chairs/sofa.dm +++ b/code/game/objects/structures/beds_chairs/sofa.dm @@ -1,6 +1,20 @@ +/// Create colored subtypes for sofas +#define COLORED_SOFA(path, color_name, sofa_color) \ +path/middle/color_name {\ + color = sofa_color; \ +} \ +path/right/color_name {\ + color = sofa_color; \ +} \ +path/left/color_name {\ + color = sofa_color; \ +} \ +path/corner/color_name {\ + color = sofa_color; \ +} + /obj/structure/chair/sofa name = "old ratty sofa" - icon_state = "sofamiddle" icon = 'icons/obj/sofa.dmi' buildstackamount = 1 item_chair = null @@ -46,6 +60,9 @@ /obj/structure/chair/sofa/corner/handle_layer() //only the armrest/back of this chair should cover the mob. return +/obj/structure/chair/sofa/middle + icon_state = "sofamiddle" + /obj/structure/chair/sofa/left icon_state = "sofaend_left" @@ -55,6 +72,9 @@ /obj/structure/chair/sofa/corner icon_state = "sofacorner" +COLORED_SOFA(/obj/structure/chair/sofa, brown, SOFA_BROWN) +COLORED_SOFA(/obj/structure/chair/sofa, maroon, SOFA_MAROON) + // Original icon ported from Eris(?) and updated to work here. /obj/structure/chair/sofa/corp name = "sofa" @@ -111,3 +131,5 @@ /obj/structure/chair/sofa/bamboo/right icon_state = "bamboo_sofaend_right" + +#undef COLORED_SOFA diff --git a/icons/obj/sofa.dmi b/icons/obj/sofa.dmi index 2e13a120525..4a11055ebf0 100644 Binary files a/icons/obj/sofa.dmi and b/icons/obj/sofa.dmi differ diff --git a/tools/UpdatePaths/Scripts/71539_ratty_sofas_to_brown_sofas.txt b/tools/UpdatePaths/Scripts/71539_ratty_sofas_to_brown_sofas.txt new file mode 100644 index 00000000000..6bace9a4052 --- /dev/null +++ b/tools/UpdatePaths/Scripts/71539_ratty_sofas_to_brown_sofas.txt @@ -0,0 +1,4 @@ +/obj/structure/chair/sofa : /obj/structure/chair/sofa/middle/brown{@OLD} +/obj/structure/chair/sofa/right : /obj/structure/chair/sofa/right/brown{@OLD} +/obj/structure/chair/sofa/left : /obj/structure/chair/sofa/left/brown{@OLD} +/obj/structure/chair/sofa/corner : /obj/structure/chair/sofa/corner/brown{@OLD}