Skip to content
This repository has been archived by the owner on Oct 15, 2023. It is now read-only.

Commit

Permalink
Remove the structure/chair/wood/normal subtype, moving all properties…
Browse files Browse the repository at this point in the history 
… to its parent.
  • Loading branch information
@variableundefined
variableundefined committed Sep 11, 2019
1 parent 2e17435 commit 18b270c
Show file tree
Hide file tree
Showing 14 changed files with 107 additions and 111 deletions.
62 changes: 31 additions & 31 deletions _maps/map_files/Delta/delta.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22514,7 +22514,7 @@
},
/area/crew_quarters/bar/atrium)
"aRy" = (
/obj/structure/chair/wood/normal,
/obj/structure/chair/wood,
/turf/simulated/floor/carpet,
/area/crew_quarters/bar/atrium)
"aRz" = (
Expand Down Expand Up @@ -23422,7 +23422,7 @@
d2 = 8;
icon_state = "1-8"
},
/obj/structure/chair/wood/normal{
/obj/structure/chair/wood{
dir = 4
},
/turf/simulated/floor/carpet,
Expand Down Expand Up @@ -24305,7 +24305,7 @@
},
/area/crew_quarters/bar/atrium)
"aUH" = (
/obj/structure/chair/wood/normal{
/obj/structure/chair/wood{
dir = 1
},
/turf/simulated/floor/carpet,
Expand Down Expand Up @@ -89006,7 +89006,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/structure/chair/wood/normal,
/obj/structure/chair/wood,
/turf/simulated/floor/wood{
broken = 1;
icon_state = "wood-broken"
Expand All @@ -89016,12 +89016,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/structure/chair/wood/normal,
/obj/structure/chair/wood,
/turf/simulated/floor/plating,
/area/maintenance/gambling_den)
"dcT" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/structure/chair/wood/normal,
/obj/structure/chair/wood,
/turf/simulated/floor/plasteel{
icon_state = "wood"
},
Expand Down Expand Up @@ -90537,7 +90537,7 @@
/area/maintenance/gambling_den)
"dfP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/chair/wood/normal{
/obj/structure/chair/wood{
dir = 8
},
/turf/simulated/floor/wood{
Expand Down Expand Up @@ -91371,7 +91371,7 @@
},
/area/maintenance/gambling_den)
"dhw" = (
/obj/structure/chair/wood/normal{
/obj/structure/chair/wood{
dir = 4
},
/turf/simulated/floor/plasteel{
Expand All @@ -91380,7 +91380,7 @@
/area/maintenance/gambling_den)
"dhx" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/chair/wood/normal{
/obj/structure/chair/wood{
dir = 8
},
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -92327,7 +92327,7 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"diY" = (
/obj/structure/chair/wood/normal{
/obj/structure/chair/wood{
dir = 4
},
/turf/simulated/floor/wood{
Expand All @@ -92346,7 +92346,7 @@
/area/maintenance/gambling_den)
"dja" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/chair/wood/normal{
/obj/structure/chair/wood{
dir = 8
},
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -93121,7 +93121,7 @@
},
/area/maintenance/gambling_den)
"dkr" = (
/obj/structure/chair/wood/normal{
/obj/structure/chair/wood{
dir = 4
},
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -94305,7 +94305,7 @@
/turf/simulated/floor/plasteel,
/area/hallway/secondary/construction)
"dmM" = (
/obj/structure/chair/wood/normal,
/obj/structure/chair/wood,
/turf/simulated/floor/plating,
/area/maintenance/gambling_den)
"dmN" = (
Expand Down Expand Up @@ -96153,7 +96153,7 @@
/turf/simulated/floor/plasteel,
/area/crew_quarters/hor)
"dpR" = (
/obj/structure/chair/wood/normal{
/obj/structure/chair/wood{
dir = 1
},
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -96848,7 +96848,7 @@
},
/area/maintenance/gambling_den)
"dra" = (
/obj/structure/chair/wood/normal{
/obj/structure/chair/wood{
dir = 8
},
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -101412,7 +101412,7 @@
},
/area/crew_quarters/theatre)
"dzq" = (
/obj/structure/chair/wood/normal{
/obj/structure/chair/wood{
dir = 4
},
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -102176,7 +102176,7 @@
dir = 4;
level = 1
},
/obj/structure/chair/wood/normal{
/obj/structure/chair/wood{
dir = 4
},
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -102619,7 +102619,7 @@
},
/area/crew_quarters/theatre)
"dBq" = (
/obj/structure/chair/wood/normal{
/obj/structure/chair/wood{
dir = 4
},
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -108948,36 +108948,36 @@
},
/area/chapel/office)
"dMT" = (
/obj/structure/chair/wood/normal,
/obj/structure/chair/wood,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "chapel"
},
/area/chapel/main)
"dMU" = (
/obj/structure/chair/wood/normal,
/obj/structure/chair/wood,
/turf/simulated/floor/plasteel{
icon_state = "chapel"
},
/area/chapel/main)
"dMV" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/chair/wood/normal,
/obj/structure/chair/wood,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "chapel"
},
/area/chapel/main)
"dMW" = (
/obj/structure/disposalpipe/segment,
/obj/structure/chair/wood/normal,
/obj/structure/chair/wood,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "chapel"
},
/area/chapel/main)
"dMX" = (
/obj/structure/chair/wood/normal,
/obj/structure/chair/wood,
/obj/machinery/firealarm{
dir = 4;
pixel_x = 28
Expand Down Expand Up @@ -109317,30 +109317,30 @@
},
/area/chapel/office)
"dNJ" = (
/obj/structure/chair/wood/normal,
/obj/structure/chair/wood,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "chapel"
},
/area/chapel/main)
"dNK" = (
/obj/structure/chair/wood/normal,
/obj/structure/chair/wood,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "chapel"
},
/area/chapel/main)
"dNL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/chair/wood/normal,
/obj/structure/chair/wood,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "chapel"
},
/area/chapel/main)
"dNM" = (
/obj/structure/disposalpipe/segment,
/obj/structure/chair/wood/normal,
/obj/structure/chair/wood,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "chapel"
Expand Down Expand Up @@ -109692,7 +109692,7 @@
},
/area/chapel/office)
"dOq" = (
/obj/structure/chair/wood/normal,
/obj/structure/chair/wood,
/obj/machinery/light{
icon_state = "tube1";
dir = 8
Expand All @@ -109715,7 +109715,7 @@
},
/area/chapel/main)
"dOt" = (
/obj/structure/chair/wood/normal,
/obj/structure/chair/wood,
/obj/machinery/light{
icon_state = "tube1";
dir = 4
Expand Down Expand Up @@ -111770,7 +111770,7 @@
/area/chapel/office)
"dSf" = (
/obj/machinery/light/small,
/obj/structure/chair/wood/normal{
/obj/structure/chair/wood{
dir = 4
},
/obj/machinery/newscaster{
Expand All @@ -111783,7 +111783,7 @@
/area/chapel/main)
"dSg" = (
/obj/machinery/light/small,
/obj/structure/chair/wood/normal{
/obj/structure/chair/wood{
dir = 8
},
/obj/machinery/newscaster{
Expand Down
10 changes: 5 additions & 5 deletions _maps/map_files/MetaStation/MetaStation.v41A.II.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13578,7 +13578,7 @@
/turf/simulated/floor/plating,
/area/maintenance/fore)
"aya" = (
/obj/structure/chair/wood/normal,
/obj/structure/chair/wood,
/turf/simulated/floor/wood,
/area/crew_quarters/mrchangs)
"ayb" = (
Expand Down Expand Up @@ -14935,7 +14935,7 @@
name = "Port Maintenance"
})
"aAB" = (
/obj/structure/chair/wood/normal{
/obj/structure/chair/wood{
dir = 1
},
/turf/simulated/floor/wood,
Expand All @@ -14952,7 +14952,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/chair/wood/normal{
/obj/structure/chair/wood{
dir = 1
},
/turf/simulated/floor/wood,
Expand Down Expand Up @@ -15652,7 +15652,7 @@
/turf/simulated/floor/wood,
/area/crew_quarters/sleep)
"aBS" = (
/obj/structure/chair/wood/normal{
/obj/structure/chair/wood{
dir = 1
},
/turf/simulated/floor/wood,
Expand Down Expand Up @@ -21926,7 +21926,7 @@
name = "\improper Warehouse"
})
"aMA" = (
/obj/structure/chair/wood/normal{
/obj/structure/chair/wood{
dir = 4
},
/turf/simulated/floor/wood,
Expand Down
6 changes: 3 additions & 3 deletions _maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
/obj/item/shard{
icon_state = "medium"
},
/obj/structure/chair/wood/normal{
/obj/structure/chair/wood{
dir = 8
},
/turf/simulated/floor/wood,
Expand Down Expand Up @@ -128,7 +128,7 @@
/turf/simulated/floor/wood,
/area/ruin/unpowered)
"av" = (
/obj/structure/chair/wood/normal{
/obj/structure/chair/wood{
dir = 8
},
/turf/simulated/floor/wood,
Expand Down Expand Up @@ -201,7 +201,7 @@
/turf/simulated/floor/wood,
/area/ruin/unpowered)
"aH" = (
/obj/structure/chair/wood/normal{
/obj/structure/chair/wood{
dir = 4
},
/turf/simulated/floor/carpet,
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/RandomZLevels/academy.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1134,7 +1134,7 @@
/turf/simulated/floor/plasteel,
/area/awaymission/academy/classrooms)
"ds" = (
/obj/structure/chair/wood/normal{
/obj/structure/chair/wood{
dir = 1
},
/turf/simulated/floor/wood,
Expand Down Expand Up @@ -2204,7 +2204,7 @@
},
/area/awaymission/academy/classrooms)
"gb" = (
/obj/structure/chair/wood/normal,
/obj/structure/chair/wood,
/turf/simulated/floor/wood,
/area/awaymission/academy/classrooms)
"gc" = (
Expand Down
8 changes: 4 additions & 4 deletions _maps/map_files/RandomZLevels/example.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@
},
/area/awaymission/example)
"bB" = (
/obj/structure/chair/wood/normal,
/obj/structure/chair/wood,
/turf/simulated/floor/plasteel{
icon_state = "bar"
},
Expand Down Expand Up @@ -670,7 +670,7 @@
},
/area/awaymission/example)
"bJ" = (
/obj/structure/chair/wood/normal{
/obj/structure/chair/wood{
tag = "icon-wooden_chair (EAST)";
icon_state = "wooden_chair";
dir = 4
Expand All @@ -680,7 +680,7 @@
},
/area/awaymission/example)
"bK" = (
/obj/structure/chair/wood/normal{
/obj/structure/chair/wood{
tag = "icon-wooden_chair (WEST)";
icon_state = "wooden_chair";
dir = 8
Expand All @@ -706,7 +706,7 @@
},
/area/awaymission/example)
"bN" = (
/obj/structure/chair/wood/normal{
/obj/structure/chair/wood{
tag = "icon-wooden_chair (NORTH)";
icon_state = "wooden_chair";
dir = 1
Expand Down
Loading

0 comments on commit 18b270c

Please sign in to comment.