From 900483ba44f9476872e1d2be02be3e082f32b2c9 Mon Sep 17 00:00:00 2001 From: variableundefined <40092670+variableundefined@users.noreply.github.com> Date: Sun, 15 Sep 2019 03:29:23 -0400 Subject: [PATCH] Remove redundant structure/chair/wood/normal typepath (#46443) --- _maps/RandomZLevels/Academy.dmm | 12 +-- _maps/RandomZLevels/moonoutpost19.dmm | 6 +- _maps/RandomZLevels/undergroundoutpost45.dmm | 18 ++-- _maps/RandomZLevels/wildwest.dmm | 20 ++--- .../map_files/Deltastation/DeltaStation2.dmm | 50 +++++------ _maps/map_files/MetaStation/MetaStation.dmm | 4 +- _maps/map_files/PubbyStation/PubbyStation.dmm | 84 +++++++++---------- _maps/map_files/generic/CentCom.dmm | 12 +-- _maps/shuttles/emergency_bar.dmm | 8 +- _maps/shuttles/pirate_default.dmm | 2 +- .../objects/structures/beds_chairs/chair.dm | 3 - .../hostile/megafauna/colossus.dm | 2 +- 12 files changed, 109 insertions(+), 112 deletions(-) diff --git a/_maps/RandomZLevels/Academy.dmm b/_maps/RandomZLevels/Academy.dmm index 3a26199121a..572a6cc2bc5 100644 --- a/_maps/RandomZLevels/Academy.dmm +++ b/_maps/RandomZLevels/Academy.dmm @@ -828,7 +828,7 @@ /turf/open/floor/plasteel, /area/awaymission/academy/classrooms) "ds" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 1 }, /turf/open/floor/wood, @@ -1584,7 +1584,7 @@ }, /area/awaymission/academy/classrooms) "gd" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /turf/open/floor/wood, /area/awaymission/academy/classrooms) "ge" = ( @@ -3189,7 +3189,7 @@ /turf/open/floor/light, /area/awaymission/academy/academyengine) "my" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /turf/open/floor/wood, /area/awaymission/academy/academyengine) "mz" = ( @@ -3198,7 +3198,7 @@ /turf/open/floor/wood, /area/awaymission/academy/academyengine) "mA" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 4 }, /turf/open/floor/wood, @@ -3208,7 +3208,7 @@ /turf/open/floor/wood, /area/awaymission/academy/academyengine) "mC" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 8 }, /turf/open/floor/wood, @@ -3251,7 +3251,7 @@ /turf/open/floor/wood, /area/awaymission/academy/academyengine) "mM" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 1 }, /turf/open/floor/wood, diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index 2d06cc607bf..0d80de93e25 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -1616,7 +1616,7 @@ }, /area/awaymission/moonoutpost19/syndicate) "dh" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /obj/machinery/airalarm{ dir = 4; pixel_x = -23; @@ -5403,7 +5403,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /obj/machinery/airalarm/unlocked{ dir = 8; pixel_x = 23; @@ -5895,7 +5895,7 @@ }, /area/awaymission/moonoutpost19/arrivals) "mz" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 8 }, /turf/open/floor/carpet{ diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index 4fc7cc503dd..1f3bc7d526a 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -1070,7 +1070,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 4 }, /turf/open/floor/carpet{ @@ -1126,7 +1126,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 1 }, /obj/machinery/button/door{ @@ -2742,7 +2742,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /turf/open/floor/carpet{ heat_capacity = 1e+006 }, @@ -6407,7 +6407,7 @@ /obj/machinery/airalarm/all_access{ pixel_y = 23 }, -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 8 }, /turf/open/floor/carpet{ @@ -6721,7 +6721,7 @@ pixel_y = -25; specialfunctions = 4 }, -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 1 }, /turf/open/floor/carpet{ @@ -8652,7 +8652,7 @@ }, /area/awaymission/undergroundoutpost45/research) "qs" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /turf/open/floor/carpet{ heat_capacity = 1e+006 }, @@ -9024,7 +9024,7 @@ }, /area/awaymission/undergroundoutpost45/crew_quarters) "qZ" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 8 }, /turf/open/floor/carpet{ @@ -11857,7 +11857,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 8 }, /turf/open/floor/carpet{ @@ -12262,7 +12262,7 @@ }, /area/awaymission/undergroundoutpost45/engineering) "wM" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /turf/open/floor/carpet{ heat_capacity = 1e+006 }, diff --git a/_maps/RandomZLevels/wildwest.dmm b/_maps/RandomZLevels/wildwest.dmm index 0a423cd51d4..5ba8e0c9038 100644 --- a/_maps/RandomZLevels/wildwest.dmm +++ b/_maps/RandomZLevels/wildwest.dmm @@ -456,7 +456,7 @@ /turf/open/space, /area/space/nearstation) "bU" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 4 }, /turf/open/floor/plasteel/cafeteria{ @@ -464,7 +464,7 @@ }, /area/awaymission/wildwest/mines) "bV" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 8 }, /turf/open/floor/plasteel/cafeteria{ @@ -675,7 +675,7 @@ /turf/open/floor/wood, /area/awaymission/wildwest/gov) "cE" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 4 }, /turf/open/floor/wood, @@ -810,13 +810,13 @@ /turf/open/floor/wood, /area/awaymission/wildwest/mines) "da" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 4 }, /turf/open/floor/wood, /area/awaymission/wildwest/mines) "db" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 8 }, /turf/open/floor/wood, @@ -1590,7 +1590,7 @@ /turf/open/floor/wood, /area/awaymission/wildwest/mines) "fv" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -1612,7 +1612,7 @@ /turf/open/floor/plasteel/cafeteria, /area/awaymission/wildwest/mines) "fx" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 8 }, /obj/effect/turf_decal/tile/blue{ @@ -1765,7 +1765,7 @@ /turf/open/floor/wood, /area/awaymission/wildwest/mines) "fT" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -1846,7 +1846,7 @@ /turf/open/floor/wood, /area/awaymission/wildwest/mines) "gh" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 1 }, /obj/effect/turf_decal/tile/blue{ @@ -1906,7 +1906,7 @@ /area/awaymission/wildwest/mines) "gu" = ( /obj/effect/decal/cleanable/blood/gibs/up, -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /obj/effect/turf_decal/tile/blue{ dir = 4 }, diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 576b9839ac0..570a474532f 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -19599,7 +19599,7 @@ /turf/open/floor/carpet, /area/crew_quarters/bar/atrium) "aQo" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /turf/open/floor/carpet, /area/crew_quarters/bar/atrium) "aQp" = ( @@ -20531,7 +20531,7 @@ /turf/open/floor/plasteel/grimy, /area/crew_quarters/bar/atrium) "aRZ" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -21526,7 +21526,7 @@ /turf/open/floor/carpet, /area/crew_quarters/bar/atrium) "aTG" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 1 }, /turf/open/floor/carpet, @@ -89338,7 +89338,7 @@ /turf/open/floor/wood, /area/crew_quarters/abandoned_gambling_den) "djg" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -89349,7 +89349,7 @@ }, /area/crew_quarters/abandoned_gambling_den) "djh" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -89357,7 +89357,7 @@ /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "dji" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/wood, /area/crew_quarters/abandoned_gambling_den) @@ -90894,7 +90894,7 @@ /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "dmq" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -91695,7 +91695,7 @@ /turf/open/floor/plasteel/grimy, /area/crew_quarters/abandoned_gambling_den) "doc" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 4 }, /turf/open/floor/wood, @@ -91704,7 +91704,7 @@ /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "doe" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -92668,7 +92668,7 @@ /turf/open/floor/wood, /area/crew_quarters/abandoned_gambling_den) "dpR" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -92723,7 +92723,7 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/abandoned_gambling_den) "dpV" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -93554,7 +93554,7 @@ /turf/open/floor/plasteel/grimy, /area/crew_quarters/abandoned_gambling_den) "dru" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -94876,7 +94876,7 @@ /turf/open/floor/plasteel, /area/maintenance/starboard/aft) "duf" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) @@ -96611,7 +96611,7 @@ /turf/open/floor/plasteel, /area/maintenance/starboard/aft) "dxB" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -97351,7 +97351,7 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/abandoned_gambling_den) "dyX" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 8 }, /turf/open/floor/plating, @@ -102060,7 +102060,7 @@ /turf/open/floor/wood, /area/crew_quarters/theatre/abandoned) "dIa" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -102879,7 +102879,7 @@ /turf/open/floor/wood, /area/crew_quarters/theatre/abandoned) "dJw" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -103329,7 +103329,7 @@ }, /area/crew_quarters/theatre/abandoned) "dKq" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -110203,7 +110203,7 @@ /turf/open/floor/plasteel/dark, /area/chapel/office) "dYy" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /obj/machinery/newscaster{ pixel_x = -32 }, @@ -110213,21 +110213,21 @@ }, /area/chapel/main) "dYz" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /turf/open/floor/plasteel{ dir = 4; icon_state = "chapel" }, /area/chapel/main) "dYA" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /turf/open/floor/plasteel{ dir = 1; icon_state = "chapel" }, /area/chapel/main) "dYB" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel{ dir = 1; @@ -110235,7 +110235,7 @@ }, /area/chapel/main) "dYC" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel{ dir = 1; @@ -112485,7 +112485,7 @@ /turf/open/floor/plasteel/grimy, /area/chapel/office) "edo" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 4 }, /obj/machinery/light/small, @@ -112511,7 +112511,7 @@ /turf/open/floor/plasteel/dark, /area/chapel/main) "edp" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 8 }, /obj/machinery/light/small, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index cce8ace8d67..e16b2a7398e 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -9728,7 +9728,7 @@ }, /area/maintenance/fore) "aud" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 1 }, /turf/open/floor/wood, @@ -15643,7 +15643,7 @@ /turf/open/floor/wood, /area/crew_quarters/dorms) "aHT" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 4 }, /turf/open/floor/wood, diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index afa609d25c2..75828710a44 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -9639,7 +9639,7 @@ /turf/open/floor/carpet, /area/crew_quarters/dorms) "azs" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 8 }, /turf/open/floor/carpet, @@ -11071,7 +11071,7 @@ /turf/open/floor/plasteel/grimy, /area/crew_quarters/dorms) "aDc" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 8 }, /turf/open/floor/plasteel/grimy, @@ -16543,7 +16543,7 @@ /turf/open/floor/wood, /area/crew_quarters/bar) "aRR" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 8 }, /obj/item/clothing/under/rank/civilian/janitor/maid, @@ -20274,7 +20274,7 @@ pixel_x = 32; pixel_y = 1 }, -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -20717,7 +20717,7 @@ }, /area/crew_quarters/bar) "bbp" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 8 }, /turf/open/floor/carpet{ @@ -20739,7 +20739,7 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) "bbr" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 4 }, /turf/open/floor/carpet{ @@ -21102,7 +21102,7 @@ /area/crew_quarters/bar) "bcr" = ( /obj/structure/disposalpipe/segment, -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -21886,7 +21886,7 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) "bey" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 4 }, /turf/open/floor/plasteel/dark, @@ -21907,7 +21907,7 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) "beA" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 8 }, /obj/machinery/light{ @@ -21926,7 +21926,7 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) "beC" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 4 }, /obj/machinery/light{ @@ -21957,7 +21957,7 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) "beE" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 8 }, /turf/open/floor/plasteel/dark, @@ -41379,13 +41379,13 @@ /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) "bYA" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /turf/open/floor/plasteel/chapel{ dir = 8 }, /area/chapel/main/monastery) "bYB" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /turf/open/floor/plasteel/chapel, /area/chapel/main/monastery) "bYC" = ( @@ -41774,13 +41774,13 @@ /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) "bZl" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /turf/open/floor/plasteel/chapel{ dir = 1 }, /area/chapel/main/monastery) "bZm" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /turf/open/floor/plasteel/chapel{ dir = 4 }, @@ -42460,7 +42460,7 @@ /turf/open/floor/plating, /area/chapel/office) "cbK" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 1 }, /turf/open/floor/plasteel/dark, @@ -42875,7 +42875,7 @@ /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) "cdC" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) "cdD" = ( @@ -44024,7 +44024,7 @@ /turf/open/floor/plasteel/grimy, /area/chapel/main/monastery) "chL" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -44527,7 +44527,7 @@ /turf/open/floor/plating/asteroid/airless, /area/asteroid/nearstation/bomb_site) "cku" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -44586,7 +44586,7 @@ /turf/open/floor/plating, /area/maintenance/department/chapel/monastery) "ckD" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /obj/machinery/firealarm{ dir = 4; pixel_x = -28 @@ -44732,7 +44732,7 @@ /turf/open/floor/plating, /area/maintenance/department/chapel/monastery) "clg" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 1 }, /turf/open/floor/plasteel/dark, @@ -46321,7 +46321,7 @@ /turf/open/space/basic, /area/space/nearstation) "crg" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /turf/open/floor/plasteel/dark, /area/chapel/office) "crh" = ( @@ -46471,14 +46471,14 @@ /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) "crL" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /obj/effect/landmark/start/assistant, /turf/open/floor/plasteel/chapel{ dir = 4 }, /area/chapel/main/monastery) "crM" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /obj/effect/landmark/start/assistant, /turf/open/floor/plasteel/chapel{ dir = 1 @@ -46600,7 +46600,7 @@ /turf/open/floor/carpet/black, /area/chapel/office) "csp" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 8 }, /turf/open/floor/carpet/black, @@ -46668,7 +46668,7 @@ /area/maintenance/department/engine) "csB" = ( /obj/effect/landmark/start/chaplain, -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 4 }, /turf/open/floor/carpet/black, @@ -46744,7 +46744,7 @@ c_tag = "Chapel Starboard Access"; network = list("ss13","monastery") }, -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) "csU" = ( @@ -47078,7 +47078,7 @@ /turf/open/floor/plasteel, /area/chapel/main/monastery) "cuv" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 4 }, /obj/machinery/light/small{ @@ -47105,7 +47105,7 @@ /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) "cuy" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -47309,13 +47309,13 @@ /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) "cvd" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 4 }, /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) "cve" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 8 }, /turf/open/floor/plasteel/dark, @@ -47472,7 +47472,7 @@ /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) "cvB" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -47480,7 +47480,7 @@ /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) "cvC" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, @@ -47595,16 +47595,16 @@ /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) "cvS" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) "cvT" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /turf/open/floor/carpet, /area/chapel/main/monastery) "cvV" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) @@ -48166,7 +48166,7 @@ /turf/open/floor/plasteel/dark, /area/library) "czl" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /turf/open/floor/carpet, /area/library) "czo" = ( @@ -48209,7 +48209,7 @@ /turf/open/floor/plasteel/dark, /area/library) "czv" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 8 }, /turf/open/floor/plasteel/dark, @@ -48251,7 +48251,7 @@ /turf/open/floor/plasteel/dark, /area/library) "czI" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 1 }, /turf/open/floor/carpet, @@ -52922,7 +52922,7 @@ /turf/open/floor/plating, /area/maintenance/department/science) "new" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 4 }, /turf/open/floor/plating, @@ -56384,7 +56384,7 @@ /turf/open/floor/plating, /area/maintenance/department/security/brig) "vFZ" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 1 }, /obj/item/radio/intercom{ @@ -56616,7 +56616,7 @@ /turf/open/floor/plating, /area/maintenance/department/engine) "whH" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /obj/item/radio/intercom{ broadcasting = 1; frequency = 1481; diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 9142d076aa8..46a59e4a9ce 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -171,7 +171,7 @@ }, /area/holodeck/rec_center/lounge) "aA" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /turf/open/floor/holofloor{ dir = 9; icon_state = "wood" @@ -214,7 +214,7 @@ /turf/open/floor/holofloor/asteroid, /area/holodeck/rec_center/bunker) "aI" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 4 }, /turf/open/floor/holofloor{ @@ -240,7 +240,7 @@ }, /area/holodeck/rec_center/lounge) "aL" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 8 }, /turf/open/floor/holofloor{ @@ -255,7 +255,7 @@ /turf/open/floor/holofloor/snow, /area/holodeck/rec_center/winterwonderland) "aN" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 1 }, /turf/open/floor/holofloor{ @@ -2031,7 +2031,7 @@ /turf/open/floor/holofloor, /area/holodeck/rec_center/firingrange) "fq" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 1 }, /turf/open/floor/holofloor/grass, @@ -17553,7 +17553,7 @@ /turf/open/floor/grass, /area/centcom/holding) "Ri" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 1 }, /turf/open/floor/wood, diff --git a/_maps/shuttles/emergency_bar.dmm b/_maps/shuttles/emergency_bar.dmm index a3fbb665df4..55c9a25323d 100644 --- a/_maps/shuttles/emergency_bar.dmm +++ b/_maps/shuttles/emergency_bar.dmm @@ -312,7 +312,7 @@ /turf/open/floor/plasteel, /area/shuttle/escape) "aW" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /turf/open/floor/plasteel/grimy, /area/shuttle/escape) "aX" = ( @@ -331,7 +331,7 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/escape) "aZ" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 4 }, /turf/open/floor/plasteel/grimy, @@ -518,7 +518,7 @@ /turf/open/floor/plasteel/grimy, /area/shuttle/escape) "bK" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 8 }, /turf/open/floor/plasteel/grimy, @@ -558,7 +558,7 @@ /turf/open/floor/plasteel/grimy, /area/shuttle/escape) "bQ" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/wood{ dir = 1 }, /turf/open/floor/plasteel/grimy, diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm index 27b05eb7d84..f45856d667f 100644 --- a/_maps/shuttles/pirate_default.dmm +++ b/_maps/shuttles/pirate_default.dmm @@ -863,7 +863,7 @@ /turf/closed/wall/mineral/plastitanium, /area/shuttle/pirate) "dy" = ( -/obj/structure/chair/wood/normal, +/obj/structure/chair/wood, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 68bc39c9f46..0a391a01bda 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -133,9 +133,6 @@ /obj/structure/chair/wood/narsie_act() return -/obj/structure/chair/wood/normal //Kept for map compatibility - - /obj/structure/chair/wood/wings icon_state = "wooden_chair_wings" item_chair = /obj/item/chair/wood/wings diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index 3f8f719d680..a44f66d5544 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -493,7 +493,7 @@ Difficulty: Very Hard if("winter") //Snow terrain is slow to move in and cold! Get the assistants to shovel your driveway. NewTerrainFloors = /turf/open/floor/grass/snow NewTerrainWalls = /turf/closed/wall/mineral/wood - NewTerrainChairs = /obj/structure/chair/wood/normal + NewTerrainChairs = /obj/structure/chair/wood NewTerrainTables = /obj/structure/table/glass NewFlora = list(/obj/structure/flora/grass/green, /obj/structure/flora/grass/brown, /obj/structure/flora/grass/both) if("jungle") //Beneficial due to actually having breathable air. Plus, monkeys and bows and arrows.