diff --git a/_maps/map_files/Barrenquilla_Mining/Barrenquilla_Mining_Facility.dmm b/_maps/map_files/Barrenquilla_Mining/Barrenquilla_Mining_Facility.dmm index bffea725f2b..143c1e9d217 100644 --- a/_maps/map_files/Barrenquilla_Mining/Barrenquilla_Mining_Facility.dmm +++ b/_maps/map_files/Barrenquilla_Mining/Barrenquilla_Mining_Facility.dmm @@ -1693,7 +1693,7 @@ /turf/open/floor/plating, /area/barren/engie/engine) "hV" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/weapon/gun/shotgun/double, /obj/effect/spawner/random/weaponry/ammo/shotgun, /turf/open/floor/wood/variable/wide, @@ -2275,7 +2275,7 @@ /turf/open/floor/tile/hydro, /area/barren/civilian/botany) "ku" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/clothing/mask/cigarette/kelo, /turf/open/floor, /area/bigredv2/outside/general_offices) @@ -3035,7 +3035,7 @@ /turf/open/floor/wood, /area/barren/civilian/cook) "nW" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/food_or_drink/drink_alcohol_bottle{ pixel_x = -10 }, @@ -3859,7 +3859,7 @@ /turf/open/floor/plating/ground/lavaland/catwalk, /area/barren/cave/east) "rS" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/toy/deck, /obj/effect/decal/cleanable/dirt, /turf/open/floor/grimy, @@ -5580,7 +5580,7 @@ /turf/open/floor/plating, /area/barren/cave/central) "An" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /turf/open/floor/grimy, /area/barren/civilian/workdorm) @@ -6261,7 +6261,7 @@ }, /area/barren/medical) "DG" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/paper_bin, /obj/item/tool/pen, /mob/living/simple_animal/cat/Runtime, @@ -6667,7 +6667,7 @@ /turf/open/floor/carpet, /area/barren/misc/ashshelter) "FB" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/item/paper/clockresearch1, /obj/machinery/atmospherics/pipe/simple/green/hidden{ @@ -6934,7 +6934,7 @@ }, /area/barren/security) "GJ" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor, /area/bigredv2/outside/general_offices) "GK" = ( @@ -8606,7 +8606,7 @@ /turf/open/floor/wood, /area/barren/cave/lz1) "OZ" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /obj/item/ashtray/bronze, /obj/item/tool/lighter/zippo, @@ -9139,7 +9139,7 @@ /turf/open/floor/plating, /area/barren/cave/central) "RB" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/computer3/laptop/secure_data, /turf/open/floor/wood/broken, /area/barren/civilian/workdorm) diff --git a/_maps/map_files/BigRed_v2/BigRed_v2.dmm b/_maps/map_files/BigRed_v2/BigRed_v2.dmm index 37883616458..d9567ce8961 100644 --- a/_maps/map_files/BigRed_v2/BigRed_v2.dmm +++ b/_maps/map_files/BigRed_v2/BigRed_v2.dmm @@ -263,7 +263,7 @@ /turf/open/floor/plating, /area/bigredv2/outside/marshal_office) "aes" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/computer/security/wooden_tv, /turf/open/floor/wood, /area/bigredv2/outside/marshal_office) @@ -276,22 +276,22 @@ /turf/open/floor/plating, /area/bigredv2/caves/lambda_lab) "aeO" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/recharger, /turf/open/floor/wood, /area/bigredv2/outside/marshal_office) "aeP" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/flask/detflask, /turf/open/floor/wood, /area/bigredv2/outside/marshal_office) "aeQ" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/ashtray/bronze, /turf/open/floor/wood, /area/bigredv2/outside/marshal_office) "aeR" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/clothing/head/det_hat, /turf/open/floor/wood, /area/bigredv2/outside/marshal_office) @@ -1294,11 +1294,11 @@ /turf/open/floor/grimy, /area/bigredv2/outside/marshal_office) "alD" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/grimy, /area/bigredv2/outside/marshal_office) "alE" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/bigredv2/outside/marshal_office) "alF" = ( @@ -1515,7 +1515,7 @@ }, /area/bigredv2/outside/marshal_office) "ang" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/paper/Court, /turf/open/floor/engine/cult, /area/bigredv2/outside/marshal_office) @@ -1617,7 +1617,7 @@ /turf/open/floor/tile/dark, /area/bigredv2/outside/marshal_office) "anE" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/engine/cult, /area/bigredv2/outside/marshal_office) "anF" = ( @@ -1627,7 +1627,7 @@ /turf/open/floor/engine/cult, /area/bigredv2/outside/marshal_office) "anG" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/clothing/suit/storage/lawyer/bluejacket, /turf/open/floor/wood, /area/bigredv2/outside/marshal_office) @@ -1713,7 +1713,7 @@ /turf/open/floor/engine/cult, /area/bigredv2/outside/marshal_office) "aom" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/camera, /turf/open/floor/wood, /area/bigredv2/outside/marshal_office) @@ -1793,7 +1793,7 @@ /turf/open/floor/tile/red/full, /area/bigredv2/outside/marshal_office) "aoX" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/camera_film, /turf/open/floor/wood, /area/bigredv2/outside/marshal_office) @@ -2065,7 +2065,7 @@ /turf/open/floor/elevatorshaft, /area/bigredv2/caves/lambda_lab) "ara" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/effect/spawner/random/misc/plushie{ pixel_x = -5; @@ -2114,7 +2114,7 @@ /turf/open/floor/elevatorshaft, /area/bigredv2/caves/lambda_lab) "arH" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /turf/open/floor/wood, /area/bigredv2/caves/lambda_lab) @@ -2182,7 +2182,7 @@ /turf/open/floor/wood, /area/bigredv2/caves/lambda_lab) "asq" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/carpet/side{ dir = 10 }, @@ -2624,12 +2624,12 @@ /turf/open/floor, /area/bigredv2/outside/dorms) "awA" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/tool/pen, /turf/open/floor/carpet/side, /area/bigredv2/caves/lambda_lab) "awB" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/coffee, /obj/item/phone, /turf/open/floor/carpet/side{ @@ -3002,12 +3002,12 @@ /turf/open/floor/freezer, /area/bigredv2/outside/dorms) "aBr" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/toy/beach_ball, /turf/open/floor/wood, /area/bigredv2/outside/dorms) "aBs" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/bigredv2/outside/dorms) "aBt" = ( @@ -3483,7 +3483,7 @@ /turf/open/floor/freezer, /area/bigredv2/outside/dorms) "aFT" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/radio/survivor, /turf/open/floor/wood, /area/bigredv2/outside/dorms) @@ -3496,7 +3496,7 @@ /turf/open/floor/wood, /area/bigredv2/outside/dorms) "aFW" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/bigredv2/outside/bar) "aFX" = ( @@ -3636,7 +3636,7 @@ /area/bigredv2/outside/bar) "aHJ" = ( /obj/machinery/reagentgrinder, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/bigredv2/outside/bar) "aHK" = ( @@ -4137,7 +4137,7 @@ /turf/open/floor/wood, /area/bigredv2/outside/bar) "aKy" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/ashtray/glass, /turf/open/floor/wood, /area/bigredv2/outside/bar) @@ -4412,7 +4412,7 @@ }, /area/bigredv2/outside/virology) "aMI" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/trash/sosjerky, /turf/open/floor/wood, /area/bigredv2/outside/bar) @@ -4425,7 +4425,7 @@ /obj/machinery/chem_dispenser/soda{ dir = 8 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/bigredv2/outside/bar) "aMK" = ( @@ -4572,7 +4572,7 @@ /turf/open/floor/plating, /area/bigredv2/outside/cargo) "aOS" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/trash/cheesie, /obj/item/trash/pistachios, /turf/open/floor/wood, @@ -8892,7 +8892,7 @@ /turf/closed/wall/r_wall, /area/bigredv2/caves/south) "eyB" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/landmark/weed_node, /turf/open/floor/wood, /area/bigredv2/outside/marshal_office) @@ -9472,7 +9472,7 @@ /turf/closed/wall, /area/bigredv2/outside/engineering) "fQm" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/atmospherics/components/unary/vent_pump, /obj/item/trash/cheesie, /obj/effect/ai_node, @@ -11202,7 +11202,7 @@ /turf/open/floor/freezer, /area/bigredv2/caves/lambda_lab) "jBy" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/landmark/excavation_site_spawner, /turf/open/floor/carpet, /area/bigredv2/caves/lambda_lab) @@ -11553,7 +11553,7 @@ /turf/open/floor/plating/ground/mars/random/dirt, /area/bigredv2/outside/sw) "knk" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/paper/courtroom{ name = "A Crash Course in Legal SOP" }, @@ -12021,7 +12021,7 @@ /turf/open/floor/plating/ground/mars/random/cave/rock, /area/bigredv2/caves/northeast) "lBl" = ( -/obj/structure/table/woodentable{ +/obj/structure/table/wood{ flipped = 1 }, /obj/effect/decal/cleanable/blood, @@ -13761,7 +13761,7 @@ /turf/open/floor/plating/ground/mars/random/cave, /area/bigredv2/caves/northeast/garbledradio) "pBb" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/engineering/tool, /turf/open/floor/wood, /area/bigredv2/outside/bar) @@ -14995,7 +14995,7 @@ }, /area/bigredv2/outside/nanotrasen_lab/inside/garbledradio) "sqI" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /turf/open/floor/engine/cult, /area/bigredv2/outside/marshal_office) diff --git a/_maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm b/_maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm index c825a34b72e..76f11a988ea 100644 --- a/_maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm +++ b/_maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm @@ -513,7 +513,7 @@ "afy" = ( /obj/effect/spawner/random/misc/paperbin, /obj/item/tool/pen/blue, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/ice_colony/surface/clinic/treatment) "afz" = ( @@ -1526,7 +1526,7 @@ /turf/open/floor/plating/ground/ice, /area/ice_colony/exterior/surface/valley/west) "alL" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/tile/darkgreen/darkgreen2{ dir = 6 }, @@ -2960,17 +2960,17 @@ /turf/open/floor/grass, /area/ice_colony/surface/hydroponics/lobby) "auo" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/tile/darkgreen/darkgreen2/corner, /area/ice_colony/surface/hydroponics/lobby) "aup" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/tile/darkgreen/darkgreen2{ dir = 1 }, /area/ice_colony/surface/hydroponics/lobby) "auq" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/tile/darkgreen/darkgreen2/corner{ dir = 8 }, @@ -3007,13 +3007,13 @@ /turf/open/floor/tile/dark2, /area/ice_colony/surface/command) "auB" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/tile/darkgreen/darkgreen2{ dir = 9 }, /area/ice_colony/surface/hydroponics/lobby) "auD" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/tile/darkgreen/darkgreen2{ dir = 8 }, @@ -3053,7 +3053,7 @@ }, /area/ice_colony/surface/hydroponics/lobby) "auI" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/tile/darkgreen/darkgreen2{ dir = 4 }, @@ -3224,7 +3224,7 @@ }, /area/ice_colony/surface/dorms) "avp" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/tile/darkgreen/darkgreen2{ dir = 5 }, @@ -3276,7 +3276,7 @@ }, /area/ice_colony/surface/command) "avB" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/tile/darkgreen/darkgreen2{ dir = 10 }, @@ -3624,14 +3624,14 @@ /turf/open/floor/grass, /area/ice_colony/surface/hydroponics/lobby) "axi" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/cable, /turf/open/floor/tile/darkgreen/darkgreen2/corner{ dir = 4 }, /area/ice_colony/surface/hydroponics/lobby) "axj" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/cable, /turf/open/floor/tile/darkgreen/darkgreen2, /area/ice_colony/surface/hydroponics/lobby) @@ -3646,11 +3646,11 @@ /turf/closed/wall, /area/ice_colony/surface/dorms/lavatory) "axm" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/tile/darkgreen/darkgreen2, /area/ice_colony/surface/hydroponics/lobby) "axn" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/tile/darkgreen/darkgreen2/corner{ dir = 1 }, @@ -6140,7 +6140,7 @@ /turf/open/floor/wood, /area/ice_colony/surface/bar/bar) "aMe" = ( -/obj/structure/table/gamblingtable{ +/obj/structure/table/wood/gambling{ dir = 4; flipped = 1 }, @@ -6318,7 +6318,7 @@ /turf/open/floor/wood, /area/ice_colony/surface/bar/bar) "aNk" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/machinery/atmospherics/pipe/simple/green/hidden{ dir = 4 }, @@ -6501,7 +6501,7 @@ }, /area/ice_colony/surface/hangar/checkpoint) "aOe" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /turf/open/floor/wood, /area/ice_colony/surface/bar/bar) "aOf" = ( @@ -6601,16 +6601,16 @@ /turf/open/floor/freezer, /area/ice_colony/surface/bar/canteen) "aOI" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/cable, /turf/open/floor/wood, /area/ice_colony/surface/bar/bar) "aOJ" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/ice_colony/surface/bar/bar) "aOM" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/bottle/vodka, /turf/open/floor/wood, /area/ice_colony/surface/bar/bar) @@ -10512,7 +10512,7 @@ /turf/open/shuttle/dropship/floor, /area/ice_colony/underground/responsehangar) "bmd" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/atmospherics/pipe/simple/green/hidden{ dir = 4 }, @@ -10555,7 +10555,7 @@ /area/ice_colony/underground/crew/library) "bmq" = ( /obj/item/frame/light_fixture, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/tile/dark/yellow2{ dir = 1 }, @@ -10606,7 +10606,7 @@ /turf/open/floor/tile/chapel, /area/ice_colony/underground/crew/chapel) "bmC" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/carpet, /area/ice_colony/underground/crew/chapel) "bmD" = ( @@ -10631,7 +10631,7 @@ /turf/open/floor/wood, /area/ice_colony/underground/crew/library) "bmH" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/book/manual/engineering_hacking, /turf/open/floor/wood, /area/ice_colony/underground/crew/library) @@ -10739,7 +10739,7 @@ }, /area/ice_colony/underground/crew/chapel) "bnf" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/ice_colony/underground/crew/library) "bng" = ( @@ -10795,7 +10795,7 @@ /turf/open/floor/wood, /area/ice_colony/underground/crew/library) "bnq" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/book/manual/marine_law, /obj/machinery/atmospherics/pipe/simple/green/hidden{ dir = 4 @@ -10884,7 +10884,7 @@ /area/ice_colony/underground/hallway/north_west) "bnO" = ( /obj/item/storage/box/lightstick, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/tile/dark/yellow2{ dir = 1 }, @@ -11376,7 +11376,7 @@ /area/ice_colony/underground/engineering) "brd" = ( /obj/item/storage/box/lights, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/tile/dark/yellow2, /area/ice_colony/underground/engineering) "bre" = ( @@ -11834,7 +11834,7 @@ /turf/open/floor/plating, /area/ice_colony/underground/maintenance/engineering) "bxl" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/cable, /obj/item/reagent_containers/food/drinks/bottle/holywater, /turf/open/floor/carpet, @@ -11878,7 +11878,7 @@ /turf/open/floor/wood, /area/ice_colony/underground/crew/library) "bxF" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/cable, /turf/open/floor/wood, /area/ice_colony/underground/crew/library) @@ -12176,7 +12176,7 @@ /turf/closed/wall/r_wall, /area/ice_colony/underground/command/center) "bzr" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/computer/security/wooden_tv, /obj/structure/cable, /turf/open/floor/wood, @@ -12377,7 +12377,7 @@ }, /area/ice_colony/underground/command/center) "bAk" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/weapon/gun/revolver/cmb, /obj/item/ammo_magazine/revolver/cmb, /turf/open/floor/wood, @@ -13444,7 +13444,7 @@ }, /area/ice_colony/underground/command/checkpoint) "bEV" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/ice_colony/underground/crew/dorm_r) "bEW" = ( @@ -13520,7 +13520,7 @@ }, /area/ice_colony/underground/storage/highsec) "bFs" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/ice_colony/underground/crew/dorm_l) "bFt" = ( @@ -13625,7 +13625,7 @@ /turf/open/floor/wood, /area/ice_colony/underground/command/pv2) "bFV" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/window/reinforced/tinted{ dir = 1 }, @@ -13823,7 +13823,7 @@ /turf/open/floor/wood, /area/ice_colony/underground/command/pv2) "bGN" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/window/reinforced/tinted{ dir = 1 }, @@ -15378,7 +15378,7 @@ /turf/open/floor/carpet, /area/ice_colony/underground/crew/leisure) "bNm" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /turf/open/floor/carpet, /area/ice_colony/underground/crew/leisure) "bNn" = ( @@ -15516,7 +15516,7 @@ /turf/open/floor/tile/dark2, /area/ice_colony/underground/crew/disposals) "bNP" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/ice_colony/underground/crew/leisure) "bNQ" = ( @@ -15532,14 +15532,14 @@ /turf/open/floor/carpet, /area/ice_colony/underground/crew/leisure) "bNS" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/machinery/atmospherics/pipe/simple/green/hidden{ dir = 4 }, /turf/open/floor/carpet, /area/ice_colony/underground/crew/leisure) "bNT" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/machinery/atmospherics/pipe/manifold/green/hidden{ dir = 1 }, @@ -17078,7 +17078,7 @@ /turf/open/floor/tile/dark, /area/ice_colony/surface/excavationbarracks) "bWd" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/trash/plate{ pixel_x = 9; pixel_y = 7 @@ -18114,7 +18114,7 @@ /turf/open/floor/plating, /area/ice_colony/underground/maintenance/central) "cBf" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/table_lighting, /obj/item/tool/pen/blue{ pixel_x = 5 @@ -19184,7 +19184,7 @@ }, /area/ice_colony/exterior/surface/landing_pad2) "dWx" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/handcuffs, /obj/item/weapon/baton, /turf/open/floor/wood, @@ -20316,7 +20316,7 @@ /obj/item/inflatable/wall, /obj/item/inflatable/door, /obj/item/storage/box/engineer, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/tile/dark/yellow2{ dir = 1 }, @@ -20732,7 +20732,7 @@ /obj/effect/spawner/random/engineering/cable, /obj/item/stack/rods, /obj/item/storage/donut_box, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/tile/dark/yellow2{ dir = 1 }, @@ -20914,7 +20914,7 @@ /turf/open/floor/tile/dark2, /area/ice_colony/surface/hydroponics/lobby) "gHT" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/table_lighting, /obj/item/tool/pen/blue{ pixel_x = 5 @@ -21254,7 +21254,7 @@ /turf/open/floor/plating/ground/snow/layer1, /area/ice_colony/exterior/surface/clearing/south) "hii" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/table_lighting, /obj/item/tool/pen/blue{ pixel_x = 5 @@ -21429,7 +21429,7 @@ }, /area/ice_colony/underground/security/hallway) "htF" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/food_or_drink/beer, /turf/open/floor/wood, /area/ice_colony/surface/bar/bar) @@ -21615,7 +21615,7 @@ /turf/open/floor/tile/dark2, /area/ice_colony/surface/excavation) "hJF" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder, /turf/open/floor/wood, /area/ice_colony/underground/security/marshal) @@ -21788,7 +21788,7 @@ /turf/open/floor/tile/dark2, /area/ice_colony/surface/hangar/checkpoint) "iav" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /obj/item/tool/stamp, /turf/open/floor/wood, @@ -22568,7 +22568,7 @@ /turf/open/floor/tile/white, /area/ice_colony/underground/hallway/north_west/garbledradio) "jft" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /obj/item/tool/stamp, /turf/open/floor/wood, @@ -24213,7 +24213,7 @@ /turf/open/floor/tile/darkgreen/darkgreen2, /area/ice_colony/underground/hallway/north_west/garbledradio) "lBF" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /obj/item/tool/stamp, /turf/open/floor/wood, @@ -24675,7 +24675,7 @@ }, /area/ice_colony/surface/garage/one) "lZy" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /obj/item/tool/pen/blue, /turf/open/floor/wood, @@ -25326,7 +25326,7 @@ /turf/open/floor/tile/dark, /area/ice_colony/surface/excavationbarracks) "mVl" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/evidencebag, /obj/effect/spawner/random/misc/cigar, /turf/open/floor/wood, @@ -26250,7 +26250,7 @@ }, /area/ice_colony/underground/medical/lobby/garbledradio) "ohT" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/table_lighting, /turf/open/floor/carpet, /area/ice_colony/underground/crew/chapel) @@ -29702,7 +29702,7 @@ }, /area/ice_colony/surface/substation/smes) "sOx" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/chem_dispenser/beer, /obj/structure/cable, /obj/machinery/air_alarm{ @@ -29789,7 +29789,7 @@ }, /area/ice_colony/surface/hangar/beta) "sVZ" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/ice_colony/surface/clinic/treatment) "sWF" = ( @@ -30413,7 +30413,7 @@ }, /area/ice_colony/underground/medical/treatment/garbledradio) "tKp" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/pizzapasta/boiledspaghetti, /turf/open/floor/tile/dark, /area/ice_colony/surface/excavationbarracks) @@ -30572,7 +30572,7 @@ }, /area/ice_colony/surface/command) "tWM" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/table_lighting, /turf/open/floor/wood, /area/ice_colony/underground/crew/library) @@ -31251,7 +31251,7 @@ /turf/closed/mineral/smooth/bluefrostwall, /area/ice_colony/exterior/underground/caves/rock) "uSE" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/clipboard, /obj/effect/spawner/random/misc/folder{ pixel_x = -5; diff --git a/_maps/map_files/LV624/LV624.dmm b/_maps/map_files/LV624/LV624.dmm index dd2a9ead365..6899ccebbcb 100644 --- a/_maps/map_files/LV624/LV624.dmm +++ b/_maps/map_files/LV624/LV624.dmm @@ -1730,7 +1730,7 @@ /turf/open/floor, /area/lv624/lazarus/spaceport) "aSg" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/box/donkpockets, /obj/effect/spawner/random/clothing/sunglasses, /turf/open/floor/wood, @@ -2343,7 +2343,7 @@ /turf/open/floor/tile/darkish, /area/lv624/lazarus/sandtemple) "bhp" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/box/matches, /obj/item/tool/candle, /turf/open/floor/tile/chapel{ @@ -3522,7 +3522,7 @@ }, /area/lv624/ground/jungle5) "cgB" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/ashtray/bronze, /obj/effect/spawner/random/weaponry/gun/sidearms, /turf/open/floor/cult/clock, @@ -3751,7 +3751,7 @@ /turf/open/floor/plating/ground/dirt, /area/lv624/ground/sand3) "cwk" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /turf/open/floor/wood, /area/lv624/lazarus/internal_affairs) @@ -3996,7 +3996,7 @@ /turf/open/floor/tile/white, /area/lv624/lazarus/hydroponics/aux) "cIq" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/atm{ pixel_y = 30 }, @@ -4241,7 +4241,7 @@ }, /area/lv624/lazarus/fitness) "cUZ" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/megaphone, /turf/open/floor/wood, /area/lv624/lazarus/corporate_affairs) @@ -4357,7 +4357,7 @@ /turf/open/floor/plating, /area/lv624/lazarus/quart) "dda" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/chem_dispenser/beer{ pixel_y = 26 }, @@ -4705,7 +4705,7 @@ /turf/open/floor/tile/dark, /area/lv624/lazarus/secure_storage) "dxb" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/grimy, /area/lv624/lazarus/captain) "dxn" = ( @@ -5043,7 +5043,7 @@ /turf/open/floor, /area/lv624/lazarus/spaceport) "dPf" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/taperecorder, /turf/open/floor/grimy, /area/lv624/lazarus/captain) @@ -5124,7 +5124,7 @@ /turf/open/floor, /area/lv624/lazarus/spaceport) "dTk" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/effect/landmark/weed_node, /turf/open/floor/wood, /area/lv624/lazarus/bar) @@ -5399,7 +5399,7 @@ }, /area/lv624/lazarus/research) "egX" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/pinpointer, /turf/open/floor/wood, /area/lv624/lazarus/internal_affairs) @@ -5778,7 +5778,7 @@ /turf/open/floor/tile/dark, /area/lv624/lazarus/quartstorage) "eJN" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/pinpointer, /turf/open/floor/wood, /area/lv624/lazarus/corporate_affairs) @@ -5804,7 +5804,7 @@ /turf/open/floor/tile/dark, /area/lv624/lazarus/atmos) "eKG" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/food_or_drink/drink_alcohol_bottle, /turf/open/floor, /area/lv624/lazarus/chapel) @@ -6448,7 +6448,7 @@ /turf/open/floor/plating, /area/lv624/lazarus/tablefort) "fvD" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/lv624/lazarus/internal_affairs) "fwb" = ( @@ -8283,7 +8283,7 @@ /turf/open/floor/plating, /area/lv624/lazarus/quartstorage/dome) "hAx" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/machinery/random_broken_computer/crewmonitor, /turf/open/floor/wood, /area/lv624/lazarus/internal_affairs) @@ -8322,7 +8322,7 @@ }, /area/lv624/lazarus/hydroponics/aux) "hDe" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/ashtray/bronze, /obj/item/clothing/mask/cigarette/tram, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -8487,7 +8487,7 @@ }, /area/lv624/lazarus/tablefort) "hNX" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, @@ -8569,7 +8569,7 @@ /turf/open/floor/plating, /area/lv624/lazarus/tablefort) "hRG" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/trash/chips, /obj/effect/ai_node, /turf/open/floor/wood, @@ -8621,7 +8621,7 @@ /turf/open/floor/tile/dark, /area/lv624/lazarus/quartstorage/dome) "hUC" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/clothing/head/boonie, /obj/effect/spawner/random/food_or_drink/drink_alcohol_bottle{ pixel_x = -10 @@ -9229,14 +9229,14 @@ /turf/open/floor/plating/ground/dirt, /area/lv624/ground/compound/c) "iBt" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/tool/candle, /turf/open/floor/tile/chapel{ dir = 8 }, /area/lv624/lazarus/chapel) "iBV" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/box/donkpockets, /obj/item/clothing/glasses/sunglasses/big{ pixel_y = 5 @@ -9607,7 +9607,7 @@ /turf/open/floor/plating/warning, /area/lv624/lazarus/engineering) "iVC" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/lv624/lazarus/corporate_affairs) "iVF" = ( @@ -9630,7 +9630,7 @@ /turf/open/floor/wood, /area/lv624/lazarus/bar) "iWB" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/ashtray/glass, /obj/item/toy/deck, /obj/item/mecha_parts/part/gygax_head, @@ -9988,7 +9988,7 @@ /turf/open/liquid/water/river/autosmooth, /area/lv624/ground/river1) "jtS" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/cigarettes, /turf/open/floor/wood, /area/lv624/ground/jungle8) @@ -12082,7 +12082,7 @@ /turf/open/floor/plating/ground/dirtgrassborder/autosmooth, /area/lv624/lazarus/sandtemple/garbledradio) "lIF" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/trash/candle, /turf/open/floor/tile/chapel{ dir = 1 @@ -12802,7 +12802,7 @@ /turf/open/liquid/water/river/autosmooth/deep, /area/lv624/ground/river2) "mun" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/ashtray/bronze, /obj/item/toy/dice/d20, /obj/item/clothing/mask/cigarette/cigar, @@ -13996,7 +13996,7 @@ }, /area/lv624/lazarus/main_hall) "nQQ" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/tool/candle, /obj/item/storage/box/matches, /obj/effect/spawner/random/weaponry/melee, @@ -14657,7 +14657,7 @@ /turf/open/floor/cult/clock, /area/lv624/lazarus/bar) "oGQ" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/ashtray/glass, /obj/item/toy/deck, /obj/item/mecha_parts/part/gygax_head, @@ -14750,7 +14750,7 @@ /turf/open/floor/tile/bar, /area/lv624/lazarus/canteen) "oKX" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /turf/open/floor/tile/bar, /area/lv624/lazarus/canteen) "oLb" = ( @@ -14763,7 +14763,7 @@ /turf/open/liquid/water/river/deep, /area/lv624/ground/river2) "oMa" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /turf/open/floor/wood, /area/lv624/lazarus/bar) "oMX" = ( @@ -15649,7 +15649,7 @@ /turf/open/floor, /area/lv624/ground/river2) "pSj" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/computer/med_data/laptop, /obj/machinery/light/small{ dir = 8 @@ -16161,7 +16161,7 @@ /turf/open/floor/tile/white, /area/lv624/lazarus/main_hall) "qwn" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/trash/cigbutt/cigarbutt, /obj/machinery/cell_charger, /obj/effect/spawner/random/misc/cigarettes, @@ -16298,7 +16298,7 @@ /turf/open/liquid/water/river/autosmooth/deep, /area/lv624/ground/jungle4) "qEL" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/instrument/accordion, /obj/item/instrument/saxophone, /obj/item/clothing/mask/cigarette/pipe/cobpipe, @@ -16367,7 +16367,7 @@ /turf/open/floor/plating/ground/dirtgrassborder/autosmooth, /area/lv624/ground/jungle6) "qJo" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_y = 4 }, @@ -16448,7 +16448,7 @@ /turf/open/floor/plating/ground/dirt, /area/lv624/ground/jungle9) "qNH" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/table_lighting, /turf/open/floor/wood, /area/lv624/lazarus/corporate_affairs) @@ -17006,7 +17006,7 @@ }, /area/lv624/lazarus/corporate_affairs) "rmA" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/weapon/gun/shotgun/double, /obj/effect/spawner/random/weaponry/ammo/shotgun, /turf/open/floor/wood, @@ -17643,7 +17643,7 @@ /turf/closed/gm/dense, /area/lv624/lazarus/spaceport2) "rRG" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/drinkingglass, /obj/item/weapon/broken_bottle, /turf/open/floor/grimy, @@ -19282,7 +19282,7 @@ /turf/open/ground/grass, /area/lv624/lazarus/spaceport) "tGp" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/megaphone, /obj/effect/landmark/weed_node, /turf/open/floor/grimy, @@ -21774,7 +21774,7 @@ /turf/open/floor/grass, /area/lv624/lazarus/main_hall) "wor" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/machinery/random_broken_computer/crewmonitor, /turf/open/floor/wood, /area/lv624/lazarus/corporate_affairs) @@ -21887,7 +21887,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /turf/open/floor/wood, /area/lv624/lazarus/bar) "wvu" = ( @@ -21998,7 +21998,7 @@ }, /area/lv624/ground/jungle5) "wAp" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/bible, /obj/machinery/light/small{ dir = 1 @@ -22088,7 +22088,7 @@ /turf/open/floor, /area/lv624/lazarus/spaceport2) "wEB" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/light/small, /turf/open/floor/grimy, /area/lv624/lazarus/captain) @@ -22713,7 +22713,7 @@ /turf/open/floor/plating/ground/dirt, /area/lv624/ground/sand5) "xgs" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = -2; pixel_y = 4 @@ -22905,7 +22905,7 @@ /turf/open/floor/plating/ground/dirt, /area/lv624/ground/compound/se) "xop" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/drinkingglass, /turf/open/floor/grimy, /area/lv624/lazarus/bar) @@ -23190,7 +23190,7 @@ }, /area/lv624/lazarus/sleep_male) "xEh" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/photocopier{ pixel_y = 12 }, @@ -23722,7 +23722,7 @@ /turf/open/floor/plating, /area/lv624/ground/caves/central1/garbledradio) "yff" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/megaphone, /turf/open/floor/wood, /area/lv624/lazarus/internal_affairs) diff --git a/_maps/map_files/Last_Stand/Last_Stand.dmm b/_maps/map_files/Last_Stand/Last_Stand.dmm index 66031016d81..dadaef1fe9a 100644 --- a/_maps/map_files/Last_Stand/Last_Stand.dmm +++ b/_maps/map_files/Last_Stand/Last_Stand.dmm @@ -242,7 +242,7 @@ /turf/open/floor/prison, /area/whiskey_outpost) "bq" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/toy/dice, /obj/item/toy/dice/d20, /obj/item/toy/deck, @@ -252,7 +252,7 @@ /turf/open/floor/prison/plate, /area/whiskey_outpost) "br" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/weapon/claymore/mercsword/captain, /turf/open/floor/wood, /area/whiskey_outpost) @@ -476,7 +476,7 @@ /area/whiskey_outpost) "cG" = ( /obj/item/clothing/suit/storage/marine/smartgunner, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/whiskey_outpost) "cH" = ( @@ -639,7 +639,7 @@ /turf/open/floor/prison, /area/whiskey_outpost) "dw" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /obj/item/tool/pen, /obj/item/flashlight/lamp{ @@ -2522,7 +2522,7 @@ /turf/open/floor/prison, /area/whiskey_outpost) "px" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/pill/cyanide{ pixel_x = -3; pixel_y = -4 diff --git a/_maps/map_files/Lawanka_Outpost/LawankaOutpost.dmm b/_maps/map_files/Lawanka_Outpost/LawankaOutpost.dmm index 1cdc4d47f6e..122f0fae2fb 100644 --- a/_maps/map_files/Lawanka_Outpost/LawankaOutpost.dmm +++ b/_maps/map_files/Lawanka_Outpost/LawankaOutpost.dmm @@ -702,7 +702,7 @@ /area/lawankaoutpost/colony/mining) "aDk" = ( /obj/item/weapon/broken_bottle, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/lawankaoutpost/colony/bar) "aDp" = ( @@ -2948,7 +2948,7 @@ /turf/open/ground/grass, /area/lawankaoutpost/outside/central) "cAs" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/book, /obj/machinery/light{ dir = 4 @@ -3797,7 +3797,7 @@ /area/lawankaoutpost/colony/operations_hall) "djW" = ( /obj/effect/spawner/random/food_or_drink/burger/normal, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/lawankaoutpost/colony/bar) "djX" = ( @@ -4367,7 +4367,7 @@ /turf/open/floor/plating/ground/dirt, /area/lawankaoutpost/outside/central) "dND" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/paper, /turf/open/floor, /area/lawankaoutpost/colony/chapel) @@ -4845,7 +4845,7 @@ }, /area/lawankaoutpost/colony/operations_administration) "eiq" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/bottle/holywater, /turf/open/floor/tile/green/whitegreenfull, /area/lawankaoutpost/colony/chapel) @@ -5352,7 +5352,7 @@ pixel_x = -2; pixel_y = 4 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/lawankaoutpost/colony/bar) "eFc" = ( @@ -5651,7 +5651,7 @@ pixel_x = -2; pixel_y = 4 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/cable, /turf/open/floor/wood, /area/lawankaoutpost/colony/bar) @@ -6155,11 +6155,11 @@ /turf/open/ground/grass, /area/lawankaoutpost/colony/operations_hall) "fmM" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood/variable, /area/lawankaoutpost/caves/nanotrasen_lab) "fmZ" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/table_lighting, /turf/open/floor/tile/green/whitegreenfull, /area/lawankaoutpost/colony/chapel) @@ -7480,7 +7480,7 @@ /turf/open/floor/tile/white, /area/lawankaoutpost/colony/operations_meeting) "glD" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/paper_bin{ pixel_y = 8 }, @@ -8017,7 +8017,7 @@ /area/lawankaoutpost/colony/biologics) "gKg" = ( /obj/item/reagent_containers/food/drinks/bottle/vodka, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/lawankaoutpost/colony/bar) "gKi" = ( @@ -8110,7 +8110,7 @@ /turf/open/floor/tile/dark2, /area/lawankaoutpost/colony/operations_administration) "gOE" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/food_or_drink/packagedbar, /turf/open/floor/cult, /area/lawankaoutpost/caves/southwest) @@ -8289,7 +8289,7 @@ /area/lawankaoutpost/colony/southdorms) "gYr" = ( /obj/effect/spawner/random/food_or_drink/drink_cans, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/lawankaoutpost/colony/bar) "gZB" = ( @@ -8396,7 +8396,7 @@ /area/lawankaoutpost/outside/east) "hfd" = ( /obj/item/reagent_containers/food/drinks/cans/waterbottle, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/lawankaoutpost/colony/bar) "hfe" = ( @@ -8696,7 +8696,7 @@ /turf/open/floor/tile/white, /area/lawankaoutpost/colony/operations_hall) "hvg" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /turf/open/floor/wood, /area/lawankaoutpost/colony/bar) "hvv" = ( @@ -8863,7 +8863,7 @@ /turf/open/floor/tile/blue/taupeblue, /area/lawankaoutpost/colony/southdorms) "hFE" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/tea, /turf/open/floor/tile/green/whitegreenfull, /area/lawankaoutpost/colony/chapel) @@ -10507,7 +10507,7 @@ /turf/open/ground/grass, /area/lawankaoutpost/outside/west) "iZB" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/computer/emails, /turf/open/floor, /area/lawankaoutpost/colony/chapel) @@ -12453,7 +12453,7 @@ /turf/open/ground/grass, /area/lawankaoutpost/colony/hydroponics) "kJu" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/food_or_drink/drink_alcohol_bottle, /turf/open/floor/cult, /area/lawankaoutpost/caves/southwest) @@ -14033,7 +14033,7 @@ /turf/open/floor, /area/lawankaoutpost/colony/recdorms) "lXe" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/bible, /turf/open/floor, /area/lawankaoutpost/colony/chapel) @@ -15888,7 +15888,7 @@ /turf/open/floor/plating/ground/dirt, /area/lawankaoutpost/outside/central) "nzT" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/tool/lighter/zippo, /turf/open/floor/wood, /area/lawankaoutpost/colony/chapel) @@ -16429,7 +16429,7 @@ /turf/open/floor, /area/lawankaoutpost/colony/landingzoneone) "nXx" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/tool/stamp, /turf/open/floor/tile/green/whitegreenfull, /area/lawankaoutpost/colony/chapel) @@ -18223,7 +18223,7 @@ /area/lawankaoutpost/caves/nanotrasen_lab) "ptJ" = ( /obj/item/weapon/gun/shotgun/double, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/lawankaoutpost/colony/cabin) "ptQ" = ( @@ -18631,7 +18631,7 @@ /turf/open/floor/tile/dark2, /area/lawankaoutpost/colony/engineering) "pHr" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp/green, /turf/open/floor/wood/variable, /area/lawankaoutpost/caves/nanotrasen_lab) @@ -18915,7 +18915,7 @@ /turf/open/floor, /area/lawankaoutpost/colony/southdorms) "pWL" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/bible, /turf/open/floor/wood, /area/lawankaoutpost/colony/chapel) @@ -19664,7 +19664,7 @@ }, /area/lawankaoutpost/colony/medbay) "qCY" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/table_lighting, /turf/open/floor/wood, /area/lawankaoutpost/colony/chapel) @@ -19850,7 +19850,7 @@ /turf/open/floor/plating/ground/dirt, /area/lawankaoutpost/outside/southeast) "qPT" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/machinery/microwave, /turf/open/floor/wood, /area/lawankaoutpost/colony/cabin) @@ -20596,7 +20596,7 @@ /area/lawankaoutpost/colony/landingzoneone) "rqO" = ( /obj/item/reagent_containers/food/drinks/bottle/whiskey, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/lawankaoutpost/colony/bar) "rqT" = ( @@ -21744,7 +21744,7 @@ /turf/open/floor/plating/ground/dirtgrassborder/autosmooth, /area/lawankaoutpost/outside/northwest) "sqX" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/lawankaoutpost/colony/cabin) "sro" = ( @@ -23178,7 +23178,7 @@ }, /area/lawankaoutpost/colony/northdorms) "txb" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/lawankaoutpost/colony/chapel) "txl" = ( @@ -23325,7 +23325,7 @@ /area/lawankaoutpost/caves/nanotrasen_lab) "tCI" = ( /obj/item/reagent_containers/food/drinks/shaker, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/lawankaoutpost/colony/bar) "tCN" = ( @@ -25434,7 +25434,7 @@ /turf/open/floor/tile/blue/taupeblue, /area/lawankaoutpost/colony/northdorms) "vvx" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/grown/sunflower, /turf/open/floor/tile/green/whitegreenfull, /area/lawankaoutpost/colony/chapel) @@ -25812,7 +25812,7 @@ /turf/open/floor, /area/lawankaoutpost/colony/hydroponics) "vJN" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor, /area/lawankaoutpost/colony/chapel) "vJZ" = ( @@ -25831,7 +25831,7 @@ /area/lawankaoutpost/colony/hydroponics) "vKx" = ( /obj/effect/spawner/random/food_or_drink/beer, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/lawankaoutpost/colony/bar) "vKY" = ( @@ -28272,7 +28272,7 @@ /turf/open/ground/grass, /area/lawankaoutpost/outside/southeast) "xIU" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/lawankaoutpost/colony/bar) "xIY" = ( @@ -28770,7 +28770,7 @@ /turf/open/floor/tile/dark2, /area/lawankaoutpost/colony/marshalls) "ydI" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/tool/candle, /turf/open/floor/wood, /area/lawankaoutpost/colony/chapel) diff --git a/_maps/map_files/Magmoor_Digsite_IV/Magmoor_Digsite_IV.dmm b/_maps/map_files/Magmoor_Digsite_IV/Magmoor_Digsite_IV.dmm index cbd173193b7..58f58a9f53b 100644 --- a/_maps/map_files/Magmoor_Digsite_IV/Magmoor_Digsite_IV.dmm +++ b/_maps/map_files/Magmoor_Digsite_IV/Magmoor_Digsite_IV.dmm @@ -1032,7 +1032,7 @@ /turf/open/floor/plating/ground/mars/random/sand, /area/magmoor/compound/east) "aLW" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/weaponry/ammo/shotgun, /turf/open/floor/wood, /area/magmoor/civilian/bar) @@ -1389,7 +1389,7 @@ }, /area/magmoor/security/storage) "aYj" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/toy/dice, /turf/open/floor/wood, /area/magmoor/civilian/gambling) @@ -1792,7 +1792,7 @@ }, /area/magmoor/cargo/storage/secure/south) "bjA" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/light/small{ dir = 8 }, @@ -2412,7 +2412,7 @@ }, /area/magmoor/compound/west) "bGT" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/reagent_containers/food/drinks/drinkingglass/soda, /turf/open/floor/wood, /area/magmoor/civilian/gambling) @@ -3492,7 +3492,7 @@ /turf/open/floor/freezer, /area/magmoor/civilian/clean/shower) "ctN" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/landmark/corpsespawner/colonist, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/wood, @@ -4754,7 +4754,7 @@ /turf/open/floor/plating/plating_catwalk, /area/magmoor/engi/thermal) "dsd" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/carpet, /area/magmoor/command/conference) "dse" = ( @@ -5474,7 +5474,7 @@ /turf/open/floor/mainship/mono, /area/magmoor/civilian/arrival/east) "dQD" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/landmark/weed_node, /turf/open/floor/carpet, /area/magmoor/command/conference) @@ -5528,7 +5528,7 @@ /turf/open/floor/mainship/orange/corner, /area/magmoor/cargo/storage/south) "dSy" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/chem_dispenser/beer{ dir = 1 }, @@ -5823,7 +5823,7 @@ /turf/open/floor/mainship/mono, /area/magmoor/command/commandroom) "eeU" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/light/small{ dir = 8 }, @@ -5997,7 +5997,7 @@ /turf/open/floor/mainship/blue, /area/magmoor/command/lobby/east) "enm" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/mainship/green{ dir = 5 }, @@ -6412,7 +6412,7 @@ }, /area/magmoor/research/rnd/lobby) "eBc" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -6609,7 +6609,7 @@ /turf/open/floor/mainship/blue, /area/magmoor/command/lobby) "eHj" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/light/small{ dir = 8 }, @@ -8546,7 +8546,7 @@ }, /area/magmoor/hydroponics/north) "gaX" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/atmospherics/components/unary/vent_pump/layer1, /turf/open/floor/tile/chapel{ dir = 1 @@ -8559,7 +8559,7 @@ }, /area/magmoor/civilian/arrival) "gbk" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/mainship/mono, /area/magmoor/civilian/basket) "gbI" = ( @@ -8640,7 +8640,7 @@ /turf/open/floor/plating/mainship, /area/magmoor/engi) "geP" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/weapon/gun/rifle/m16, /obj/effect/ai_node, /turf/open/floor/carpet, @@ -9783,7 +9783,7 @@ /turf/open/floor/mainship/mono, /area/magmoor/cargo/processing/south) "gZR" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/bag/plants, /turf/open/floor/mainship/green{ dir = 6 @@ -9811,7 +9811,7 @@ }, /area/magmoor/medical/storage) "hbT" = ( -/obj/structure/table/woodentable{ +/obj/structure/table/wood{ flipped = 1 }, /obj/item/shard, @@ -9919,7 +9919,7 @@ /turf/open/floor/mainship/wylogo/wy3, /area/magmoor/civilian/arrival) "hgJ" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/carpet, /area/magmoor/command/conference) @@ -10427,7 +10427,7 @@ }, /area/magmoor/security/arrivals/south) "hBR" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/weapon/gun/rifle/m16, /turf/open/floor/carpet, /area/magmoor/command/conference) @@ -11050,7 +11050,7 @@ /turf/open/floor/plating/ground/concrete, /area/magmoor/compound/north) "ibC" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/magmoor/civilian/gambling) "ibO" = ( @@ -11294,7 +11294,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /turf/open/floor/wood, /area/magmoor/civilian/bar) "ikG" = ( @@ -12606,7 +12606,7 @@ }, /area/magmoor/compound) "jjQ" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/magmoor/civilian/bar) "jjU" = ( @@ -12673,7 +12673,7 @@ }, /area/magmoor/civilian/arrival) "jlZ" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/ammo_magazine/rifle/m16, /turf/open/floor/carpet, /area/magmoor/command/conference) @@ -12967,7 +12967,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/pink, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/tile/white, /area/magmoor/civilian/pool) "jwj" = ( @@ -13967,7 +13967,7 @@ /turf/open/floor/mainship/sterile/dark, /area/magmoor/medical/treatment) "kfI" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /turf/open/floor/wood, /area/magmoor/civilian/gambling) "kfY" = ( @@ -15794,7 +15794,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /turf/open/floor/wood, /area/magmoor/civilian/bar) "lxz" = ( @@ -15912,7 +15912,7 @@ /turf/open/floor/cult, /area/magmoor/cave/north) "lBH" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/bottle/tequila, /turf/open/floor/wood, /area/magmoor/civilian/bar) @@ -16070,7 +16070,7 @@ /turf/open/floor/marking/delivery, /area/magmoor/command/lobby/east) "lJk" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/tile/dark2, /area/magmoor/civilian/mosque) "lJl" = ( @@ -16404,7 +16404,7 @@ /turf/open/floor/plating/ground/mars/random/cave, /area/magmoor/cave/north) "lUN" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/paper_bin{ pixel_x = 2; pixel_y = 7 @@ -17123,7 +17123,7 @@ /turf/open/floor/prison/kitchen, /area/magmoor/civilian/cook) "mAK" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/bag/plants, /obj/machinery/light, /turf/open/floor/mainship/floor, @@ -17391,7 +17391,7 @@ }, /area/magmoor/security/arrivals/east) "mLY" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/tool/kitchen/utensil/fork, /obj/item/reagent_containers/food/snacks/soup/bloodsoup, /turf/open/floor/wood, @@ -17835,7 +17835,7 @@ /turf/open/liquid/lava/autosmoothing, /area/magmoor/compound/south) "naO" = ( -/obj/structure/table/woodentable{ +/obj/structure/table/wood{ flipped = 1 }, /obj/item/reagent_containers/food/drinks/drinkingglass/soda, @@ -18309,7 +18309,7 @@ /turf/open/floor/mainship, /area/magmoor/landing) "ntR" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/toy/dice, /obj/item/toy/deck, /turf/open/floor/wood, @@ -18470,7 +18470,7 @@ /turf/open/floor/plating/ground/mars/random/dirt, /area/magmoor/compound/east) "nDm" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/turf_decal/siding{ dir = 5 }, @@ -18535,7 +18535,7 @@ /area/magmoor/mining/storage) "nEo" = ( /obj/machinery/light, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/magmoor/civilian/bar) "nEv" = ( @@ -21241,7 +21241,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/structure/cable, -/obj/structure/table/woodentable{ +/obj/structure/table/wood{ flipped = 1 }, /obj/effect/spawner/random/misc/plushie, @@ -21550,7 +21550,7 @@ }, /area/magmoor/security/infocenter) "pLX" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/toy/deck, /obj/item/toy/dice, /turf/open/floor/wood, @@ -22258,7 +22258,7 @@ /turf/open/floor/mainship/floor, /area/magmoor/cargo/storage/secure/south) "qlq" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/mainship/green{ dir = 8 }, @@ -22765,7 +22765,7 @@ }, /area/magmoor/compound/north) "qDc" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/fancy/cigar, /obj/effect/ai_node, /turf/open/floor/carpet, @@ -22778,7 +22778,7 @@ /turf/open/floor/mainship/black, /area/magmoor/landing/two) "qDY" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/mainship/floor, /area/magmoor/hydroponics/south) "qFf" = ( @@ -24170,7 +24170,7 @@ }, /area/magmoor/civilian/dorms) "rLK" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/tool/stamp, /obj/item/tool/pen/blue{ pixel_x = 5 @@ -24491,7 +24491,7 @@ }, /area/magmoor/landing) "rXY" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/fancy/candle_box, /obj/machinery/light{ dir = 1 @@ -24528,7 +24528,7 @@ /turf/open/floor/plating, /area/magmoor/civilian/gambling) "saX" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/reagent_containers/food/drinks/bottle/tequila, /turf/open/floor/wood, /area/magmoor/civilian/gambling) @@ -25476,7 +25476,7 @@ /turf/open/floor/mainship/mono, /area/magmoor/cargo/processing/south) "sKb" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/bag/plants, /turf/open/floor/mainship/green{ dir = 9 @@ -25530,7 +25530,7 @@ /turf/open/floor/freezer, /area/magmoor/civilian/clean/toilet) "sMS" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/fancy/candle_box, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 5 @@ -26046,7 +26046,7 @@ /turf/open/floor/mainship/orange, /area/magmoor/engi) "thf" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/bottle/bluecuracao, /turf/open/floor/wood, /area/magmoor/civilian/bar) @@ -26630,7 +26630,7 @@ /turf/open/floor/mainship/sterile/purple, /area/magmoor/research) "tCQ" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/light/small{ dir = 8 }, @@ -27430,7 +27430,7 @@ /turf/open/floor/mainship/sterile/dark, /area/magmoor/medical/treatment) "ufM" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/weapon/gun/revolver/cmb, /obj/effect/ai_node, /turf/open/floor/carpet, @@ -28262,7 +28262,7 @@ /turf/open/floor/mainship/mono, /area/magmoor/civilian/basket) "uHj" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/bible/booze{ deity_name = "Allah"; name = "koran" @@ -28369,7 +28369,7 @@ /turf/open/floor/wood, /area/magmoor/medical/breakroom) "uLx" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/turf_decal/tile/blue{ dir = 1 }, @@ -29216,7 +29216,7 @@ /turf/open/floor/plating/plating_catwalk, /area/magmoor/engi/power) "vvX" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/air_alarm{ dir = 1 }, @@ -29741,7 +29741,7 @@ /obj/machinery/chem_dispenser/soda{ dir = 1 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/magmoor/civilian/bar) "vRc" = ( @@ -30669,7 +30669,7 @@ }, /area/magmoor/compound) "wAn" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/ammo_casing/bullet, /turf/open/floor/carpet, /area/magmoor/command/conference) @@ -31860,7 +31860,7 @@ }, /area/magmoor/compound/north) "xng" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/shard, /turf/open/floor/wood, /area/magmoor/civilian/bar) @@ -33127,7 +33127,7 @@ /turf/open/floor/plating/plating_catwalk, /area/magmoor/engi/thermal) "ycC" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/turf_decal/siding{ dir = 6 }, @@ -33246,7 +33246,7 @@ /turf/open/floor/mainship, /area/magmoor/engi/thermal) "yhs" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/trash/plate{ pixel_x = 9; pixel_y = 7 diff --git a/_maps/map_files/Prison_Station_FOP/Prison_Station_FOP.dmm b/_maps/map_files/Prison_Station_FOP/Prison_Station_FOP.dmm index 711333983e2..c6e9ef6a7a6 100644 --- a/_maps/map_files/Prison_Station_FOP/Prison_Station_FOP.dmm +++ b/_maps/map_files/Prison_Station_FOP/Prison_Station_FOP.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aaa" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/computer/med_data/laptop, /turf/open/floor/carpet, /area/prison/command/office) @@ -6745,7 +6745,7 @@ /turf/open/floor/prison/bright_clean, /area/prison/chapel) "avK" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/prison/residential/north) "avL" = ( @@ -6898,7 +6898,7 @@ /turf/open/floor/plating, /area/prison/hangar_storage/research) "awi" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /turf/open/floor/wood, /area/prison/residential/north) @@ -9682,7 +9682,7 @@ /turf/open/floor/prison/sterilewhite, /area/prison/residential/north) "aEI" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, @@ -9767,12 +9767,12 @@ /turf/open/floor/prison/plate, /area/prison/recreation/highsec/n) "aEY" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/effect/decal/cleanable/blood, /turf/open/floor/prison, /area/prison/recreation/highsec/n) "aEZ" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /turf/open/floor/prison, /area/prison/recreation/highsec/n) "aFa" = ( @@ -10109,7 +10109,7 @@ /turf/open/floor/prison/plate, /area/prison/recreation/highsec/n) "aGk" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -10190,7 +10190,7 @@ /turf/open/floor/prison/plate, /area/prison/recreation/highsec/n) "aGs" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /turf/open/floor/wood, /area/prison/chapel) @@ -10651,7 +10651,7 @@ /turf/open/floor/prison/plate, /area/prison/recreation/highsec/n) "aHC" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/paper, /obj/machinery/light/small{ dir = 8 @@ -12476,11 +12476,11 @@ /turf/open/floor/carpet, /area/prison/quarters/research) "aMQ" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/carpet, /area/prison/quarters/research) "aMR" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /turf/open/floor/carpet, /area/prison/quarters/research) @@ -13709,7 +13709,7 @@ /area/prison/command/office) "aQy" = ( /obj/machinery/computer/secure_data, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/prison/command/office) "aQA" = ( @@ -14020,7 +14020,7 @@ /turf/open/floor/carpet, /area/prison/command/secretary_office) "aRH" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/faxmachine, /turf/open/floor/carpet, /area/prison/command/secretary_office) @@ -14105,7 +14105,7 @@ /obj/machinery/computer/security{ network = list("PRISON") }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/prison/command/office) "aRS" = ( @@ -14150,7 +14150,7 @@ /turf/open/floor/plating, /area/prison/cellblock/lowsec/nw) "aSd" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /turf/open/floor/prison/plate, /area/prison/cellblock/lowsec/nw) "aSf" = ( @@ -14272,19 +14272,19 @@ /turf/open/floor/plating, /area/prison/maintenance/residential/ne) "aSD" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/tool/pen{ pixel_y = 4 }, /turf/open/floor/carpet, /area/prison/command/secretary_office) "aSE" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/computer/med_data/laptop, /turf/open/floor/carpet, /area/prison/command/secretary_office) "aSF" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/carpet, /area/prison/command/secretary_office) "aSG" = ( @@ -14319,7 +14319,7 @@ /turf/open/floor/carpet, /area/prison/command/office) "aSM" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/faxmachine/warden, /turf/open/floor/wood, /area/prison/command/office) @@ -14768,7 +14768,7 @@ /area/prison/cellblock/lowsec/nw) "aUo" = ( /obj/machinery/chem_dispenser/beer, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/shaker, /turf/open/floor/wood, /area/prison/residential/central) @@ -14925,7 +14925,7 @@ /area/prison/hallway/central) "aUE" = ( /obj/machinery/microwave, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/prison/residential/central) "aUF" = ( @@ -15542,7 +15542,7 @@ }, /area/prison/command/secretary_office) "aWo" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/prison/residential/central) "aWp" = ( @@ -15737,7 +15737,7 @@ /turf/open/floor/prison/sterilewhite, /area/prison/residential/central) "aWT" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/reagentgrinder, /turf/open/floor/wood, /area/prison/residential/central) @@ -15875,7 +15875,7 @@ /turf/open/floor/wood, /area/prison/recreation/staff) "aXm" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /turf/open/floor/wood, /area/prison/recreation/staff) "aXn" = ( @@ -15917,7 +15917,7 @@ /turf/closed/wall/r_wall/prison_unmeltable, /area/prison/hangar/main) "aXv" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /turf/open/floor/wood, /area/prison/residential/central) @@ -16882,11 +16882,11 @@ /turf/open/floor/carpet, /area/prison/command/quarters) "baA" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/carpet, /area/prison/command/quarters) "baB" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /turf/open/floor/carpet, /area/prison/command/quarters) @@ -17297,7 +17297,7 @@ /turf/open/floor/wood, /area/prison/security/monitoring/highsec) "bbS" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /turf/open/floor/wood, /area/prison/security/monitoring/highsec) "bbT" = ( @@ -20742,7 +20742,7 @@ /area/prison/cellblock/vip) "bmm" = ( /obj/machinery/chem_dispenser/soda, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/book/manual/barman_recipes, /turf/open/floor/wood, /area/prison/residential/central) @@ -21471,7 +21471,7 @@ /turf/open/floor/prison/bright_clean, /area/prison/hallway/central) "bow" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/glass/rag, /obj/item/reagent_containers/spray/cleaner, /turf/open/floor/wood, @@ -21576,7 +21576,7 @@ /turf/open/floor/prison/bright_clean, /area/prison/yard) "boI" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/drinkingglass, /turf/open/floor/wood, /area/prison/residential/central) @@ -22385,12 +22385,12 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/prison/hallway/entrance) "brr" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/ashtray/plastic, /turf/open/floor/wood, /area/prison/residential/central) "brs" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/cracker, /turf/open/floor/wood, /area/prison/residential/central) @@ -26931,7 +26931,7 @@ /turf/open/floor/plating, /area/prison/residential/south) "bGR" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/prison/residential/south) "bGS" = ( @@ -27280,7 +27280,7 @@ /turf/open/floor/plating, /area/prison/maintenance/hangar_barracks) "bIf" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /turf/open/floor/wood, /area/prison/residential/south) @@ -29437,7 +29437,7 @@ /turf/open/floor/prison/sterilewhite, /area/prison/residential/south) "bOY" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -29457,7 +29457,7 @@ /turf/open/floor/plating, /area/prison/engineering) "bPa" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -30828,7 +30828,7 @@ /turf/open/floor/prison/plate, /area/prison/recreation/highsec/s) "bTZ" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /turf/open/floor/prison/plate, /area/prison/recreation/highsec/s) "bUa" = ( @@ -31931,7 +31931,7 @@ /area/prison/security/head) "bYa" = ( /obj/machinery/computer/secure_data, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/prison, /area/prison/security/head) "bYb" = ( @@ -31941,12 +31941,12 @@ /turf/open/floor/prison, /area/prison/security/head) "bYd" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/recharger, /turf/open/floor/prison, /area/prison/security/head) "bYe" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/faxmachine, /turf/open/floor/prison, /area/prison/security/head) @@ -32326,7 +32326,7 @@ /obj/machinery/computer/security{ network = list("PRISON") }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/prison, /area/prison/security/head) "bZu" = ( @@ -32727,12 +32727,12 @@ /turf/open/floor/prison/darkred/full, /area/prison/security) "caN" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/computer/med_data/laptop, /turf/open/floor/prison, /area/prison/security/head) "caO" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/tool/stamp/hos, /turf/open/floor/prison, /area/prison/security/head) @@ -32747,14 +32747,14 @@ /turf/open/floor/prison, /area/prison/security/head) "caS" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/tool/pen{ pixel_y = 4 }, /turf/open/floor/carpet, /area/prison/security/head) "caT" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /turf/open/floor/carpet, /area/prison/security/head) @@ -33837,7 +33837,7 @@ }, /area/prison/cellblock/highsec/south/south) "cdR" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /turf/open/floor/prison/plate, /area/prison/recreation/medsec) "cdS" = ( @@ -34271,7 +34271,7 @@ /turf/open/floor/plating, /area/prison/cellblock/highsec/south/south) "cff" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /turf/open/floor/prison, /area/prison/recreation/medsec) "cfg" = ( @@ -34466,12 +34466,12 @@ /turf/open/floor/prison/darkred, /area/prison/security) "cfO" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/megaphone, /turf/open/floor/prison, /area/prison/security/head) "cfP" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/taperecorder, /turf/open/floor/prison, /area/prison/security/head) @@ -35617,7 +35617,7 @@ }, /area/prison/cellblock/protective) "cjI" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/weapon/gun/pistol/g22, /turf/open/floor/wood, /area/prison/security/head) @@ -35734,7 +35734,7 @@ /turf/open/floor/wood, /area/prison/security/head) "ckh" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 9 @@ -38751,7 +38751,7 @@ /turf/open/floor/carpet, /area/prison/pirate) "cuj" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /turf/open/floor/carpet, /area/prison/pirate) @@ -40572,7 +40572,7 @@ }, /area/prison/cellblock/mediumsec/south) "dqb" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin{ pixel_x = -6; pixel_y = 4 @@ -41731,7 +41731,7 @@ }, /area/prison/quarters/research) "fLi" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/light/small, /turf/open/floor/wood, /area/prison/residential/south) @@ -42635,7 +42635,7 @@ /turf/open/floor/prison, /area/prison/security/checkpoint/maxsec) "hKz" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin{ pixel_x = -3; pixel_y = 7 @@ -47893,7 +47893,7 @@ /turf/open/floor/plating, /area/prison/cellblock/maxsec/north) "sfP" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/tool/pen{ pixel_x = 5; pixel_y = 8 @@ -48452,7 +48452,7 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/prison/hallway/entrance) "tek" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/effect/ai_node, /turf/open/floor/prison/plate, /area/prison/recreation/medsec) @@ -48686,7 +48686,7 @@ /area/prison/cellblock/lowsec/sw) "tGm" = ( /obj/machinery/light/small, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/clothing/head/beret/sec/warden, /turf/open/floor/carpet, /area/prison/command/quarters) @@ -49576,7 +49576,7 @@ /turf/open/floor/wood, /area/prison/command/office) "vBV" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood/broken, /area/prison/residential/south) "vDL" = ( @@ -49958,7 +49958,7 @@ /turf/open/floor/prison/plate, /area/prison/cellblock/mediumsec/north) "wnT" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/weaponry/gun, /turf/open/floor/carpet, /area/prison/command/quarters) @@ -50072,7 +50072,7 @@ }, /area/prison/security) "wwP" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/landmark/excavation_site_spawner, /turf/open/floor/wood, /area/prison/residential/north) @@ -50506,7 +50506,7 @@ /turf/open/floor/prison/plate, /area/prison/cellblock/mediumsec/west) "xvq" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin{ pixel_x = -3; pixel_y = 7 @@ -50821,7 +50821,7 @@ /turf/open/floor/plating, /area/prison/maintenance/staff_research) "yez" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin{ pixel_x = -3; pixel_y = 7 diff --git a/_maps/map_files/Talos/TGS_Talos.dmm b/_maps/map_files/Talos/TGS_Talos.dmm index 1b8136de030..cc11cf5be72 100644 --- a/_maps/map_files/Talos/TGS_Talos.dmm +++ b/_maps/map_files/Talos/TGS_Talos.dmm @@ -738,7 +738,7 @@ /obj/machinery/camera/autoname{ dir = 8 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/table_lighting, /turf/open/floor/mainship/metal, /area/mainship/living/mechbunks) @@ -1088,7 +1088,7 @@ /turf/closed/wall/mainship/outer/talos, /area/mainship/hallways/hangar) "azB" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/radio/intercom/general, /obj/structure/sign/semiotic/intercom{ pixel_x = 15; @@ -1965,7 +1965,7 @@ /turf/open/floor/mainship/red, /area/mainship/shipboard/brig) "beb" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/structure/paper_bin{ pixel_y = 5 }, @@ -2329,7 +2329,7 @@ }, /area/mainship/squads/alpha) "bqg" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/storage/fancy/cigar, /turf/open/floor/wood, /area/mainship/living/commandbunks) @@ -3058,7 +3058,7 @@ /turf/open/floor/plating/plating_catwalk/dark, /area/mainship/medical/surgery_hallway) "bKM" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/microwave, /turf/open/floor/carpet, /area/mainship/living/tankerbunks) @@ -3309,7 +3309,7 @@ /turf/open/floor/carpet, /area/mainship/living/pilotbunks) "bQQ" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/turf_decal/siding/dark{ dir = 8 }, @@ -3337,7 +3337,7 @@ /turf/open/floor/mainship/metal, /area/mainship/squads/bravo) "bRj" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/food_or_drink/packagedbar, /turf/open/floor/wood, /area/mainship/living/grunt_rnr) @@ -3701,7 +3701,7 @@ /obj/effect/turf_decal/woodsiding{ dir = 9 }, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /turf/open/floor/carpet, /area/mainship/living/commandbunks) "cbP" = ( @@ -3998,7 +3998,7 @@ /turf/open/floor/plating, /area/mainship/hull/upper_hull) "ciS" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/food_or_drink/drink_cans, /turf/open/floor/wood, /area/mainship/living/grunt_rnr) @@ -4256,12 +4256,12 @@ /turf/closed/wall/mainship/talos, /area/mainship/hull/upper_hull) "crC" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/storage/fancy/cigar, /turf/open/floor/carpet, /area/mainship/living/commandbunks) "csc" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/structure/paper_bin{ pixel_x = -3; pixel_y = 7 @@ -4415,7 +4415,7 @@ /turf/open/floor/wood, /area/mainship/squads/alpha) "cxs" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/flashlight/lamp, /turf/open/floor/wood, /area/mainship/squads/bravo) @@ -4964,7 +4964,7 @@ /turf/open/floor/mainship/tcomms, /area/mainship/command/self_destruct) "cOL" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/food_or_drink/wine, /turf/open/floor/carpet, /area/mainship/living/tankerbunks) @@ -6377,7 +6377,7 @@ /turf/open/floor/plating/plating_catwalk/dark, /area/mainship/squads/bravo) "dEQ" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/food_or_drink/kitchen, /turf/open/floor/grass, /area/mainship/living/starboard_garden) @@ -6491,7 +6491,7 @@ /turf/open/floor/plating/plating_catwalk/dark, /area/mainship/hallways/bow_hallway) "dIf" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/toy/bikehorn/rubberducky, /obj/machinery/camera/autoname{ dir = 4 @@ -6548,7 +6548,7 @@ /turf/open/floor/mainship/blue/full, /area/mainship/hallways/hangar) "dJV" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/turf_decal/woodsiding{ dir = 9 }, @@ -6591,7 +6591,7 @@ /obj/machinery/door_control/mainship/mech{ dir = 8 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/computer/emails{ dir = 8 }, @@ -6972,7 +6972,7 @@ /turf/open/floor/prison/cleanmarked, /area/mainship/hallways/hangar/droppod) "dXL" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/misc/cigar, /turf/open/floor/carpet, /area/mainship/living/commandbunks) @@ -7172,7 +7172,7 @@ "egq" = ( /obj/item/clipboard, /obj/item/tool/pen, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/paper_bin, /turf/open/floor/carpet, /area/mainship/squads/req) @@ -8253,7 +8253,7 @@ /turf/open/floor/plating, /area/mainship/hull/upper_hull) "eLp" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/turf_decal/woodsiding{ dir = 4 }, @@ -8334,7 +8334,7 @@ /obj/effect/turf_decal/woodsiding{ dir = 8 }, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/ashtray/bronze, /obj/item/tool/lighter/zippo, /obj/item/storage/fancy/cigarettes/dromedaryco, @@ -9061,7 +9061,7 @@ /turf/open/floor/mainship/red/full, /area/mainship/command/cic) "ffs" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/toy/dice/d20{ pixel_x = 10; pixel_y = -3 @@ -10183,7 +10183,7 @@ /turf/open/floor/mainship/metal, /area/mainship/squads/delta) "fQq" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/storage/box/drinkingglasses, /turf/open/floor/mainship/metal, /area/mainship/squads/bravo) @@ -10429,7 +10429,7 @@ }, /area/mainship/squads/req) "fYG" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/pizzabox/meat, /obj/effect/turf_decal/woodsiding, /turf/open/floor/carpet, @@ -10457,7 +10457,7 @@ /turf/open/floor/mainship/metal, /area/mainship/command/cic) "fYX" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/storage/donut_box, /turf/open/floor/wood, /area/mainship/living/commandbunks) @@ -10534,7 +10534,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/toy/deck{ pixel_x = 4; pixel_y = 5 @@ -10550,7 +10550,7 @@ /turf/open/floor/mainship/metal, /area/mainship/hallways/hangar) "gfQ" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /turf/open/floor/carpet, /area/mainship/hallways/aft_hallway) "ghb" = ( @@ -11238,7 +11238,7 @@ dir = 8; pixel_y = -18 }, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/clipboard, /obj/item/tool/pen, /turf/open/floor/wood, @@ -11289,7 +11289,7 @@ /turf/open/floor/mainship/metal, /area/mainship/living/mechbunks) "gGw" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ dir = 8 }, @@ -11602,7 +11602,7 @@ /turf/open/floor/mainship/metal, /area/mainship/command/cic) "gQT" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/chem_dispenser/soda{ dir = 1 }, @@ -12935,7 +12935,7 @@ }, /area/mainship/shipboard/weapon_room) "hPl" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/reagent_containers/food/drinks/coffee/cafe_latte, /obj/item/flashlight/lamp, /obj/effect/turf_decal/woodsiding{ @@ -13672,7 +13672,7 @@ /turf/open/floor/wood, /area/mainship/living/grunt_rnr) "iok" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/light/mainship{ dir = 4 }, @@ -13804,7 +13804,7 @@ "irn" = ( /obj/item/binoculars, /obj/item/megaphone, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /turf/open/floor/wood, /area/mainship/living/commandbunks) "iro" = ( @@ -14098,7 +14098,7 @@ /turf/open/floor/mainship/metal/full, /area/mainship/command/cic) "iDJ" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/chem_dispenser/soda, /turf/open/floor/mainship/metal, /area/mainship/squads/delta) @@ -14246,7 +14246,7 @@ /obj/effect/turf_decal/woodsiding{ dir = 1 }, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/clothing/hats, /turf/open/floor/carpet, /area/mainship/squads/delta) @@ -15697,7 +15697,7 @@ dir = 10 }, /obj/machinery/reagentgrinder, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /turf/open/floor/wood, /area/mainship/hallways/aft_hallway) "jzu" = ( @@ -15793,7 +15793,7 @@ /turf/open/floor/mainship/metal, /area/mainship/hallways/port_hallway) "jDk" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/structure/paper_bin, /obj/item/tool/pen/blue, /turf/open/floor/wood, @@ -16030,7 +16030,7 @@ /turf/open/floor/prison/sterilewhite, /area/mainship/medical/medical_science) "jLS" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/storage/bible, /obj/item/reagent_containers/food/drinks/flask/barflask, /obj/item/toy/plush/rouny, @@ -16330,7 +16330,7 @@ pixel_x = 8; pixel_y = 24 }, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/storage/box/drinkingglasses, /turf/open/floor/mainship/metal, /area/mainship/squads/delta) @@ -16939,7 +16939,7 @@ /turf/open/floor/mainship/metal/lino, /area/mainship/hallways/bow_hallway) "kmQ" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/flashlight/lamp, /obj/machinery/camera/autoname{ dir = 1 @@ -17466,7 +17466,7 @@ /turf/open/floor/mainship/metal/full, /area/mainship/hallways/hangar) "kDo" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/ashtray/bronze, /turf/open/floor/carpet, /area/mainship/hallways/aft_hallway) @@ -17693,7 +17693,7 @@ /turf/open/floor/mainship/metal/lino, /area/mainship/living/cafeteria) "kKF" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/megaphone, /obj/item/clipboard{ pixel_x = 5 @@ -17986,7 +17986,7 @@ /obj/machinery/light/mainship{ dir = 8 }, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /turf/open/floor/mainship/metal/full, /area/mainship/living/tankerbunks) "kQR" = ( @@ -18232,7 +18232,7 @@ /turf/open/floor/plating, /area/mainship/living/numbertwobunks) "kYG" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/turf_decal/woodsiding{ dir = 8 }, @@ -19424,7 +19424,7 @@ /turf/open/floor/mainship/metal, /area/mainship/living/mechbunks) "lDs" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /turf/open/floor/grass, /area/mainship/living/starboard_garden) "lDx" = ( @@ -19944,7 +19944,7 @@ /turf/open/floor/grass, /area/mainship/living/starboard_garden) "lQZ" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ dir = 9 }, @@ -20038,7 +20038,7 @@ /turf/open/floor/mainship/metal, /area/mainship/hallways/bow_hallway) "lTG" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/clipboard{ pixel_x = 5 }, @@ -20435,7 +20435,7 @@ }, /obj/effect/ai_node, /obj/structure/cable, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/storage/fancy/cigarettes/lady_finger{ pixel_y = 5 }, @@ -20531,7 +20531,7 @@ /turf/open/floor/mainship/metal/full, /area/mainship/hallways/hangar) "mmm" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/ashtray/bronze, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 5 @@ -20794,7 +20794,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/toy/deck/kotahi, /turf/open/floor/wood, /area/mainship/hallways/aft_hallway) @@ -21024,7 +21024,7 @@ /area/mainship/medical/surgery_hallway) "myC" = ( /obj/effect/turf_decal/woodsiding, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder, /obj/item/eftpos{ eftpos_name = "Cargo Bay EFTPOS scanner"; @@ -21630,7 +21630,7 @@ /turf/open/floor/plating/plating_catwalk/dark, /area/mainship/engineering/engine_core) "mOn" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/turf_decal/woodsiding{ dir = 5 }, @@ -21899,7 +21899,7 @@ /turf/open/floor/mainship/metal/full, /area/mainship/medical/medical_science) "mVA" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/storage/fancy/cigar, /turf/open/floor/wood, /area/mainship/squads/alpha) @@ -22001,7 +22001,7 @@ /turf/open/floor/plating, /area/mainship/hull/starboard_hull) "mXJ" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/computer/squad_changer{ density = 0 }, @@ -22154,7 +22154,7 @@ dir = 1 }, /obj/machinery/camera/autoname, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /turf/open/floor/carpet, /area/mainship/squads/delta) "ndY" = ( @@ -22966,7 +22966,7 @@ }, /area/mainship/squads/delta) "nBI" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/ashtray/bronze, /turf/open/floor/carpet, /area/mainship/living/commandbunks) @@ -24097,7 +24097,7 @@ /obj/effect/turf_decal/siding/dark{ dir = 6 }, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /turf/open/floor/wood, /area/mainship/hallways/aft_hallway) "oiP" = ( @@ -24796,7 +24796,7 @@ dir = 1 }, /obj/effect/turf_decal/siding/dark, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /turf/open/floor/wood, /area/mainship/hallways/aft_hallway) "oET" = ( @@ -25283,7 +25283,7 @@ /turf/open/floor/mainship/red/full, /area/mainship/shipboard/brig) "oTw" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/light/mainship{ dir = 4 }, @@ -25292,7 +25292,7 @@ "oTB" = ( /obj/structure/cable, /obj/effect/ai_node, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/plating, /area/mainship/hull/upper_hull) "oTN" = ( @@ -25596,7 +25596,7 @@ /turf/open/floor/prison/marked, /area/mainship/squads/req) "peq" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/turf_decal/woodsiding{ dir = 4 }, @@ -26012,7 +26012,7 @@ /turf/open/floor/prison, /area/mainship/shipboard/weapon_room) "ppr" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/structure/paper_bin, /obj/item/tool/pen/blue, /obj/item/tool/stamp/internalaffairs, @@ -26904,7 +26904,7 @@ /obj/effect/turf_decal/woodsiding{ dir = 1 }, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/computer/emails, /obj/machinery/firealarm, /turf/open/floor/carpet, @@ -26978,7 +26978,7 @@ /obj/effect/turf_decal/woodsiding, /obj/item/storage/fancy/cigar, /obj/item/tool/lighter/zippo, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/carpet, /area/mainship/squads/req) "pPB" = ( @@ -27007,7 +27007,7 @@ /obj/effect/turf_decal/siding/dark{ dir = 5 }, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/storage/fancy/cigar, /turf/open/floor/wood, /area/mainship/hallways/aft_hallway) @@ -27518,7 +27518,7 @@ dir = 8 }, /obj/machinery/faxmachine/brig, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/structure/sign/semiotic/bathunisex{ pixel_x = -17 }, @@ -27948,7 +27948,7 @@ /turf/open/floor/wood, /area/mainship/living/grunt_rnr) "qqK" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /turf/open/floor/wood, /area/mainship/living/grunt_rnr) "qqM" = ( @@ -28647,7 +28647,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/alt{ dir = 8 }, -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/flashlight/lamp/green{ pixel_x = 7 }, @@ -28965,7 +28965,7 @@ /turf/open/floor/prison/bright_clean, /area/mainship/hallways/hangar/droppod) "qYc" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/clipboard{ pixel_x = 5 }, @@ -29001,7 +29001,7 @@ /turf/open/floor/plating, /area/mainship/hull/starboard_hull) "qYx" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/structure/paper_bin{ pixel_x = -3; pixel_y = 7 @@ -29179,7 +29179,7 @@ /turf/open/floor/mainship/emerald, /area/mainship/squads/charlie) "rfj" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/structure/sign/prop1, /obj/machinery/faxmachine/cic, /turf/open/floor/wood, @@ -29808,7 +29808,7 @@ /turf/open/floor/plating, /area/mainship/hull/upper_hull) "rAm" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/turf_decal/woodsiding, /turf/open/floor/carpet, /area/mainship/hull/upper_hull) @@ -30982,7 +30982,7 @@ /turf/open/floor/plating, /area/mainship/hull/upper_hull) "sjQ" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/clothing/hats, /turf/open/floor/grass, /area/mainship/living/starboard_garden) @@ -31805,7 +31805,7 @@ name = "Quartermaster's stamp"; pixel_x = 3 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/carpet, /area/mainship/squads/req) "sIq" = ( @@ -32269,7 +32269,7 @@ }, /area/mainship/medical/medical_science) "sXi" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/turf_decal/woodsiding, /obj/item/ashtray/glass, /obj/item/storage/fancy/cigarettes/kpack{ @@ -32777,7 +32777,7 @@ /obj/effect/turf_decal/woodsiding{ dir = 5 }, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /turf/open/floor/carpet, /area/mainship/living/commandbunks) "toA" = ( @@ -33070,7 +33070,7 @@ /turf/open/floor/mainship/metal, /area/mainship/squads/bravo) "tyv" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/computer/emails, /turf/open/floor/wood, /area/mainship/living/bridgebunks) @@ -33139,7 +33139,7 @@ /turf/open/floor/mainship/stripesquare, /area/mainship/living/commandbunks) "tBg" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/chem_dispenser/beer{ dir = 8 }, @@ -33816,7 +33816,7 @@ /turf/open/floor/mainship/metal/full, /area/mainship/living/grunt_rnr) "tZx" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/food_or_drink/sugary_snack, /turf/open/floor/grass, /area/mainship/living/starboard_garden) @@ -34275,7 +34275,7 @@ dir = 8 }, /obj/structure/cable, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/toy/plush/snake, /turf/open/floor/wood, /area/mainship/living/numbertwobunks) @@ -34477,7 +34477,7 @@ /turf/open/floor/plating/mainship, /area/mainship/shipboard/ex_firing_range) "uty" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/megaphone, /obj/effect/turf_decal/woodsiding{ dir = 6 @@ -34643,7 +34643,7 @@ /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ dir = 4 }, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/food_or_drink/cheesewedge, /turf/open/floor/wood, /area/mainship/living/grunt_rnr) @@ -34737,7 +34737,7 @@ /turf/open/floor/mainship/metal, /area/mainship/command/cic) "uBf" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/food_or_drink/wine, /turf/open/floor/wood, /area/mainship/living/grunt_rnr) @@ -35179,7 +35179,7 @@ /turf/open/floor/plating/plating_catwalk/light, /area/mainship/squads/delta) "uPM" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/turf_decal/woodsiding, /obj/machinery/camera/autoname{ dir = 1 @@ -35259,7 +35259,7 @@ /turf/open/floor/plating, /area/mainship/hull/upper_hull) "uSa" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/camera_film{ pixel_x = -4; pixel_y = 3 @@ -35898,7 +35898,7 @@ /turf/open/floor/wood, /area/mainship/command/corporateliaison) "vnx" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/food_or_drink/burger/weird, /turf/open/floor/carpet, /area/mainship/living/tankerbunks) @@ -36812,7 +36812,7 @@ /obj/effect/turf_decal/woodsiding{ dir = 1 }, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /turf/open/floor/carpet, /area/mainship/living/commandbunks) "vQO" = ( @@ -36885,7 +36885,7 @@ /turf/open/floor/plating, /area/mainship/hull/upper_hull) "vSB" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/chem_dispenser/soda{ dir = 8 }, @@ -36919,7 +36919,7 @@ /obj/effect/turf_decal/siding/dark{ dir = 1 }, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /turf/open/floor/wood, /area/mainship/hallways/aft_hallway) "vTV" = ( @@ -37173,7 +37173,7 @@ /obj/machinery/light/mainship{ dir = 4 }, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/food_or_drink/burger/weird, /turf/open/floor/wood, /area/mainship/living/grunt_rnr) @@ -37708,7 +37708,7 @@ /turf/open/floor/plating, /area/mainship/hull/upper_hull) "wsc" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/storage/fancy/cigar, /obj/item/clothing/mask/cigarette/pipe{ pixel_y = 5 @@ -37872,7 +37872,7 @@ /area/mainship/squads/delta) "wyo" = ( /obj/machinery/light/mainship, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/storage/donut_box, /turf/open/floor/wood, /area/mainship/command/corporateliaison) @@ -38572,7 +38572,7 @@ /obj/effect/turf_decal/woodsiding{ dir = 8 }, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /turf/open/floor/carpet, /area/mainship/living/commandbunks) "wWl" = ( @@ -39113,7 +39113,7 @@ /turf/open/floor/mainship/metal/gray, /area/mainship/medical/upper_medical) "xnv" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/turf_decal/siding/dark{ dir = 1 }, @@ -39366,7 +39366,7 @@ /turf/open/floor/mainship/tcomms, /area/mainship/command/self_destruct) "xwJ" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/clothing/sunglasses, /turf/open/floor/grass, /area/mainship/living/starboard_garden) @@ -39412,7 +39412,7 @@ /obj/effect/turf_decal/woodsiding{ dir = 9 }, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/computer/security/marinemainship, /obj/structure/sign/sanford, /turf/open/floor/carpet, @@ -39648,7 +39648,7 @@ /turf/open/floor/plating, /area/mainship/hull/starboard_hull) "xDo" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/turf_decal/woodsiding{ dir = 9 }, @@ -40620,7 +40620,7 @@ /turf/open/floor/mainship/metal, /area/mainship/hallways/bow_hallway) "yfS" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/flashlight/lamp/green, /turf/open/floor/carpet, /area/mainship/living/commandbunks) @@ -40694,7 +40694,7 @@ dir = 4 }, /obj/structure/cable, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/clipboard{ pixel_x = 5 }, diff --git a/_maps/map_files/Whiskey_Outpost/Whiskey_Outpost_v2.dmm b/_maps/map_files/Whiskey_Outpost/Whiskey_Outpost_v2.dmm index 61a9f0a2cbc..56945e40bc8 100644 --- a/_maps/map_files/Whiskey_Outpost/Whiskey_Outpost_v2.dmm +++ b/_maps/map_files/Whiskey_Outpost/Whiskey_Outpost_v2.dmm @@ -309,7 +309,7 @@ /turf/open/floor/prison, /area/whiskey_outpost) "bq" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/toy/dice, /obj/item/toy/dice/d20, /obj/item/toy/deck, @@ -319,7 +319,7 @@ /turf/open/floor/prison/plate, /area/whiskey_outpost) "br" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/weapon/claymore/mercsword/captain, /turf/open/floor/wood, /area/whiskey_outpost) @@ -556,7 +556,7 @@ /area/whiskey_outpost) "cG" = ( /obj/item/clothing/suit/storage/marine/smartgunner, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/whiskey_outpost) "cH" = ( @@ -745,7 +745,7 @@ /turf/open/floor/prison, /area/whiskey_outpost) "dw" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /obj/item/tool/pen, /obj/item/flashlight/lamp{ @@ -3105,7 +3105,7 @@ /turf/open/floor/prison, /area/whiskey_outpost) "px" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/pill/cyanide{ pixel_x = -3; pixel_y = -4 @@ -3244,7 +3244,7 @@ /area/whiskey_outpost/outside/north) "qc" = ( /obj/item/storage/pill_bottle/happy, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/xenos_claw, /turf/open/floor/wood, /area/whiskey_outpost/outside/north) diff --git a/_maps/map_files/deltastation/deltastation.dmm b/_maps/map_files/deltastation/deltastation.dmm index 25987479917..c44eb784320 100644 --- a/_maps/map_files/deltastation/deltastation.dmm +++ b/_maps/map_files/deltastation/deltastation.dmm @@ -205,7 +205,7 @@ /turf/open/floor/iron/white, /area/deltastation/medical/medbay) "ace" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/briefcase, /obj/structure/sign/securearea{ pixel_x = 32 @@ -335,7 +335,7 @@ /area/deltastation/maintenance/port) "adf" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/sign/securearea{ dir = 4 }, @@ -408,7 +408,7 @@ dir = 1 }, /obj/effect/landmark/weed_node, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/iron/grimy, /area/deltastation/command/heads_quarters/hos) "adS" = ( @@ -558,7 +558,7 @@ /turf/closed/wall, /area/deltastation/medical/cryo) "afE" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /turf/open/floor/carpet, /area/deltastation/security/detectives_office) @@ -685,7 +685,7 @@ /turf/open/floor/plating, /area/deltastation/maintenance/port/fore) "agY" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/trash/candle, /obj/item/trash/cigbutt{ pixel_y = 7 @@ -755,7 +755,7 @@ /turf/open/space, /area/space) "ahx" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp/green, /obj/effect/spawner/random/misc/structure/directional_window/west, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -836,7 +836,7 @@ /area/deltastation/engineering/supermatter/room) "aiE" = ( /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/storage/bible, /turf/open/floor/iron/dark, /area/deltastation/service/chapel/funeral) @@ -1018,7 +1018,7 @@ /turf/open/floor/iron/white/side, /area/deltastation/security/execution/transfer) "akx" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder{ pixel_x = 3; pixel_y = 3 @@ -1562,7 +1562,7 @@ /turf/closed/wall/r_wall/unmeltable/regular, /area/deltastation/construction/mining/aux_base) "aqN" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/paper{ pixel_x = 3; pixel_y = 2 @@ -2132,7 +2132,7 @@ /area/deltastation/hallway/primary/fore) "awT" = ( /obj/structure/extinguisher_cabinet, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/radio/intercom, /obj/item/reagent_containers/food/drinks/coffee{ pixel_x = 1; @@ -2476,7 +2476,7 @@ /obj/machinery/firealarm{ dir = 4 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, @@ -2625,7 +2625,7 @@ /turf/open/floor/iron, /area/deltastation/maintenance/department/eva/abandoned) "aCk" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/reagent_containers/food/drinks/bottle/holywater, /turf/open/floor/iron/grimy, /area/deltastation/service/chapel/office) @@ -2811,7 +2811,7 @@ /area/deltastation/security/execution/education) "aED" = ( /obj/structure/cable, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder, /obj/item/tool/lighter, /turf/open/floor/carpet, @@ -2823,7 +2823,7 @@ /area/deltastation/engineering/atmos/storage) "aEG" = ( /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/reagent_containers/food/snacks/grown/poppy, /obj/item/reagent_containers/food/snacks/grown/poppy{ pixel_x = 3; @@ -3315,12 +3315,12 @@ /area/deltastation/construction/mining/aux_base) "aJO" = ( /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /turf/open/floor/iron/dark, /area/deltastation/service/library) "aJY" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/turf_decal/siding/wideplating/dark{ dir = 4 }, @@ -3834,7 +3834,7 @@ /obj/structure/sign/securearea{ pixel_x = 32 }, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/door/window{ dir = 8 }, @@ -4148,7 +4148,7 @@ /turf/open/floor/iron/white, /area/deltastation/science/research) "aTj" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/clipboard, /obj/effect/spawner/random/misc/prizemecha{ pixel_x = 3; @@ -4236,7 +4236,7 @@ /turf/closed/wall, /area/deltastation/maintenance/fore) "aUl" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/briefcase{ pixel_x = 3; pixel_y = 3 @@ -4265,7 +4265,7 @@ /area/deltastation/service/theater) "aUs" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/carpet, /area/deltastation/commons/lounge) "aUt" = ( @@ -5734,7 +5734,7 @@ }, /area/deltastation/science/lobby) "biO" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/box/ids{ pixel_x = 3; pixel_y = 3 @@ -5816,7 +5816,7 @@ /turf/open/floor/iron, /area/deltastation/science/research/abandoned) "bjV" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/machinery/random_broken_computer/small/security{ dir = 1 }, @@ -6743,7 +6743,7 @@ /turf/open/floor/iron, /area/deltastation/maintenance/department/science) "btB" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/book/manual/engineering_guide, /turf/open/floor/plating/ground/mars/random/cave, /area/deltastation/service/abandoned_gambling_den/gaming) @@ -7341,7 +7341,7 @@ /turf/open/floor/iron/white, /area/deltastation/command/heads_quarters/cmo) "byR" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/structure/directional_window/west, /obj/structure/cable, /obj/machinery/power/apc/drained{ @@ -7546,7 +7546,7 @@ /turf/open/floor/iron, /area/deltastation/engineering/atmos/storage) "bzR" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/fancy/crayons, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -7987,7 +7987,7 @@ /turf/open/floor/iron, /area/deltastation/construction/mining/aux_base) "bFi" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/misc/paperbin, /obj/item/tool/pen, @@ -8430,7 +8430,7 @@ /area/deltastation/command/corporate_showroom) "bKm" = ( /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/storage/fancy/candle_box, /turf/open/floor/iron/dark, /area/deltastation/service/chapel/funeral) @@ -8767,7 +8767,7 @@ /area/deltastation/engineering/storage/tech) "bPa" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/secure/briefcase, /obj/item/explosive/grenade/smokebomb, /turf/open/floor/wood, @@ -9506,7 +9506,7 @@ /obj/structure/sign/securearea{ dir = 8 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/newspaper, /obj/item/clothing/head/bowler, /turf/open/floor/iron/checker, @@ -10276,7 +10276,7 @@ /turf/open/floor/iron/textured, /area/deltastation/medical/storage) "cfS" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /obj/item/tool/pen, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, @@ -10500,7 +10500,7 @@ }, /area/deltastation/science/research) "chV" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/camera_film, /obj/item/camera_film{ pixel_x = 3; @@ -11082,7 +11082,7 @@ /turf/open/floor/prison/redfloor, /area/deltastation/asteroidcaves/ship) "coF" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/grown/poppy{ pixel_x = 3; pixel_y = 3 @@ -11368,7 +11368,7 @@ /turf/open/floor/wood, /area/deltastation/service/theater) "crn" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, /turf/open/floor/iron, /area/deltastation/service/electronic_marketing_den) @@ -11477,7 +11477,7 @@ /turf/open/floor/iron/cafeteria, /area/deltastation/service/cafeteria) "csD" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, /turf/open/floor/iron/dark, /area/deltastation/security/courtroom) @@ -12432,7 +12432,7 @@ /turf/open/floor/iron/dark, /area/deltastation/security/courtroom) "cDK" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/fancy/crayons{ pixel_x = 1; pixel_y = -1 @@ -12760,7 +12760,7 @@ /turf/closed/wall/r_wall, /area/deltastation/security/checkpoint/medical/medsci) "cHi" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /turf/open/floor/wood, /area/deltastation/asteroidcaves/derelictwest) @@ -13003,7 +13003,7 @@ /turf/open/floor/plating, /area/deltastation/ai_monitored/turret_protected/aisat_interior) "cLg" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/briefcase, /obj/item/weapon/cane, /turf/open/floor/wood, @@ -15031,7 +15031,7 @@ /turf/open/floor/plating, /area/deltastation/security/warden) "dha" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/fancy/candle_box{ pixel_x = 3; pixel_y = 3 @@ -15490,7 +15490,7 @@ /turf/open/floor/iron/cafeteria, /area/deltastation/service/kitchen) "dle" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /obj/item/tool/pen, /turf/open/floor/wood, @@ -15570,7 +15570,7 @@ /turf/open/floor/iron, /area/deltastation/maintenance/disposal) "dlL" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/clothing/mask/cigarette/pipe, /turf/open/floor/carpet, /area/deltastation/commons/lounge) @@ -16359,7 +16359,7 @@ /area/deltastation/asteroidcaves/ship) "duo" = ( /obj/item/storage/bible, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /turf/open/floor/iron/grimy, /area/deltastation/service/chapel) "duv" = ( @@ -16441,7 +16441,7 @@ }, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/grown/harebell, /obj/item/reagent_containers/food/snacks/grown/harebell{ pixel_x = -3; @@ -16857,7 +16857,7 @@ "dzb" = ( /obj/effect/turf_decal/siding/wood, /obj/structure/mirror, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/atmospherics/components/unary/vent_pump/layer1{ dir = 8 }, @@ -17256,7 +17256,7 @@ /turf/closed/wall, /area/deltastation/science/genetics) "dCL" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/machinery/random_broken_computer/small, /turf/open/floor/carpet, /area/deltastation/command/heads_quarters/captain) @@ -18584,7 +18584,7 @@ /turf/open/floor/iron, /area/deltastation/engineering/storage) "dPr" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/machinery/random_broken_computer/small/meddata, /obj/machinery/light_switch{ pixel_x = -38; @@ -19005,7 +19005,7 @@ /turf/open/floor/iron/textured, /area/deltastation/science/research) "dTx" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/clipboard, /obj/effect/spawner/random/misc/folder, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, @@ -19384,7 +19384,7 @@ /turf/open/shuttle, /area/deltastation/hallway/secondary/entry) "dWp" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/camera, /obj/machinery/light/small, /obj/structure/sign/securearea{ @@ -20552,7 +20552,7 @@ /turf/open/floor/iron/white/smooth_large, /area/deltastation/medical/medbay) "ehB" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/light/small{ dir = 4 }, @@ -20956,7 +20956,7 @@ "ekT" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/clothing/under/owl, /obj/item/clothing/mask/gas/owl_mask, /turf/open/floor/wood, @@ -21534,7 +21534,7 @@ /turf/open/floor/iron/white, /area/deltastation/medical/medbay) "erk" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/cans/waterbottle, /obj/item/reagent_containers/dropper, /turf/open/floor/plating, @@ -22067,7 +22067,7 @@ /turf/open/floor/plating, /area/storage/testroom) "ewG" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/grown/poppy, /obj/item/radio/intercom, /turf/open/floor/wood, @@ -22682,7 +22682,7 @@ /turf/open/floor/iron, /area/deltastation/hallway/primary/starboard) "eCA" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder, /obj/item/tool/pen, /obj/item/radio/intercom, @@ -23014,7 +23014,7 @@ /turf/open/floor/iron, /area/deltastation/medical/treatment_center) "eGr" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, /turf/open/floor/iron/dark/textured_half{ dir = 8 @@ -23157,7 +23157,7 @@ /area/deltastation/engineering/storage) "eHx" = ( /obj/structure/cable, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /turf/open/floor/gcircuit, /area/deltastation/ai_monitored/turret_protected/ai_upload) "eHE" = ( @@ -23190,7 +23190,7 @@ /turf/open/space/basic, /area/space) "eHO" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/grown/poppy, /obj/item/reagent_containers/food/snacks/grown/poppy{ pixel_x = 6; @@ -23735,7 +23735,7 @@ /turf/open/floor/iron, /area/deltastation/security/courtroom) "eNw" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -24627,7 +24627,7 @@ /area/deltastation/engineering/atmos) "eXs" = ( /obj/structure/cable, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder, /obj/item/tool/pen, /obj/effect/landmark/weed_node, @@ -24875,7 +24875,7 @@ /turf/closed/mineral/smooth/indestructible, /area/deltastation/asteroidcaves/rock) "faE" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/iron/grimy, /area/deltastation/tcommsat/computer) "faG" = ( @@ -25707,7 +25707,7 @@ /turf/open/floor/plating/ground/mars/random/cave, /area/deltastation/asteroidcaves/northeastcaves) "fhx" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/item/taperecorder, /turf/open/floor/iron/grimy, @@ -26477,7 +26477,7 @@ /turf/open/floor/prison/redfloor, /area/deltastation/asteroidcaves/ship) "fpz" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder{ pixel_x = 6; pixel_y = 6 @@ -26546,7 +26546,7 @@ dir = 8 }, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/iron/dark, /area/deltastation/command/heads_quarters/hop) "fqR" = ( @@ -26873,7 +26873,7 @@ /turf/closed/mineral/smooth/indestructible, /area/deltastation/asteroidcaves/rock) "ftW" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/effect/spawner/random/misc/structure/directional_window/west, /turf/open/floor/carpet, @@ -28802,7 +28802,7 @@ /turf/open/floor/vault, /area/deltastation/commons/fitness/recreation) "fOA" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /turf/open/floor/plating, /area/deltastation/service/abandoned_gambling_den) @@ -29266,7 +29266,7 @@ /turf/open/floor/iron/diagonal, /area/deltastation/medical/break_room) "fTf" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder{ pixel_x = 3; pixel_y = 3 @@ -29368,7 +29368,7 @@ /area/deltastation/hallway/secondary/service) "fUc" = ( /obj/structure/cable, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/misc/structure/directional_window, /obj/machinery/door/window{ dir = 8; @@ -29624,7 +29624,7 @@ /turf/open/floor/iron, /area/deltastation/maintenance/port/aft) "fWv" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/misc/structure/directional_window/east, /turf/open/floor/wood, /area/deltastation/service/library/artgallery) @@ -29778,7 +29778,7 @@ /turf/open/floor/iron/white, /area/deltastation/medical/chemistry) "fXY" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/deltastation/commons/dorms) "fXZ" = ( @@ -30780,7 +30780,7 @@ /obj/effect/turf_decal/tile/transparent/blue/half/contrasted{ dir = 1 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/medical/firstaid, /turf/open/floor/iron/white, /area/deltastation/medical/paramedic) @@ -30872,7 +30872,7 @@ /turf/open/floor/plating/ground/mars/random/cave, /area/deltastation/hallway/primary/central/fore) "gjL" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin{ pixel_y = 3 }, @@ -31619,7 +31619,7 @@ }, /area/deltastation/service/chapel) "gro" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /obj/item/storage/briefcase, /turf/open/floor/plating, @@ -31636,14 +31636,14 @@ /turf/open/floor/plating, /area/deltastation/engineering/supermatter/room) "grt" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/clothing/tie/red, /obj/item/clothing/head/that, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, /turf/open/floor/iron, /area/deltastation/service/electronic_marketing_den) "grA" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/box/matches{ pixel_x = -3; pixel_y = 5 @@ -31661,7 +31661,7 @@ /turf/open/floor/iron/white, /area/deltastation/medical/virology) "grH" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/clipboard, /turf/open/floor/wood, /area/deltastation/service/lawoffice) @@ -31800,7 +31800,7 @@ /turf/open/floor/wood, /area/deltastation/hallway/secondary/service) "gtj" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/cigarettes{ pixel_x = 6 }, @@ -32938,7 +32938,7 @@ /turf/open/floor/iron, /area/deltastation/maintenance/department/eva/abandoned) "gDS" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/door/firedoor, /obj/structure/sign/securearea, /turf/open/floor/iron/smooth_half{ @@ -32975,7 +32975,7 @@ /turf/open/floor/iron/dark, /area/deltastation/service/library) "gEn" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, /obj/item/toy/dice, /obj/item/toy/dice, @@ -33320,7 +33320,7 @@ /turf/open/floor/plating, /area/deltastation/maintenance/department/medical/morgue) "gIe" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /obj/item/tool/pen, /obj/machinery/air_alarm{ @@ -33508,7 +33508,7 @@ /turf/open/floor/iron, /area/deltastation/science/auxlab/firing_range) "gKd" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/decal/cleanable/cobweb, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, /obj/effect/spawner/random/misc/plushie/nospawnninetynine, @@ -34133,7 +34133,7 @@ /turf/open/floor/iron, /area/deltastation/security/checkpoint/escape) "gQI" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder, /obj/item/book/manual/detective, /turf/open/floor/wood, @@ -34473,7 +34473,7 @@ /area/deltastation/maintenance/port/fore) "gTA" = ( /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/clothing/glasses/regular/hipster, /turf/open/floor/plating/ground/mars/random/cave, /area/deltastation/service/abandoned_gambling_den/gaming) @@ -35011,7 +35011,7 @@ /turf/open/floor/iron, /area/deltastation/commons/storage/primary) "haW" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/cigar{ pixel_x = 3 }, @@ -35206,7 +35206,7 @@ /turf/open/floor/iron, /area/deltastation/cargo/storage) "hbF" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/structure/sign/securearea, /obj/structure/sign/securearea, @@ -35291,7 +35291,7 @@ /turf/open/floor/iron, /area/deltastation/hallway/primary/starboard) "hcv" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /obj/item/tool/pen{ pixel_x = 5; @@ -35346,7 +35346,7 @@ /turf/open/floor/iron/dark, /area/deltastation/command/bridge) "hcP" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/computer/security/wooden_tv, /obj/machinery/light/small, /turf/open/floor/iron/grimy, @@ -35885,7 +35885,7 @@ /turf/open/floor/plating/ground/mars/random/cave, /area/deltastation/maintenance/port/aft) "hig" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/clipboard, /obj/machinery/air_alarm{ dir = 4 @@ -36212,7 +36212,7 @@ /turf/open/floor/iron, /area/deltastation/security/execution/transfer) "hlX" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /obj/item/tool/pen, /turf/open/floor/plating, @@ -36299,7 +36299,7 @@ /turf/open/floor/iron/dark, /area/deltastation/engineering/atmos) "hng" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/phone{ desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; pixel_x = -3; @@ -36475,7 +36475,7 @@ /turf/closed/wall/r_wall, /area/deltastation/command/meeting_room/council) "hph" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/deltastation/service/abandoned_gambling_den) "hpk" = ( @@ -37508,7 +37508,7 @@ /turf/open/floor/iron, /area/deltastation/maintenance/port/aft) "hBf" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp{ pixel_y = 3 }, @@ -37526,7 +37526,7 @@ /turf/open/floor/iron/white, /area/deltastation/medical/chemistry) "hBn" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/flashlight/lantern, /obj/effect/turf_decal/siding/wideplating/dark{ dir = 4 @@ -37578,7 +37578,7 @@ /area/deltastation/engineering/lobby) "hBM" = ( /obj/structure/cable, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/carpet, @@ -37656,7 +37656,7 @@ /turf/open/floor/iron, /area/deltastation/engineering/storage) "hCD" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /obj/structure/sign/securearea, /turf/open/floor/iron, @@ -37745,7 +37745,7 @@ /area/deltastation/hallway/secondary/entry) "hDU" = ( /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/deltastation/service/library) @@ -38096,7 +38096,7 @@ }, /area/deltastation/hallway/primary/port) "hIj" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -38802,7 +38802,7 @@ /turf/closed/wall/r_wall, /area/deltastation/command/bridge) "hQO" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/grown/log, /obj/item/grown/log, /obj/item/grown/log, @@ -38971,7 +38971,7 @@ /turf/open/floor/plating, /area/deltastation/asteroidcaves/derelictsatellite) "hSY" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/clipboard, /obj/effect/spawner/random/misc/folder, /obj/item/tool/pen, @@ -39198,7 +39198,7 @@ /obj/effect/turf_decal/siding/blue{ dir = 1 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/machinery/light/small, /turf/open/floor/iron, @@ -39368,7 +39368,7 @@ /turf/closed/wall, /area/deltastation/commons/fitness/recreation) "hWL" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/engineering/radio{ pixel_y = 5 }, @@ -39676,7 +39676,7 @@ /turf/open/floor/iron, /area/deltastation/maintenance/port) "hZW" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/flashlight/lantern, /obj/effect/turf_decal/siding/wideplating/dark{ dir = 8 @@ -40454,7 +40454,7 @@ /turf/open/floor/iron, /area/deltastation/engineering/main) "ijN" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/box/matches{ pixel_x = -2; pixel_y = 3 @@ -40650,7 +40650,7 @@ /turf/open/floor/iron, /area/deltastation/maintenance/port/aft) "ilw" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, /obj/effect/turf_decal/sandedge{ dir = 1 @@ -41111,7 +41111,7 @@ /area/deltastation/commons/locker) "irv" = ( /obj/effect/turf_decal/siding/wood, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/atmospherics/components/unary/vent_pump/layer1{ dir = 8 }, @@ -41259,7 +41259,7 @@ /area/deltastation/cargo/lobby) "itf" = ( /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/light_switch, /obj/item/newspaper{ pixel_x = 3; @@ -41343,7 +41343,7 @@ /turf/open/floor/iron/white, /area/deltastation/medical/medbay/lobby) "itK" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/secure/briefcase{ pixel_x = 5; pixel_y = 5 @@ -41461,7 +41461,7 @@ /area/deltastation/hallway/primary/port) "ivj" = ( /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/radio/intercom{ dir = 1 }, @@ -41515,7 +41515,7 @@ }, /area/deltastation/security/range) "ivY" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/structure/sign/securearea{ dir = 8; pixel_x = -28 @@ -42135,7 +42135,7 @@ /turf/open/floor/iron/white/smooth_large, /area/deltastation/medical/cryo) "iBF" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/turf_decal/tile/transparent/red{ dir = 4 }, @@ -42557,7 +42557,7 @@ /turf/open/floor/iron/dark, /area/deltastation/security/courtroom) "iGs" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/structure/directional_window/west, /turf/open/floor/iron/grimy, /area/deltastation/command/bridge) @@ -42617,7 +42617,7 @@ /turf/open/floor/iron, /area/deltastation/cargo/lobby) "iGY" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, /obj/machinery/light/small{ @@ -42660,7 +42660,7 @@ /turf/open/floor/iron, /area/deltastation/medical/treatment_center) "iHh" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/lockbox, /obj/machinery/light{ dir = 4 @@ -43113,7 +43113,7 @@ /area/deltastation/science/robotics/mechbay) "iLq" = ( /obj/structure/cable, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /turf/open/floor/iron/grimy, /area/deltastation/command/heads_quarters/ce) @@ -43518,7 +43518,7 @@ /turf/open/floor/plating, /area/deltastation/maintenance/port/fore) "iQi" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/turf_decal/siding/wideplating/dark{ dir = 8 }, @@ -43617,7 +43617,7 @@ /turf/open/floor/iron, /area/deltastation/security/checkpoint/escape) "iRj" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/door/firedoor, /obj/item/storage/wallet/random, /obj/effect/landmark/weed_node, @@ -44189,7 +44189,7 @@ /turf/open/floor/plating, /area/deltastation/maintenance/space_hut/observatory) "iWq" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/weaponry/weapon_recharger, /turf/open/floor/wood, /area/deltastation/command/heads_quarters/captain) @@ -44485,7 +44485,7 @@ }, /area/deltastation/service/chapel) "iZG" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/radio/intercom, /obj/item/newspaper, /obj/item/newspaper{ @@ -44546,7 +44546,7 @@ /turf/open/floor/iron/dark, /area/deltastation/science/auxlab/firing_range) "jaW" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/light_switch{ pixel_x = 8 }, @@ -44629,7 +44629,7 @@ /area/deltastation/medical/medbay/lobby) "jbA" = ( /obj/structure/cable, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/door/firedoor, /obj/effect/spawner/random/misc/cigarettes, /obj/effect/spawner/random/misc/cigarettes{ @@ -44794,13 +44794,13 @@ /turf/open/floor/iron/white, /area/deltastation/medical/treatment_center) "jcC" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder, /obj/item/tool/pen/blue, /turf/open/floor/wood, /area/deltastation/commons/dorms) "jcJ" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/clothing/under/kilt, /obj/item/clothing/head/beret, /turf/open/floor/wood, @@ -44973,7 +44973,7 @@ /turf/open/floor/plating, /area/deltastation/service/theater/abandoned) "jeX" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder, /obj/item/tool/pen/red, /obj/item/tool/pen/blue{ @@ -45701,7 +45701,7 @@ /turf/open/floor/iron, /area/deltastation/engineering/storage/tech) "jnf" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/toy/deck/kotahi, /obj/item/toy/plush/carp, /turf/open/floor/plating, @@ -45843,7 +45843,7 @@ /area/deltastation/asteroidcaves/westerncaves/garbledradio) "joQ" = ( /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/machinery/power/apc/drained{ dir = 1 @@ -46347,7 +46347,7 @@ /turf/open/floor/plating, /area/deltastation/science/research/abandoned) "juz" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder, /obj/item/tool/pen, /obj/effect/turf_decal/siding/wood{ @@ -46681,7 +46681,7 @@ /turf/open/floor/iron, /area/deltastation/hallway/primary/fore) "jyS" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/misc/folder, /obj/item/tool/pen, @@ -46773,7 +46773,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ dir = 1 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, @@ -46823,7 +46823,7 @@ /turf/open/floor/iron/dark, /area/deltastation/engineering/atmos) "jAn" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/clothing/shoes/sandal, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, /obj/structure/sign/securearea{ @@ -46836,7 +46836,7 @@ /area/deltastation/asteroidcaves/derelictwest) "jAx" = ( /obj/structure/cable, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder, /turf/open/floor/carpet, /area/deltastation/command/meeting_room/council) @@ -46861,7 +46861,7 @@ /turf/open/floor/iron/dark, /area/deltastation/ai_monitored/aisat/exterior) "jBm" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/light{ dir = 8 }, @@ -47069,7 +47069,7 @@ /turf/open/floor/iron, /area/deltastation/hallway/primary/port) "jDB" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/structure/sign/securearea{ pixel_y = -32 @@ -47523,7 +47523,7 @@ /turf/open/floor/iron, /area/deltastation/hallway/secondary/entry) "jJr" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/structure/directional_window/east, /obj/effect/spawner/random/misc/folder, /obj/item/tool/pen, @@ -47582,7 +47582,7 @@ /turf/open/floor/iron, /area/deltastation/commons/storage/tools) "jKo" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder, /obj/item/tool/pen, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, @@ -47795,7 +47795,7 @@ /area/deltastation/engineering/atmos/project) "jMp" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/sign/securearea{ pixel_y = 32 }, @@ -48555,7 +48555,7 @@ /turf/open/floor/iron, /area/deltastation/engineering/atmos) "jTK" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/deltastation/service/library/abandoned) "jTL" = ( @@ -48894,7 +48894,7 @@ /turf/open/floor/iron, /area/deltastation/cargo/miningoffice) "jWK" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/turf_decal/tile/transparent/blue/anticorner/contrasted{ dir = 8 }, @@ -49974,7 +49974,7 @@ /turf/open/floor/iron, /area/deltastation/hallway/primary/starboard) "kiK" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -50504,7 +50504,7 @@ /turf/open/floor/iron, /area/deltastation/engineering/atmos/project) "koM" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/light{ dir = 8 }, @@ -50915,7 +50915,7 @@ /area/deltastation/maintenance/port/aft) "kuk" = ( /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/disposalpipe/segment, /obj/machinery/light{ dir = 8 @@ -51361,7 +51361,7 @@ /turf/open/floor/plating, /area/deltastation/security/prison/safe) "kxM" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/door/firedoor, /obj/item/storage/box/matches{ pixel_y = 5 @@ -51991,7 +51991,7 @@ /turf/open/floor/iron, /area/deltastation/security/checkpoint/escape) "kEo" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/card/emag_broken{ name = "cryptographic sequencer" }, @@ -52307,7 +52307,7 @@ /turf/open/floor/plating, /area/deltastation/maintenance/department/electrical) "kHB" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/coin/phoron, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -52394,7 +52394,7 @@ /turf/open/floor/carpet, /area/deltastation/commons/lounge) "kHY" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/cable, /turf/open/floor/iron, /area/deltastation/command/corporate_showroom) @@ -52690,7 +52690,7 @@ /turf/open/floor/plating, /area/deltastation/service/barber) "kKR" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, /obj/machinery/newscaster{ dir = 1 @@ -53058,7 +53058,7 @@ /turf/open/floor/iron, /area/deltastation/command/heads_quarters/rd) "kPJ" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/carpet, /area/deltastation/service/chapel/office) "kPL" = ( @@ -53356,7 +53356,7 @@ /turf/open/floor/iron, /area/deltastation/engineering/supermatter/room) "kTi" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/door_control{ id = "Dorm2"; name = "Dormitory Door Lock" @@ -54146,7 +54146,7 @@ /turf/open/floor/iron, /area/deltastation/maintenance/port/fore) "lcH" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -54334,7 +54334,7 @@ /turf/open/floor/iron, /area/deltastation/security/courtroom) "lef" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /obj/item/flashlight/lamp, /obj/effect/decal/cleanable/cobweb{ @@ -54343,7 +54343,7 @@ /turf/open/floor/plating, /area/deltastation/service/library/abandoned) "lel" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/light{ dir = 8 }, @@ -54490,7 +54490,7 @@ /turf/open/floor/iron, /area/deltastation/hallway/secondary/command) "lgq" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/door/window{ dir = 8; name = "Core Modules" @@ -54699,7 +54699,7 @@ /turf/open/floor/engine, /area/deltastation/science/genetics) "lhT" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, /turf/open/floor/iron/dark, /area/deltastation/science/breakroom) @@ -54795,7 +54795,7 @@ /turf/open/floor/iron/white/smooth_large, /area/deltastation/medical/medbay) "ljE" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/instrument/guitar, /obj/effect/decal/cleanable/cobweb2, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, @@ -54866,7 +54866,7 @@ /turf/open/floor/iron/white, /area/deltastation/asteroidcaves/ship) "lky" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/light_switch, /obj/item/tool/pen, /obj/effect/landmark/weed_node, @@ -55348,7 +55348,7 @@ /turf/open/floor/iron, /area/deltastation/security/prison) "loV" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /turf/open/floor/wood, /area/deltastation/commons/dorms) @@ -55636,7 +55636,7 @@ /turf/open/floor/iron, /area/deltastation/maintenance/port) "lrX" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /obj/effect/spawner/random/misc/structure/directional_window/north, /turf/open/floor/carpet, @@ -57529,7 +57529,7 @@ /obj/effect/turf_decal/tile/transparent/neutral/half/contrasted{ dir = 1 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/fancy/crayons, /obj/item/storage/fancy/crayons, /turf/open/floor/iron, @@ -58154,7 +58154,7 @@ /turf/open/floor/plating, /area/deltastation/maintenance/port) "lQU" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/weaponry/weapon_recharger{ pixel_y = 3 }, @@ -58163,7 +58163,7 @@ /turf/open/floor/iron/dark, /area/deltastation/command/heads_quarters/hos) "lRd" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/sign/securearea{ pixel_x = -32 }, @@ -58461,7 +58461,7 @@ /turf/open/floor/wood, /area/deltastation/service/library/artgallery) "lUs" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/briefcase, /turf/open/floor/plating, /area/deltastation/service/theater/abandoned) @@ -58602,7 +58602,7 @@ /turf/open/floor/iron, /area/deltastation/security/execution/transfer) "lVR" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, /obj/effect/spawner/random/misc/folder, /obj/item/reagent_containers/spray/cleaner{ @@ -58640,7 +58640,7 @@ /turf/open/space, /area/space) "lWb" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/iron/grimy, /area/deltastation/command/heads_quarters/captain/private) "lWe" = ( @@ -58953,7 +58953,7 @@ /turf/open/floor/plating/ground/mars/random/cave, /area/deltastation/asteroidcaves/rock) "lZL" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/effect/turf_decal/siding/wood, /obj/effect/spawner/random/misc/structure/directional_window, @@ -59016,7 +59016,7 @@ /turf/open/floor/plating, /area/deltastation/security/execution/transfer) "mat" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/engineering/insulatedgloves, /turf/open/floor/plating, /area/deltastation/service/abandoned_gambling_den) @@ -59256,7 +59256,7 @@ /area/deltastation/service/chapel/funeral) "mcX" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/plating, /area/deltastation/service/abandoned_gambling_den) "mde" = ( @@ -59796,7 +59796,7 @@ /area/deltastation/service/hydroponics) "mhK" = ( /obj/effect/spawner/random/misc/structure/directional_window/east, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lantern, /obj/item/reagent_containers/food/snacks/grown/harebell, /obj/effect/turf_decal/stripes/line{ @@ -59839,7 +59839,7 @@ /turf/open/floor/iron/dark/textured_half, /area/deltastation/service/chapel/storage) "mik" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/faxmachine{ name = "Captain's Fax Machine" }, @@ -60632,7 +60632,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/transparent/red{ dir = 1 @@ -60674,7 +60674,7 @@ /obj/effect/turf_decal/tile/transparent/blue{ dir = 4 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/radio/intercom, /obj/item/storage/donut_box, /obj/machinery/light/small{ @@ -60888,7 +60888,7 @@ /turf/open/floor/iron/dark, /area/deltastation/service/chapel/funeral) "mvr" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /obj/item/reagent_containers/food/snacks/chocolateegg, /obj/effect/turf_decal/sandedge{ @@ -60897,7 +60897,7 @@ /turf/open/floor/plating, /area/deltastation/service/abandoned_gambling_den/gaming) "mvs" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, @@ -61854,7 +61854,7 @@ /obj/machinery/air_alarm{ dir = 8 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/plating, /area/deltastation/service/abandoned_gambling_den) "mEV" = ( @@ -61952,7 +61952,7 @@ /turf/open/floor/iron, /area/deltastation/maintenance/port/fore) "mFX" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/cigar{ pixel_x = 3 }, @@ -62098,7 +62098,7 @@ /turf/open/floor/iron/white, /area/deltastation/medical/treatment_center) "mHN" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/taperecorder{ pixel_x = 3 }, @@ -62606,7 +62606,7 @@ /obj/machinery/chem_dispenser/beer{ dir = 1 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/sign/securearea, /turf/open/floor/plating, /area/deltastation/service/abandoned_gambling_den) @@ -62860,7 +62860,7 @@ /turf/open/floor/iron/dark, /area/deltastation/science/ordnance/testlab) "mPW" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/turf_decal/siding/wood{ dir = 8 }, @@ -63529,7 +63529,7 @@ /turf/open/floor/iron/dark, /area/deltastation/asteroidcaves/derelictsatellite) "mXR" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -64231,7 +64231,7 @@ }, /obj/effect/turf_decal/tile/transparent/red, /obj/machinery/light/small, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/pastries/applepie, /obj/item/paper/crumpled{ name = "note from mom" @@ -64384,7 +64384,7 @@ /turf/open/floor/iron, /area/deltastation/engineering/supermatter/room) "nhB" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/radio/intercom{ dir = 1 }, @@ -64450,7 +64450,7 @@ }, /area/deltastation/security/office) "nhY" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/ammo_magazine/shotgun{ pixel_x = 3; pixel_y = -3 @@ -64554,7 +64554,7 @@ /turf/open/floor/iron/dark, /area/deltastation/ai_monitored/aisat/exterior) "njm" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /turf/open/floor/iron/grimy, /area/deltastation/service/chapel) "njn" = ( @@ -64738,7 +64738,7 @@ /turf/open/floor/iron, /area/deltastation/asteroidcaves/derelictwest) "nkZ" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/briefcase, /obj/effect/spawner/random/misc/prizemecha, /turf/open/floor/iron/grimy, @@ -64763,7 +64763,7 @@ /turf/open/floor/wood, /area/deltastation/engineering/break_room) "nlS" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/camera_film{ pixel_x = 3; pixel_y = 3 @@ -64788,7 +64788,7 @@ /turf/open/floor/iron, /area/deltastation/medical/pharmacy) "nme" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/structure/prop/camera{ name = "chapel camera" @@ -65118,7 +65118,7 @@ /turf/open/floor/iron, /area/deltastation/medical/treatment_center) "nqC" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /obj/item/tool/pen, /obj/effect/turf_decal/tile/transparent/red{ @@ -65297,7 +65297,7 @@ /area/deltastation/engineering/atmos) "nrO" = ( /obj/effect/spawner/random/misc/structure/directional_window/west, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/handcuffs, /obj/item/flash, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -65646,7 +65646,7 @@ /turf/open/floor/plating, /area/deltastation/service/abandoned_gambling_den) "nvJ" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/light{ dir = 4 }, @@ -65683,7 +65683,7 @@ /turf/open/floor/iron, /area/deltastation/maintenance/fore) "nvW" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/spawner/random/misc/cigar{ pixel_x = 2; @@ -65713,7 +65713,7 @@ /turf/open/floor/gcircuit, /area/deltastation/tcommsat/server) "nwy" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin{ pixel_x = -3; pixel_y = 2 @@ -66228,7 +66228,7 @@ /turf/open/floor/iron, /area/deltastation/command/heads_quarters/hos) "nBE" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/engineering/computercircuit, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, /turf/open/floor/iron, @@ -66245,7 +66245,7 @@ /turf/open/floor/iron/dark, /area/deltastation/engineering/supermatter/room) "nBY" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, /obj/machinery/faxmachine{ name = "Head of Security's Fax Machine" @@ -67219,7 +67219,7 @@ /turf/open/floor/plating, /area/deltastation/security/range) "nNY" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /obj/item/tool/pen, /turf/open/floor/carpet, @@ -67320,7 +67320,7 @@ /turf/open/floor/iron/dark, /area/deltastation/hallway/secondary/entry) "nOI" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/structure/directional_window/east, /obj/item/flashlight/lamp, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -67425,7 +67425,7 @@ /turf/open/floor/plating, /area/deltastation/maintenance/fore) "nPD" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/taperecorder, /turf/open/floor/wood, /area/deltastation/hallway/secondary/service) @@ -67645,7 +67645,7 @@ /turf/open/floor/iron, /area/deltastation/engineering/supermatter/room) "nSh" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp{ pixel_y = -4 }, @@ -67971,7 +67971,7 @@ /turf/open/floor/iron/white, /area/deltastation/science/lobby) "nVS" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/camera_film{ pixel_x = 3; pixel_y = 3 @@ -68496,7 +68496,7 @@ /turf/open/floor/plating, /area/deltastation/service/electronic_marketing_den) "oau" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/misc/paperbin, @@ -68618,7 +68618,7 @@ /turf/open/floor/iron, /area/deltastation/asteroidcaves/derelictnortheast) "ocp" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /obj/item/tool/pen, /turf/open/floor/iron/dark, @@ -69670,7 +69670,7 @@ /turf/open/floor/iron/dark, /area/deltastation/security/checkpoint) "oph" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/taperecorder, /obj/machinery/light/small{ dir = 1 @@ -69685,7 +69685,7 @@ /turf/open/floor/iron, /area/deltastation/service/electronic_marketing_den) "opq" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/tool/crowbar/red, /obj/item/camera, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, @@ -69985,7 +69985,7 @@ /turf/closed/wall, /area/deltastation/medical/storage) "orR" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/plating, /area/deltastation/service/theater/abandoned) "osd" = ( @@ -70012,7 +70012,7 @@ /turf/open/floor/iron, /area/deltastation/security/prison) "osL" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/turf_decal/tile/transparent/red{ dir = 4 }, @@ -70241,7 +70241,7 @@ /turf/open/floor/iron, /area/deltastation/security/office) "ouV" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, /obj/effect/spawner/random/machinery/random_broken_computer/small/meddata, /turf/open/floor/iron/dark, @@ -71060,7 +71060,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder, /obj/item/tool/pen, /obj/item/tool/stamp/captain, @@ -71102,7 +71102,7 @@ /turf/open/floor/plating/ground/mars/random/cave, /area/deltastation/asteroidcaves/southtunnel) "oCh" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/machinery/microwave{ desc = "Cooks and boils stuff, somehow."; pixel_x = -3; @@ -71112,7 +71112,7 @@ /turf/open/floor/iron/dark, /area/deltastation/tcommsat/computer) "oCi" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /turf/open/floor/wood, /area/deltastation/service/lawoffice) @@ -71441,7 +71441,7 @@ /turf/closed/wall, /area/deltastation/security/prison/safe) "oFw" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/turf_decal/tile/transparent/red{ dir = 4 }, @@ -71499,7 +71499,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/decal/cleanable/dirt, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/radio/intercom{ dir = 8 }, @@ -71624,7 +71624,7 @@ /turf/open/floor/plating, /area/deltastation/service/library/private) "oHg" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /obj/item/tool/stamp/hop, /obj/item/radio/intercom, @@ -71695,7 +71695,7 @@ /turf/open/floor/plating/ground/mars/random/cave, /area/deltastation/maintenance/port/fore) "oHS" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/toy/dice{ pixel_x = 12; pixel_y = 1 @@ -72020,7 +72020,7 @@ /area/deltastation/cargo/storage) "oKT" = ( /obj/effect/spawner/random/misc/structure/directional_window/west, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/taperecorder, /turf/open/floor/iron/grimy, /area/deltastation/command/bridge) @@ -72614,7 +72614,7 @@ /turf/open/floor/plating, /area/deltastation/hallway/secondary/exit) "oSo" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/fancy/candle_box{ pixel_x = 3; pixel_y = 3 @@ -72687,7 +72687,7 @@ /turf/open/floor/plating, /area/deltastation/maintenance/solars/port/fore) "oTe" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/bottle/rum{ pixel_x = 6; pixel_y = 3 @@ -74036,7 +74036,7 @@ /turf/open/floor/iron, /area/deltastation/security/checkpoint/medical/medsci) "phs" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -75582,7 +75582,7 @@ /turf/open/floor/iron, /area/deltastation/security/courtroom) "pwt" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/iron/dark, /area/deltastation/service/library) "pwv" = ( @@ -75645,7 +75645,7 @@ /turf/open/floor/iron/checker, /area/deltastation/hallway/secondary/service) "pxa" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /obj/item/tool/pen, /obj/effect/decal/cleanable/dirt, @@ -75719,7 +75719,7 @@ /obj/structure/sign/securearea{ pixel_x = 32 }, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/door/window{ dir = 8 }, @@ -75928,7 +75928,7 @@ /turf/open/floor/plating, /area/deltastation/maintenance/department/science) "pAj" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/faxmachine{ name = "Head of Personnel's Fax Machine" }, @@ -76295,7 +76295,7 @@ /turf/open/floor/iron, /area/deltastation/maintenance/department/engine/atmos) "pDv" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder, /obj/item/tool/pen, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -77440,7 +77440,7 @@ dir = 8 }, /obj/machinery/light_switch, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /obj/item/tool/pen, /turf/open/floor/wood, @@ -77484,7 +77484,7 @@ /turf/open/floor/iron, /area/storage/testroom) "pOM" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/wallet/random, /obj/effect/landmark/weed_node, /turf/open/floor/wood, @@ -77713,7 +77713,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 5 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/faxmachine{ name = "Psychology Office Fax Machine" }, @@ -77808,7 +77808,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/clothing/glasses/monocle, /turf/open/floor/wood, /area/deltastation/service/theater) @@ -78832,7 +78832,7 @@ /turf/open/floor/plating, /area/deltastation/service/abandoned_gambling_den) "qcX" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/computer/security/wooden_tv, /turf/open/floor/carpet, /area/deltastation/security/detectives_office) @@ -79206,7 +79206,7 @@ /turf/open/floor/iron/white, /area/deltastation/medical/medbay) "qfT" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/box/matches{ pixel_x = -3; pixel_y = 5 @@ -81268,7 +81268,7 @@ /turf/open/floor/plating/ground/mars/random/cave, /area/deltastation/engineering/gravity_generator) "qBa" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet, /area/deltastation/service/library/abandoned) @@ -81741,7 +81741,7 @@ /turf/open/floor/iron, /area/deltastation/maintenance/starboard/aft) "qGa" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/cable, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, /obj/item/phone{ @@ -81939,7 +81939,7 @@ /turf/open/floor/iron/dark/smooth_large, /area/deltastation/security/interrogation) "qIk" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/fancy/crayons, /obj/item/storage/fancy/crayons, /obj/machinery/light/small, @@ -82827,7 +82827,7 @@ /turf/open/floor/iron, /area/deltastation/hallway/primary/starboard) "qQQ" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder, /obj/item/tool/pen, /obj/effect/turf_decal/tile/transparent/green/half/contrasted{ @@ -84289,7 +84289,7 @@ /area/deltastation/service/chapel/office) "rhT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -84308,7 +84308,7 @@ /turf/open/floor/iron, /area/deltastation/hallway/secondary/entry) "rid" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/door/window{ dir = 2; name = "Library Desk" @@ -84484,7 +84484,7 @@ /area/deltastation/security/warden) "rjW" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/trash/cigbutt{ pixel_x = 7 }, @@ -85329,7 +85329,7 @@ /turf/open/floor/iron/dark, /area/deltastation/ai_monitored/turret_protected/aisat_interior) "rso" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/misc/plant{ pixel_y = 10 @@ -85951,7 +85951,7 @@ /turf/open/floor/iron/dark/textured_large, /area/deltastation/science/xenobiology) "rzI" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/tool/pen, /obj/effect/spawner/random/misc/paperbin, /obj/item/tool/pen, @@ -86069,7 +86069,7 @@ /turf/open/floor/wood, /area/deltastation/command/meeting_room/council) "rBj" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/tool/pen, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, @@ -86185,7 +86185,7 @@ /turf/open/floor/iron, /area/deltastation/security/range) "rCx" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp/green, /obj/item/radio/intercom{ dir = 1 @@ -86212,7 +86212,7 @@ /turf/open/floor/iron, /area/deltastation/hallway/secondary/command) "rCK" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/stack/rods, /obj/effect/spawner/random/engineering/cable{ pixel_x = 3; @@ -86406,7 +86406,7 @@ /turf/open/floor/iron, /area/deltastation/maintenance/disposal/incinerator) "rEg" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder, /obj/item/tool/pen, /turf/open/floor/wood, @@ -86604,7 +86604,7 @@ /turf/open/floor/iron, /area/deltastation/engineering/atmos/hfr_room) "rGe" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/cell_charger, /obj/machinery/light/small{ dir = 1 @@ -87504,7 +87504,7 @@ /turf/open/floor/gcircuit, /area/deltastation/science/research/abandoned) "rPz" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/tool/wrench, /obj/item/clothing/under/waiter, /turf/open/floor/iron, @@ -87695,7 +87695,7 @@ "rRI" = ( /obj/effect/spawner/random/misc/structure/directional_window, /obj/structure/cable, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/door/window{ dir = 4; name = "High-Risk Modules" @@ -87726,7 +87726,7 @@ /turf/open/floor/iron/grimy, /area/deltastation/service/library) "rRU" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder, /obj/effect/spawner/random/misc/hand_labeler, /turf/open/floor/carpet, @@ -88727,7 +88727,7 @@ /turf/open/floor/iron, /area/deltastation/science/xenobiology) "sdp" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/machinery/firealarm, /obj/effect/turf_decal/tile/transparent/neutral/half/contrasted, @@ -89050,7 +89050,7 @@ /obj/effect/turf_decal/tile/transparent/neutral{ dir = 8 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, @@ -89087,7 +89087,7 @@ "shn" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/weaponry/weapon_recharger, /turf/open/floor/iron/dark, /area/deltastation/command/heads_quarters/hop) @@ -89227,7 +89227,7 @@ /turf/open/floor/iron, /area/deltastation/command/teleporter) "siB" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /obj/item/reagent_containers/food/snacks/chocolateegg, /turf/open/floor/plating, @@ -89493,7 +89493,7 @@ /turf/open/floor/iron/dark, /area/deltastation/hallway/secondary/service) "slB" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/turf_decal/siding/wood, /obj/effect/spawner/random/misc/structure/directional_window, /obj/item/storage/bag/trash, @@ -89765,7 +89765,7 @@ /turf/open/floor/iron, /area/deltastation/cargo/office) "soE" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /turf/open/floor/iron/grimy, /area/deltastation/service/chapel/office) @@ -90014,7 +90014,7 @@ /turf/open/floor/plating, /area/deltastation/hallway/secondary/entry) "sra" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /obj/item/tool/pen, /obj/structure/extinguisher_cabinet{ @@ -90324,7 +90324,7 @@ /turf/open/floor/carpet, /area/deltastation/asteroidcaves/ship) "stH" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/toy/dice, /obj/machinery/firealarm, /obj/effect/turf_decal/siding/wood{ @@ -90668,7 +90668,7 @@ /turf/open/floor/iron, /area/deltastation/security/brig) "sxg" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/weapon/nullrod, /turf/open/floor/iron/grimy, /area/deltastation/service/chapel/office) @@ -90703,7 +90703,7 @@ /turf/open/floor/plating, /area/deltastation/maintenance/department/eva/abandoned) "sxy" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /turf/open/floor/wood, /area/deltastation/command/meeting_room/council) @@ -91170,7 +91170,7 @@ /turf/open/floor/wood, /area/deltastation/commons/dorms) "sCu" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /obj/item/tool/pen, /turf/open/floor/wood, @@ -92685,7 +92685,7 @@ /turf/closed/wall, /area/deltastation/medical/psychology) "sSb" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/camera, /obj/item/camera_film, /turf/open/floor/wood, @@ -92765,7 +92765,7 @@ /turf/open/floor/iron, /area/deltastation/service/hydroponics/garden) "sTq" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/machinery/random_broken_computer/small/meddata, /obj/structure/sign/securearea{ pixel_x = 32 @@ -93425,7 +93425,7 @@ /turf/closed/wall, /area/deltastation/hallway/primary/central/fore) "sZY" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/machinery/air_alarm{ dir = 1 @@ -93539,7 +93539,7 @@ /turf/open/floor/iron, /area/deltastation/cargo/drone_bay) "tbt" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 5 }, @@ -93782,7 +93782,7 @@ /turf/open/floor/iron, /area/deltastation/maintenance/disposal) "tej" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, /obj/effect/spawner/random/misc/paperbin{ pixel_y = 4 @@ -94234,7 +94234,7 @@ /turf/open/floor/iron, /area/deltastation/commons/locker) "tiC" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/carpet, /area/deltastation/service/library/lounge) "tiG" = ( @@ -94617,7 +94617,7 @@ /turf/open/floor/wood, /area/deltastation/service/electronic_marketing_den) "tmM" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/fancy/candle_box, /obj/machinery/newscaster{ dir = 1 @@ -94763,7 +94763,7 @@ /turf/open/floor/iron, /area/deltastation/science/research/abandoned) "tnV" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder, /obj/item/tool/pen, /turf/open/floor/iron/dark, @@ -94789,7 +94789,7 @@ /turf/open/floor/iron, /area/deltastation/security/holding_cell) "tog" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/iron/grimy, /area/deltastation/service/abandoned_gambling_den) "toj" = ( @@ -95288,7 +95288,7 @@ /area/deltastation/science/lab) "ttv" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/landmark/weed_node, /turf/open/floor/carpet, /area/deltastation/commons/lounge) @@ -95889,7 +95889,7 @@ /turf/open/floor/iron/dark, /area/deltastation/command/meeting_room/council) "tzi" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/computer/security/wooden_tv, /turf/open/floor/carpet, /area/deltastation/command/heads_quarters/captain) @@ -96337,7 +96337,7 @@ /turf/open/floor/iron, /area/deltastation/hallway/secondary/entry) "tEp" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/carpet, /area/deltastation/commons/lounge) "tEJ" = ( @@ -96347,7 +96347,7 @@ /turf/open/floor/iron, /area/deltastation/asteroidcaves/derelictwest) "tEN" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /turf/open/floor/carpet, /area/deltastation/hallway/secondary/service) @@ -96599,7 +96599,7 @@ /turf/closed/mineral/smooth/indestructible, /area/deltastation/medical/virology) "tHF" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder, /obj/item/tool/pen, /turf/open/floor/wood, @@ -97343,7 +97343,7 @@ /turf/open/floor/iron, /area/deltastation/commons/lounge) "tOy" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/turf_decal/tile/transparent/neutral/half/contrasted, /turf/open/floor/iron, /area/deltastation/security/courtroom) @@ -97651,7 +97651,7 @@ /turf/open/floor/plating/ground/mars/random/cave, /area/deltastation/engineering/lobby) "tRI" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -97823,7 +97823,7 @@ /turf/open/floor/iron/dark/side, /area/deltastation/asteroidcaves/derelictsatellite) "tTo" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/clipboard, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/transparent/red{ @@ -98191,7 +98191,7 @@ /turf/open/floor/iron, /area/deltastation/engineering/atmos/project) "tWV" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder, /obj/effect/spawner/random/clothing/sunglasses{ pixel_x = 3; @@ -98229,7 +98229,7 @@ /turf/open/floor/iron, /area/deltastation/maintenance/port/fore) "tXr" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/light/small{ dir = 8 }, @@ -98507,7 +98507,7 @@ /turf/open/floor/wood, /area/deltastation/medical/psychology) "uad" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/computer/security/wooden_tv, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -98562,7 +98562,7 @@ /turf/closed/wall, /area/deltastation/security/execution/transfer) "ubb" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder, /obj/item/tool/pen, /obj/effect/turf_decal/tile/transparent/neutral/anticorner/contrasted{ @@ -98790,7 +98790,7 @@ /turf/closed/wall, /area/deltastation/service/library/private) "uee" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder, /obj/item/tool/pen, /turf/open/floor/carpet, @@ -98855,7 +98855,7 @@ /turf/open/floor/iron/dark, /area/deltastation/maintenance/port) "ueN" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/item/taperecorder, @@ -99296,7 +99296,7 @@ /turf/open/floor/plating, /area/deltastation/commons/toilet/restrooms) "uiI" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/toy/dice, /turf/open/floor/iron/grimy, /area/deltastation/service/abandoned_gambling_den) @@ -99683,7 +99683,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/taperecorder, /obj/item/camera, /turf/open/floor/iron/dark, @@ -99757,13 +99757,13 @@ /turf/open/floor/iron/dark/textured, /area/deltastation/science/ordnance/storage) "ung" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/briefcase, /obj/item/taperecorder, /turf/open/floor/wood, /area/deltastation/service/electronic_marketing_den) "unk" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/structure/directional_window/east, /obj/effect/spawner/random/misc/paperbin, /obj/item/radio/intercom, @@ -99981,7 +99981,7 @@ /turf/open/floor/iron, /area/deltastation/engineering/atmos) "upb" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder, /obj/item/tool/pen, /obj/effect/turf_decal/tile/transparent/neutral/anticorner/contrasted{ @@ -100098,7 +100098,7 @@ /obj/effect/turf_decal/tile/transparent/neutral{ dir = 8 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/baguette, /obj/structure/sign/securearea, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -100629,7 +100629,7 @@ /turf/open/floor/plating, /area/deltastation/external/landingzone) "uwb" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/light_switch, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, /obj/effect/spawner/random/misc/paperbin, @@ -100649,7 +100649,7 @@ id = "Dorm4"; name = "Dormitory Door Lock" }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/grown/poppy, /turf/open/floor/wood, /area/deltastation/commons/dorms) @@ -100901,7 +100901,7 @@ /area/deltastation/hallway/primary/central/fore) "uyw" = ( /obj/structure/cable, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/cigar{ pixel_x = 3 }, @@ -101498,7 +101498,7 @@ /area/deltastation/asteroidcaves/ship/two) "uFU" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/book/manual/engineering_hacking, /turf/open/floor/plating, /area/deltastation/service/abandoned_gambling_den) @@ -102467,7 +102467,7 @@ /turf/open/floor/plating/ground/mars/random/cave, /area/deltastation/asteroidcaves/northeastcaves) "uPm" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/deltastation/service/abandoned_gambling_den) @@ -102626,7 +102626,7 @@ /obj/effect/turf_decal/tile/transparent/neutral/half/contrasted{ dir = 1 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/iron, /area/deltastation/commons/fitness/recreation) "uQC" = ( @@ -103118,7 +103118,7 @@ /turf/open/floor/iron/white, /area/deltastation/medical/virology) "uVU" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/turf_decal/tile/transparent/neutral/half/contrasted{ dir = 1 }, @@ -103143,7 +103143,7 @@ /area/deltastation/engineering/storage/tech) "uWc" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/tool/wrench, /turf/open/floor/plating, /area/deltastation/service/theater/abandoned) @@ -103245,7 +103245,7 @@ /turf/closed/wall, /area/deltastation/medical/surgery/theatre) "uXl" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/camera, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, /obj/item/book/manual/security_space_law, @@ -103497,7 +103497,7 @@ /turf/open/floor/iron, /area/deltastation/maintenance/starboard/aft) "uZU" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/machinery/microwave{ desc = "Cooks and boils stuff, somehow."; pixel_x = -3; @@ -103550,7 +103550,7 @@ /turf/open/floor/prison/blackfloor, /area/deltastation/asteroidcaves/ship/two) "vat" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/packageWrap{ pixel_x = -4; pixel_y = 6 @@ -104293,7 +104293,7 @@ /turf/open/floor/iron, /area/deltastation/service/electronic_marketing_den) "vid" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/clipboard, /obj/effect/spawner/random/misc/folder, /obj/effect/decal/cleanable/dirt, @@ -104410,7 +104410,7 @@ /turf/open/floor/plating, /area/deltastation/science/ordnance/bomb) "vje" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/briefcase{ pixel_x = 3; pixel_y = 3 @@ -104590,7 +104590,7 @@ /turf/open/floor/iron/dark/textured_half, /area/deltastation/engineering/atmos/storage/gas) "vkP" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/circuitboard/airlock, /turf/open/floor/wood, /area/deltastation/service/electronic_marketing_den) @@ -104731,7 +104731,7 @@ /turf/open/floor/iron, /area/deltastation/security/lockers) "vmq" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/sandedge/corner2{ @@ -104899,7 +104899,7 @@ /turf/open/floor/wood, /area/deltastation/service/abandoned_gambling_den) "vnD" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/turf_decal/tile/transparent/blue/anticorner/contrasted{ dir = 1 }, @@ -105615,7 +105615,7 @@ dir = 4 }, /obj/machinery/light/small, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin{ pixel_x = 5; pixel_y = 3 @@ -105785,7 +105785,7 @@ /turf/open/floor/prison/redfloor, /area/deltastation/asteroidcaves/ship) "vwL" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, /obj/effect/spawner/random/machinery/microwave{ desc = "Cooks and boils stuff, somehow."; @@ -106233,7 +106233,7 @@ /turf/open/floor/plating, /area/deltastation/service/library/private) "vAJ" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/prop/keycardauth, /obj/item/flashlight/lamp, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, @@ -106319,7 +106319,7 @@ /turf/open/floor/iron, /area/deltastation/service/hydroponics/garden) "vBL" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /turf/open/floor/wood, /area/deltastation/commons/dorms) @@ -106599,7 +106599,7 @@ /turf/open/floor/carpet, /area/deltastation/hallway/secondary/service) "vER" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, /turf/open/floor/iron/dark, /area/deltastation/service/theater/abandoned) @@ -107211,7 +107211,7 @@ /turf/open/floor/iron, /area/deltastation/maintenance/port/aft) "vKt" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/structure/directional_window/west, /turf/open/floor/carpet, /area/deltastation/commons/vacant_room/office) @@ -107241,7 +107241,7 @@ /turf/open/floor/iron/checker, /area/deltastation/security/interrogation) "vKN" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /turf/open/floor/carpet, /area/deltastation/service/library/abandoned) @@ -107332,7 +107332,7 @@ /obj/machinery/light, /obj/item/flashlight/lamp, /obj/machinery/air_alarm, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/light{ dir = 4 }, @@ -107675,7 +107675,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/carpet, /area/deltastation/security/detectives_office) "vPi" = ( @@ -107935,7 +107935,7 @@ /turf/closed/wall/r_wall, /area/deltastation/security/detectives_office) "vSZ" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder, /obj/item/tool/lighter, /obj/machinery/newscaster, @@ -108906,12 +108906,12 @@ /turf/open/floor/iron/dark, /area/deltastation/ai_monitored/turret_protected/aisat_interior) "wct" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/camera, /turf/open/floor/wood, /area/deltastation/command/heads_quarters/captain) "wcE" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/fancy/crayons, /turf/open/floor/carpet, /area/deltastation/service/chapel/office) @@ -109241,7 +109241,7 @@ /area/deltastation/cargo/storage) "wgn" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/iron, /area/deltastation/service/abandoned_gambling_den) "wgq" = ( @@ -109475,7 +109475,7 @@ /turf/open/floor/engine, /area/deltastation/asteroidcaves/derelictwest) "wip" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/coin/phoron{ pixel_x = -4; pixel_y = 4 @@ -109918,7 +109918,7 @@ /turf/open/floor/plating, /area/deltastation/hallway/secondary/construction) "wmC" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/deltastation/command/meeting_room/council) "wmE" = ( @@ -109967,7 +109967,7 @@ /turf/open/floor/iron, /area/deltastation/security/office) "wmZ" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/door/firedoor, /turf/open/floor/iron/smooth_half{ dir = 1 @@ -111639,7 +111639,7 @@ /turf/open/floor/plating, /area/deltastation/maintenance/department/science) "wDj" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/secure/briefcase{ pixel_x = 3; pixel_y = 3 @@ -111863,7 +111863,7 @@ /turf/open/floor/iron, /area/deltastation/maintenance/department/crew_quarters/bar) "wFM" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder{ pixel_x = 3; pixel_y = 3 @@ -112590,7 +112590,7 @@ /turf/open/floor/iron, /area/deltastation/engineering/storage_shared) "wMD" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/light{ dir = 1 }, @@ -113161,7 +113161,7 @@ /turf/open/floor/iron/dark, /area/deltastation/science/genetics) "wSs" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/clothing/suit/syndicatefake, /obj/item/clothing/head/syndicatefake, /obj/effect/decal/cleanable/dirt, @@ -113964,7 +113964,7 @@ /turf/open/floor/iron, /area/deltastation/science/robotics/lab) "xcO" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/cigarettes{ pixel_x = 3; pixel_y = 3 @@ -113996,7 +113996,7 @@ /turf/open/floor/iron, /area/deltastation/hallway/secondary/command) "xcT" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/clipboard, /turf/open/floor/wood, /area/deltastation/service/electronic_marketing_den) @@ -114627,7 +114627,7 @@ /turf/closed/wall/r_wall, /area/deltastation/maintenance/port/aft) "xji" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /turf/open/floor/carpet, /area/deltastation/command/meeting_room/council) @@ -114720,7 +114720,7 @@ /turf/open/floor/plating, /area/deltastation/engineering/supermatter/room) "xkl" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random_set/sidearms, /turf/open/floor/wood, /area/deltastation/service/electronic_marketing_den) @@ -114885,7 +114885,7 @@ /turf/open/floor/iron, /area/deltastation/asteroidcaves/derelictnortheast) "xmf" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/pinpointer, /obj/item/radio/intercom{ dir = 4 @@ -115145,7 +115145,7 @@ /turf/open/floor/iron, /area/deltastation/cargo/miningoffice) "xpm" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/toy/deck{ pixel_x = -5; pixel_y = 5 @@ -115180,7 +115180,7 @@ /turf/open/floor/iron, /area/deltastation/science/robotics/lab) "xpv" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder, /obj/item/tool/pen, /turf/open/floor/iron/grimy, @@ -115906,7 +115906,7 @@ /area/deltastation/maintenance/department/chapel) "xxm" = ( /obj/structure/cable, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/taperecorder, /obj/effect/spawner/random/misc/handcuffs, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, @@ -116480,7 +116480,7 @@ }, /area/deltastation/engineering/lobby) "xBE" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/clipboard, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -116775,7 +116775,7 @@ /turf/open/floor/iron, /area/deltastation/maintenance/port/fore) "xEE" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/sign/securearea{ pixel_x = -3; pixel_y = -3 @@ -117441,7 +117441,7 @@ /turf/open/space, /area/space) "xKI" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/clipboard, /turf/open/floor/iron/grimy, /area/deltastation/command/heads_quarters/captain) @@ -117579,7 +117579,7 @@ /turf/closed/wall, /area/deltastation/engineering/atmos/storage) "xLW" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/fancy/candle_box, /turf/open/floor/carpet, /area/deltastation/service/chapel/office) @@ -118331,7 +118331,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/transparent/red, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/instrument/bikehorn, /obj/structure/sign/securearea, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -118495,7 +118495,7 @@ /area/deltastation/maintenance/department/science/xenobiology) "xUR" = ( /obj/item/instrument/violin, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /obj/structure/sign/securearea, /obj/machinery/air_alarm, @@ -118704,7 +118704,7 @@ /turf/open/floor/iron/dark, /area/deltastation/asteroidcaves/derelictnortheast) "xXk" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder, /obj/item/tool/pen/red, /turf/open/floor/wood, @@ -118947,7 +118947,7 @@ /turf/open/floor/iron, /area/deltastation/cargo/sorting) "xZG" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/door/window{ name = "High-Risk Modules" }, @@ -119130,7 +119130,7 @@ /turf/open/floor/plating, /area/deltastation/maintenance/port/aft) "yaO" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder, /obj/item/tool/pen, /turf/open/floor/iron/grimy, @@ -119497,7 +119497,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/folder, /obj/effect/turf_decal/tile/transparent/red{ dir = 1 @@ -119902,7 +119902,7 @@ /turf/open/floor/iron/white, /area/deltastation/medical/medbay) "yiS" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/clipboard, /obj/effect/spawner/random/misc/folder, /turf/open/floor/carpet, @@ -120133,7 +120133,7 @@ /turf/open/floor/plating, /area/deltastation/security/range) "ykX" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/engineering/assemblies, /obj/effect/spawner/random/engineering/assemblies, /obj/effect/spawner/random/engineering/assemblies{ diff --git a/_maps/map_files/desparity/desparity.dmm b/_maps/map_files/desparity/desparity.dmm index c7b7fb5305f..c7fcc36dd33 100644 --- a/_maps/map_files/desparity/desparity.dmm +++ b/_maps/map_files/desparity/desparity.dmm @@ -335,7 +335,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/taperecorder, /obj/machinery/chem_dispenser/beer{ dir = 8; @@ -486,7 +486,7 @@ /turf/open/floor/plating, /area/lv624/lazarus/hydroponics) "cX" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/lv624/lazarus/captain) "cY" = ( @@ -1829,7 +1829,7 @@ /area/lv624/lazarus/medbay) "jC" = ( /obj/structure/cable, -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/toy/deck/kotahi, /turf/open/floor/wood/broken, /area/lv624/lazarus/bar) @@ -1879,7 +1879,7 @@ /turf/open/floor/tile/dark, /area/lv624/lazarus/research/caves) "jU" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/toy/dice/d20, /turf/open/floor/wood, /area/lv624/lazarus/bar) @@ -3175,7 +3175,7 @@ dir = 8 }, /obj/structure/cable, -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/toy/deck, /turf/open/floor/wood, /area/lv624/lazarus/bar) @@ -3213,7 +3213,7 @@ /area/lv624/lazarus/medbay) "qX" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/chem_dispenser/soda{ dir = 4 }, @@ -3245,7 +3245,7 @@ }, /area/lv624/lazarus/medbay) "rb" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/syndicake, /obj/structure/cable, /turf/open/floor/wood, @@ -3778,7 +3778,7 @@ /obj/effect/turf_decal/siding{ dir = 1 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/fancy/candle_box, /turf/open/floor/wood, /area/lv624/lazarus/chapel) @@ -4316,7 +4316,7 @@ /obj/effect/turf_decal/siding{ dir = 1 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/bottle/holywater, /turf/open/floor/wood, /area/lv624/lazarus/chapel) @@ -4681,7 +4681,7 @@ /turf/open/floor/tile/dark/blue2/corner, /area/lv624/lazarus/research/caves) "yA" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = 3; pixel_y = 3 @@ -5048,7 +5048,7 @@ /obj/effect/turf_decal/siding{ dir = 1 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/weapon/nullrod, /obj/effect/spawner/random/weaponry/gun, /turf/open/floor/wood, @@ -6102,7 +6102,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/flask/vacuumflask, /turf/open/floor/wood, /area/lv624/lazarus/bar) @@ -6481,7 +6481,7 @@ /area/lv624/ground/jungle10) "HB" = ( /obj/machinery/computer/secure_data, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/light{ dir = 1 }, @@ -7826,7 +7826,7 @@ /obj/effect/turf_decal/siding{ dir = 1 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/clothing/suit/chaplain_hoodie, /obj/item/clothing/head/chaplain_hood{ pixel_y = 9 @@ -9280,7 +9280,7 @@ /area/lv624/ground/jungle9) "Vl" = ( /obj/machinery/computer/med_data/laptop, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /turf/open/floor/grimy, /area/lv624/lazarus/captain) @@ -9409,7 +9409,7 @@ /turf/open/floor/plating, /area/lv624/lazarus/spaceport2) "VQ" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/atmospherics/pipe/simple/green/hidden, /turf/open/floor/wood, /area/lv624/lazarus/captain) @@ -9882,7 +9882,7 @@ /turf/open/floor/tile/blue/whitebluefull, /area/lv624/lazarus/medbay) "Yf" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/trash/cigbutt/cigarbutt, /obj/machinery/cell_charger, /obj/effect/spawner/random/misc/cigarettes, diff --git a/_maps/map_files/gelida_iv/gelida_iv.dmm b/_maps/map_files/gelida_iv/gelida_iv.dmm index 4b810a6576e..d9f3b4f57c5 100644 --- a/_maps/map_files/gelida_iv/gelida_iv.dmm +++ b/_maps/map_files/gelida_iv/gelida_iv.dmm @@ -639,7 +639,7 @@ }, /area/gelida/landing_zone_forecon/landing_zone_4) "auR" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/light{ dir = 4 }, @@ -1520,7 +1520,7 @@ /turf/open/floor/prison/whitegreenfull2, /area/gelida/indoors/a_block/fitness) "bbB" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/structure/cable, /turf/open/floor/prison, /area/gelida/indoors/c_block/casino) @@ -2144,7 +2144,7 @@ /turf/open/floor/plating/ground/snow/layer0, /area/gelida/outdoors/colony_streets/south_street) "bvF" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/reagent_containers/food/drinks/flask/detflask{ pixel_x = -6; pixel_y = 8 @@ -2763,7 +2763,7 @@ /turf/open/floor/prison/whitegreenfull2, /area/gelida/indoors/b_block/hydro) "bRH" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/storage/fancy/cigar{ pixel_y = 5 }, @@ -3151,7 +3151,7 @@ /turf/open/floor/prison, /area/gelida/indoors/a_block/admin) "cgL" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/flashlight/lamp/green{ pixel_x = 3 }, @@ -3229,7 +3229,7 @@ /turf/open/floor/prison, /area/gelida/indoors/a_block/dorms) "cjN" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/reagent_containers/food/drinks/bottle/whiskey{ pixel_x = -7; pixel_y = 18 @@ -3426,7 +3426,7 @@ /turf/open/floor/plating/ground/desertdam/asphalt/edge/regular, /area/gelida/outdoors/colony_streets/south_west_street) "csk" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/ashtray/bronze{ pixel_x = 6; pixel_y = -5 @@ -3711,7 +3711,7 @@ /turf/open/floor/prison/plate, /area/gelida/indoors/a_block/admin) "cBm" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/computer/security/wooden_tv, /turf/open/floor/wood, /area/gelida/indoors/a_block/executive) @@ -4101,7 +4101,7 @@ }, /area/gelida/indoors/a_block/executive) "cMr" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/trash/plate, /turf/open/floor/carpet, /area/gelida/indoors/b_block/bar) @@ -4366,7 +4366,7 @@ /turf/open/floor/mainship/stripesquare, /area/gelida/indoors/c_block/bridge) "cVN" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/trash/plate{ pixel_y = 6 }, @@ -4701,7 +4701,7 @@ /turf/open/floor/prison, /area/gelida/indoors/a_block/kitchen) "dgQ" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/recharger{ pixel_y = 1 }, @@ -4989,7 +4989,7 @@ /turf/open/floor/plating/ground/ice, /area/gelida/caves/east_caves) "drZ" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/reagent_containers/food/drinks/bottle/whiskey{ pixel_x = -7; pixel_y = 18 @@ -5099,7 +5099,7 @@ /turf/open/floor/tile/yellow/patch, /area/gelida/indoors/a_block/corpo) "dvJ" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/storage/pill_bottle/happy{ pixel_x = 7; pixel_y = 17 @@ -5249,7 +5249,7 @@ /turf/open/floor/prison/plate, /area/gelida/indoors/lone_buildings/storage_blocks) "dAQ" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/flashlight/lamp/green{ pixel_x = -7; pixel_y = 13 @@ -5571,7 +5571,7 @@ /turf/open/floor/mainship/stripesquare, /area/gelida/indoors/b_block/bridge) "dLu" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/prop/computer/PC{ pixel_y = 3 }, @@ -5921,7 +5921,7 @@ /turf/open/floor/prison, /area/gelida/indoors/c_block/cargo) "dWH" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/machinery/atmospherics/pipe/simple/green/hidden, /turf/open/floor/prison, /area/gelida/indoors/c_block/casino) @@ -8970,7 +8970,7 @@ /turf/open/floor/carpet, /area/gelida/indoors/c_block/casino) "gce" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/storage/fancy/cigar{ pixel_y = 7 }, @@ -9211,7 +9211,7 @@ /turf/open/floor/plating/heatinggrate, /area/gelida/indoors/b_block/bridge) "glm" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/flashlight/lamp/green{ pixel_y = 13 }, @@ -9290,7 +9290,7 @@ }, /area/gelida/landing_zone_forecon/landing_zone_4) "gmM" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/weapon/cane, /turf/open/floor/tile/yellow/patch, /area/gelida/indoors/a_block/corpo) @@ -11546,7 +11546,7 @@ pixel_x = -1; pixel_y = 7 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/tool/wrench{ pixel_y = -6 }, @@ -12946,7 +12946,7 @@ /turf/open/floor/prison/whitegreen/full, /area/gelida/indoors/a_block/medical) "iKQ" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/misc/cigarettes{ pixel_y = 4 }, @@ -12986,7 +12986,7 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/gelida/indoors/c_block/mining) "iLP" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /turf/open/floor/prison/cleanmarked, /area/gelida/landing_zone_forecon/landing_zone_4) "iLU" = ( @@ -13546,7 +13546,7 @@ /turf/open/floor/prison/darkbrown/full, /area/gelida/indoors/c_block/mining) "jgO" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /turf/open/floor/prison, /area/gelida/indoors/c_block/casino) "jhc" = ( @@ -14054,7 +14054,7 @@ /turf/open/floor/prison/cleanmarked, /area/gelida/indoors/lone_buildings/storage_blocks) "jBn" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/computer/security/wooden_tv{ desc = "An old TV hooked up to a video cassette recorder, you can even use it to time shift WOW."; dir = 8; @@ -17432,7 +17432,7 @@ /turf/open/floor/plating/ground/snow/layer0, /area/gelida/outdoors/colony_streets/north_east_street) "lQD" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/misc/paperbin{ pixel_y = 8 }, @@ -18432,7 +18432,7 @@ /turf/open/floor/prison/sterilewhite/full, /area/gelida/indoors/a_block/medical) "mxk" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/clothing/suit/storage/snow_suit, /obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = -1; @@ -18513,7 +18513,7 @@ /turf/open/floor/prison/whitegreen/full, /area/gelida/indoors/a_block/fitness) "mzo" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/reagentgrinder{ pixel_x = 3; pixel_y = 5 @@ -19323,7 +19323,7 @@ /turf/open/floor/plating, /area/gelida/powergen) "ndU" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/reagent_containers/food/drinks/bottle/whiskey{ pixel_x = -7; pixel_y = 15 @@ -19733,7 +19733,7 @@ /turf/open/floor/prison/plate, /area/gelida/outdoors/colony_streets/north_west_street) "nsv" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/flashlight/lamp/green, /turf/open/floor/wood, /area/gelida/indoors/a_block/executive) @@ -19768,7 +19768,7 @@ /turf/open/floor/prison, /area/gelida/indoors/b_block/bar) "nsJ" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/machinery/atmospherics/pipe/manifold/green/hidden{ dir = 4 }, @@ -19803,7 +19803,7 @@ /turf/open/floor/plating/ground/ice, /area/gelida/caves/central_caves) "ntN" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/bible, /turf/open/floor/tile/dark2{ dir = 8 @@ -20665,7 +20665,7 @@ /turf/open/floor/prison/plate, /area/gelida/indoors/a_block/executive) "nXE" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/misc/folder/nooffset{ pixel_y = 8 }, @@ -21086,7 +21086,7 @@ /turf/open/floor/plating, /area/gelida/indoors/a_block/bridges/garden_bridge) "omj" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/flashlight/lamp{ pixel_x = 4; pixel_y = 14 @@ -21510,7 +21510,7 @@ /turf/open/floor/prison, /area/gelida/outdoors/colony_streets/north_west_street) "oCo" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/flashlight/lamp/green{ pixel_y = 2 }, @@ -24113,7 +24113,7 @@ /turf/open/floor/mainship/black/full, /area/gelida/indoors/b_block/bridge) "qju" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = 14; pixel_y = 9 @@ -24945,7 +24945,7 @@ pixel_x = 12; pixel_y = 16 }, -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /turf/open/floor/carpet, /area/gelida/indoors/c_block/casino) "qNH" = ( @@ -25163,7 +25163,7 @@ /turf/open/shuttle/dropship/three, /area/gelida/landing_zone_forecon/UD6_Typhoon) "qUZ" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = 6; pixel_y = 12 @@ -25200,7 +25200,7 @@ /turf/open/floor/plating/ground/snow/layer0, /area/gelida/outdoors/colony_streets/south_east_street) "qVZ" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/ashtray/bronze{ pixel_x = -7; pixel_y = 4 @@ -26615,7 +26615,7 @@ /turf/open/floor/plating/ground/snow/layer0, /area/gelida/outdoors/colony_streets/south_east_street) "rQq" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/toy/deck{ pixel_x = 4; pixel_y = 5 @@ -27252,7 +27252,7 @@ /turf/open/floor/prison/sterilewhite/full, /area/gelida/indoors/a_block/corpo) "soH" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /turf/open/floor/wood, /area/gelida/indoors/b_block/bar) "soJ" = ( @@ -27496,7 +27496,7 @@ }, /area/gelida/outdoors/colony_streets/north_east_street) "swV" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/toy/deck{ pixel_x = 4; pixel_y = 12 @@ -27742,7 +27742,7 @@ /turf/open/floor/plating/ground/snow/layer0, /area/gelida/outdoors/colony_streets/north_east_street) "sEt" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /turf/open/floor/carpet, /area/gelida/indoors/b_block/bar) "sEJ" = ( @@ -27978,7 +27978,7 @@ /turf/open/floor/plating/ground/desertdam/asphalt/edge/regular, /area/gelida/landing_zone_2) "sMK" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/trash/plate, /obj/item/trash/plate{ pixel_x = 3; @@ -28902,7 +28902,7 @@ }, /area/gelida/indoors/a_block/dorms) "ttT" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = 13; pixel_y = 17 @@ -28937,7 +28937,7 @@ /turf/open/floor/plating/ground/snow/layer1, /area/gelida/outdoors/colony_streets/south_east_street) "tvS" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/flashlight/lamp{ pixel_x = 7; pixel_y = 14 @@ -28952,7 +28952,7 @@ /turf/open/floor/prison/plate, /area/gelida/indoors/a_block/admin) "tww" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/reagent_containers/food/drinks/bottle/sake{ pixel_x = 3; pixel_y = 13 @@ -28989,7 +28989,7 @@ /turf/open/floor/prison, /area/gelida/indoors/a_block/admin) "txz" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /turf/open/floor/wood, /area/gelida/indoors/c_block/casino) "txG" = ( @@ -30346,7 +30346,7 @@ }, /area/gelida/indoors/a_block/dorms) "uzH" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/trash/hotdog{ pixel_x = -2; pixel_y = -4 @@ -30945,7 +30945,7 @@ /turf/open/floor/plating/ground/snow/layer0, /area/gelida/landing_zone_1) "uUx" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/flashlight/lamp/green{ pixel_y = 13 }, @@ -32065,7 +32065,7 @@ /turf/open/floor/plating, /area/gelida/indoors/c_block/garage) "vHE" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/radio/off{ pixel_x = 6; pixel_y = 7 @@ -32405,7 +32405,7 @@ }, /area/gelida/outdoors/colony_streets/north_west_street) "vVd" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/clothing/suit/storage/snow_suit, /turf/open/floor/carpet, /area/gelida/indoors/b_block/bar) @@ -32514,7 +32514,7 @@ /turf/open/floor/prison/darkbrown/full, /area/gelida/indoors/c_block/casino) "war" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/spacecash/bundle/c500{ pixel_x = -7; pixel_y = 10 @@ -33504,7 +33504,7 @@ /turf/open/shuttle/dropship/floor, /area/gelida/landing_zone_forecon/UD6_Typhoon) "wMf" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = 12; pixel_y = 17 @@ -33534,7 +33534,7 @@ /turf/open/floor/prison, /area/gelida/outdoors/colony_streets/north_west_street) "wMz" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/toy/deck{ pixel_x = 4; pixel_y = 12 @@ -33934,7 +33934,7 @@ /turf/open/floor/tile/dark2, /area/gelida/indoors/c_block/mining) "xeS" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/toy/deck{ pixel_x = 2; pixel_y = 4 @@ -33965,7 +33965,7 @@ }, /area/gelida/outdoors/colony_streets/north_street) "xhe" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/prop/computer/PC{ dir = 4; pixel_y = 3 diff --git a/_maps/map_files/generic/Admin_Level.dmm b/_maps/map_files/generic/Admin_Level.dmm index de030817734..eeed6aadf17 100644 --- a/_maps/map_files/generic/Admin_Level.dmm +++ b/_maps/map_files/generic/Admin_Level.dmm @@ -262,7 +262,7 @@ /turf/open/floor/tile/red/yellowfull, /area/tdome/tdomeadmin) "cRJ" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/food_or_drink/drink_alcohol_bottle, /turf/open/floor/mainship/metal/full, /area/centcom/valhalla) @@ -312,7 +312,7 @@ pixel_x = 1; pixel_y = 15 }, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/reagent_containers/food/drinks/bottle/whiskey{ pixel_x = 9; pixel_y = 15 @@ -739,7 +739,7 @@ /turf/open/floor/wood, /area/tdome/tdomeobserve) "kHt" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/reagent_dispensers/beerkeg, /turf/open/floor/wood, /area/tdome/tdomeobserve) @@ -860,7 +860,7 @@ /area/tdome) "myT" = ( /obj/effect/turf_decal/tile/metal/medical, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/chem_dispenser/beer/nopower{ dir = 1 }, @@ -893,7 +893,7 @@ /turf/open/floor, /area/tdome) "mKq" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp/green{ pixel_x = -7; pixel_y = 12 @@ -1253,7 +1253,7 @@ /area/centcom/valhalla) "rei" = ( /obj/effect/turf_decal/tile/metal/medical, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/chem_dispenser/soda/nopower{ dir = 1 }, @@ -1434,7 +1434,7 @@ /turf/open/floor/plating/ground/mars/random/cave, /area/centcom/valhalla/xenocave) "tsg" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/tdome/tdomeobserve) "tuZ" = ( diff --git a/_maps/map_files/icy_caves/icy_caves.dmm b/_maps/map_files/icy_caves/icy_caves.dmm index e5bac2e7638..816212ba008 100644 --- a/_maps/map_files/icy_caves/icy_caves.dmm +++ b/_maps/map_files/icy_caves/icy_caves.dmm @@ -1606,7 +1606,7 @@ /turf/open/floor/tile/purple/whitepurplefull, /area/icy_caves/caves/northwestmonorail/medbay) "jg" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/landmark/corpsespawner/colonist, /obj/effect/decal/cleanable/blood, /obj/effect/spawner/random/misc/plushie, @@ -1620,7 +1620,7 @@ /area/icy_caves/caves/northwestmonorail/morgue) "jm" = ( /obj/item/toy/dice/d20, -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /turf/open/floor/wood, /area/icy_caves/caves/underground_cafeteria) "jo" = ( @@ -3527,7 +3527,7 @@ /turf/closed/wall/r_wall, /area/icy_caves/outpost/LZ1) "sL" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/tool/kitchen/knife/ritual, /obj/effect/decal/cleanable/blood, /turf/open/floor/cult, @@ -5953,7 +5953,7 @@ /turf/open/floor/tile/dark, /area/icy_caves/outpost/dorms) "Fe" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/effect/spawner/random/weaponry/gun, /turf/open/floor/wood, /area/icy_caves/caves/underground_cafeteria) @@ -6253,7 +6253,7 @@ }, /area/icy_caves/outpost/medbay) "Gq" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/bible/booze, /obj/item/reagent_containers/food/drinks/bottle/vodka, /obj/effect/spawner/random/weaponry/gun, @@ -8150,7 +8150,7 @@ /turf/open/floor/wood, /area/icy_caves/caves/underground_cafeteria) "PX" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/item/tool/pen/blue{ pixel_x = 5 @@ -8465,7 +8465,7 @@ /turf/open/floor/tile/dark, /area/icy_caves/caves/northwestmonorail/morgue) "Ru" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /obj/item/tool/stamp, /turf/open/floor/wood, diff --git a/_maps/map_files/kutjevo/kutjevo.dmm b/_maps/map_files/kutjevo/kutjevo.dmm index bd133574c59..642c2db0a06 100644 --- a/_maps/map_files/kutjevo/kutjevo.dmm +++ b/_maps/map_files/kutjevo/kutjevo.dmm @@ -3894,7 +3894,7 @@ /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/complex/med) "ejT" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /turf/open/floor/plating/ground/mars/random/sand, /area/kutjevo/interior/oob/dev_room) "ekh" = ( @@ -5538,7 +5538,7 @@ /turf/open/floor/mainship/research/containment/floor1, /area/kutjevo/interior/filtration) "fSK" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/toy/deck/kotahi, /obj/structure/cable, /turf/open/floor/plating/ground/mars/random/sand, @@ -9640,7 +9640,7 @@ /turf/open/floor/mainship/research/containment/floor1, /area/kutjevo/interior/complex/botany) "kzJ" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/bottle/sake, /turf/open/floor/plating/ground/mars/dirttosand/autosmooth, /area/kutjevo/exterior/colony_N_East) @@ -15698,7 +15698,7 @@ /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/power) "qIi" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/effect/spawner/random/engineering/tool, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/construction) @@ -19437,7 +19437,7 @@ /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/power) "uDm" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/construction) "uDH" = ( @@ -21404,7 +21404,7 @@ /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/filtration) "wAo" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/toy/deck/kotahi, /obj/effect/landmark/weed_node, /turf/open/floor/kutjevo/tan, @@ -22146,7 +22146,7 @@ /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/filtration) "xra" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /turf/open/floor/plating/ground/mars/dirttosand/autosmooth, /area/kutjevo/interior/oob/dev_room) "xrb" = ( diff --git a/_maps/map_files/oscar_outpost/oscar_outpost.dmm b/_maps/map_files/oscar_outpost/oscar_outpost.dmm index 57274012f98..122d3c2da73 100644 --- a/_maps/map_files/oscar_outpost/oscar_outpost.dmm +++ b/_maps/map_files/oscar_outpost/oscar_outpost.dmm @@ -399,12 +399,12 @@ /turf/open/floor/tile/dark, /area/oscar_outpost/base) "cT" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/structure/prop/mainship/gelida/register, /turf/open/floor/tile/dark, /area/oscar_outpost/base) "cV" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/clothing/head/soft/red, /obj/item/clothing/head/soft/red, /obj/item/clothing/head/soft/red, @@ -420,7 +420,7 @@ /turf/open/floor/tile/dark, /area/oscar_outpost/base) "cY" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /turf/open/floor, /area/oscar_outpost/village) "da" = ( @@ -513,7 +513,7 @@ /turf/open/floor, /area/oscar_outpost/village/south) "dK" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/toy/deck/kotahi, /obj/item/toy/deck/kotahi, /obj/item/toy/deck/kotahi, @@ -562,7 +562,7 @@ }, /area/oscar_outpost/outside/west) "el" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/structure/prop/mainship/gelida/register, /turf/open/floor, /area/oscar_outpost/village/south) @@ -676,11 +676,11 @@ /area/oscar_outpost/village/east) "eT" = ( /obj/item/clothing/suit/storage/marine/smartgunner, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/oscar_outpost/base) "eW" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /turf/open/floor/wood, /area/oscar_outpost/village/east) "fd" = ( @@ -809,7 +809,7 @@ /turf/open/floor/tile/dark, /area/oscar_outpost/base) "fT" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/machinery/camera/autoname/mainship, /turf/open/floor, /area/oscar_outpost/village) @@ -823,7 +823,7 @@ /turf/open/floor/mainship/sterile/dark, /area/oscar_outpost/village/central) "gb" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/weapon/gun/launcher/rocket/oneuse, /obj/item/weapon/gun/launcher/rocket/oneuse, /obj/item/weapon/gun/launcher/rocket/oneuse, @@ -995,7 +995,7 @@ /turf/open/floor/plating, /area/oscar_outpost/outside/underground) "gE" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/weapon/gun/launcher/rocket/oneuse, /obj/item/weapon/gun/launcher/rocket/oneuse, /obj/machinery/light, @@ -1074,7 +1074,7 @@ pixel_x = 9; pixel_y = 7 }, -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /turf/open/floor/wood, /area/oscar_outpost/village/east) "ht" = ( @@ -1248,7 +1248,7 @@ /turf/open/floor/tile/dark, /area/oscar_outpost/base) "iE" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/structure/prop/mainship/gelida/register, /turf/open/floor, /area/oscar_outpost/village) @@ -1404,7 +1404,7 @@ /turf/open/floor, /area/oscar_outpost/village) "jE" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/ammo_magazine/rocket, /obj/item/explosive/mine{ pixel_y = 18 @@ -1510,7 +1510,7 @@ /turf/open/floor/tile/dark, /area/oscar_outpost/base) "kx" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /turf/open/floor, /area/oscar_outpost/village/south) "kB" = ( @@ -1744,12 +1744,12 @@ /turf/open/floor/tile/dark, /area/oscar_outpost/base) "mv" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/flashlight/lamp, /turf/open/floor/wood, /area/oscar_outpost/village) "mx" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/food/condiment/sugar, /obj/item/reagent_containers/food/condiment/sugar, /obj/item/reagent_containers/food/condiment/sugar, @@ -1790,7 +1790,7 @@ /turf/open/floor/tile/dark, /area/oscar_outpost/base) "mQ" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/structure/prop/mainship/gelida/register, /obj/structure/cable, /turf/open/floor, @@ -2110,7 +2110,7 @@ /turf/open/floor/wood, /area/oscar_outpost/base) "oX" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/weaponry/ammo/shotgun, /obj/effect/spawner/random/weaponry/ammo/shotgun, /obj/effect/spawner/random/weaponry/ammo/shotgun, @@ -2518,7 +2518,7 @@ /turf/open/floor/tile/dark, /area/oscar_outpost) "rt" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/weaponry/explosive/grenade{ pixel_x = 7 }, @@ -2732,7 +2732,7 @@ /turf/open/floor/tile/dark, /area/oscar_outpost/base) "sK" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/weapon/claymore/mercsword/captain, /turf/open/floor/wood, /area/oscar_outpost/base) @@ -2817,7 +2817,7 @@ /turf/open/floor/wood, /area/oscar_outpost/village/central) "tv" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/food/drinks/tea{ pixel_x = -12 }, @@ -3118,7 +3118,7 @@ /turf/open/floor/tile/dark, /area/oscar_outpost/base) "vu" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/weaponry/explosive/plastiqueexplosive, /obj/effect/spawner/random/weaponry/explosive/plastiqueexplosive, /obj/effect/spawner/random/weaponry/explosive/plastiqueexplosive, @@ -3136,7 +3136,7 @@ /turf/open/liquid/lava, /area/oscar_outpost) "vw" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/explosive/grenade/incendiary/molotov, /obj/item/explosive/grenade/phosphorus/upp{ pixel_x = -9; @@ -4329,7 +4329,7 @@ /turf/open/floor/mainship/sterile, /area/oscar_outpost/base) "BS" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/machinery/light{ dir = 8 }, @@ -4412,7 +4412,7 @@ /turf/open/floor/wood, /area/oscar_outpost/village) "Cn" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/ashtray/bronze{ pixel_x = 5; pixel_y = -4 @@ -4459,7 +4459,7 @@ /turf/open/floor/carpet, /area/oscar_outpost/village) "CC" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/flashlight/lamp/green{ pixel_x = -9; pixel_y = 13 @@ -5352,7 +5352,7 @@ /turf/open/floor/wood, /area/oscar_outpost/village/south) "GC" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/paper{ pixel_y = 6 }, @@ -5535,7 +5535,7 @@ /turf/open/floor/tile/dark, /area/oscar_outpost/base) "Hj" = ( -/obj/structure/table/gamblingtable{ +/obj/structure/table/wood/gambling{ layer = 3.1 }, /obj/item/spacecash/bundle/c100{ @@ -5668,7 +5668,7 @@ /turf/open/floor/tile/dark, /area/oscar_outpost/base) "HP" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /turf/open/floor, /area/oscar_outpost/village/central) "HQ" = ( @@ -5833,7 +5833,7 @@ /turf/open/floor, /area/oscar_outpost/village) "Iu" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/food_or_drink/beer/oscaroutpost{ pixel_x = -5; pixel_y = 15 @@ -6187,7 +6187,7 @@ /turf/open/floor/tile/dark, /area/oscar_outpost/base) "JG" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/flashlight/lamp{ pixel_x = 8; pixel_y = 16 @@ -6458,7 +6458,7 @@ /turf/open/floor/wood, /area/oscar_outpost/village/central) "KY" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/flashlight/lamp, /turf/open/floor/wood, /area/oscar_outpost/village/south) @@ -6549,7 +6549,7 @@ /turf/closed/wall/mainship/outer, /area/oscar_outpost/base) "LC" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/weapon/gun/pistol/vp78, /obj/item/ammo_magazine/pistol/vp78, /obj/item/ammo_magazine/pistol/vp78, @@ -6640,7 +6640,7 @@ /turf/open/floor, /area/oscar_outpost/village) "LN" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/tool/weldpack, /obj/item/tool/weldpack, /obj/item/tool/weldpack, @@ -6911,12 +6911,12 @@ /turf/open/floor/mainship/sterile/dark, /area/oscar_outpost/village/central) "MM" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/phone, /turf/open/floor/mainship/sterile/dark, /area/oscar_outpost/village) "MO" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/weapon/gun/smg/uzi, /obj/item/weapon/gun/smg/uzi, /obj/effect/ai_node, @@ -7070,7 +7070,7 @@ /turf/open/floor/tile/dark, /area/oscar_outpost/base) "NR" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/clothing/head/fez, /obj/item/clothing/head/fez, /obj/item/clothing/head/fez, @@ -7095,7 +7095,7 @@ /turf/open/floor/tile/dark, /area/oscar_outpost) "NX" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/weapon/gun/pistol/heavy, /obj/item/ammo_magazine/pistol/heavy, /obj/item/ammo_magazine/pistol/heavy, @@ -7108,7 +7108,7 @@ /turf/open/floor, /area/oscar_outpost/village) "Oa" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/structure/prop/mainship/gelida/register, /turf/open/floor, /area/oscar_outpost/village/central) @@ -7256,7 +7256,7 @@ /turf/open/floor, /area/oscar_outpost/village/central) "OK" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/engineering/extinguisher/regularweighted, /obj/machinery/light{ dir = 4 @@ -7321,7 +7321,7 @@ /turf/open/floor/mainship/sterile, /area/oscar_outpost/base) "OV" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/hypospray/autoinjector, /obj/item/reagent_containers/hypospray/autoinjector, /obj/item/reagent_containers/hypospray/autoinjector, @@ -7353,7 +7353,7 @@ /turf/open/floor, /area/oscar_outpost/village/central) "Pd" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/structure/prop/mainship/gelida/register, /turf/open/floor/mainship/sterile/dark, /area/oscar_outpost/village) @@ -7362,7 +7362,7 @@ /turf/closed/mineral/smooth, /area/oscar_outpost/outside/rock) "Pg" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/weaponry/gun/shotgun, /obj/effect/spawner/random/weaponry/gun/shotgun, /turf/open/floor, @@ -7804,7 +7804,7 @@ /area/oscar_outpost/base) "QP" = ( /obj/machinery/microwave, -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /turf/open/floor/wood, /area/oscar_outpost/village/fairgrounds) "QQ" = ( @@ -7904,7 +7904,7 @@ /turf/open/floor/wood, /area/oscar_outpost/village/east) "Rm" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/flashlight/lamp, /turf/open/floor/wood, /area/oscar_outpost/base) @@ -7913,7 +7913,7 @@ /turf/open/floor/asteroidfloor, /area/storage/testroom) "Rr" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/tool/wrench{ pixel_y = 13 }, @@ -7958,7 +7958,7 @@ /turf/open/floor/prison, /area/oscar_outpost/base) "RE" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/weaponry/ammo/rifle{ pixel_x = 2; pixel_y = 12 @@ -8314,16 +8314,16 @@ /turf/open/floor/plating/ground/dirt, /area/oscar_outpost/village/fairgrounds) "SP" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/structure/prop/mainship/gelida/register, /turf/open/floor/wood, /area/oscar_outpost/village/fairgrounds) "SR" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /turf/open/floor/wood, /area/oscar_outpost/village/fairgrounds) "SS" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /turf/open/floor/plating/ground/dirt, /area/oscar_outpost/village/fairgrounds) "SV" = ( @@ -8359,7 +8359,7 @@ /turf/open/floor/tile/dark, /area/oscar_outpost/base) "Td" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/food_or_drink/wine{ pixel_x = -6; pixel_y = 18 @@ -8399,7 +8399,7 @@ /turf/open/floor/wood, /area/oscar_outpost/village/fairgrounds) "Tg" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/food_or_drink/outdoors_snacks{ pixel_y = 14 }, @@ -8476,7 +8476,7 @@ /turf/closed/wall/mainship/outer, /area/oscar_outpost/base) "Tz" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/flashlight/lamp, /turf/open/floor/wood, /area/oscar_outpost/village/central) @@ -8505,7 +8505,7 @@ /turf/open/floor/tile/dark, /area/oscar_outpost/base) "TF" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/food/snacks/sliceable/cheesewheel{ pixel_y = 14 }, @@ -8521,7 +8521,7 @@ /turf/open/floor/wood, /area/oscar_outpost/village/fairgrounds) "TJ" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/food/snacks/sliceable/cheesewheel{ pixel_y = 13 }, @@ -8548,7 +8548,7 @@ /turf/open/liquid/lava, /area/oscar_outpost) "TU" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/phone, /turf/open/floor/tile/dark, /area/oscar_outpost/base) @@ -8760,7 +8760,7 @@ /turf/open/floor/plating/ground/dirt, /area/oscar_outpost/village/fairgrounds) "Vc" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/light{ dir = 4 }, @@ -8816,7 +8816,7 @@ /turf/open/floor/plating, /area/oscar_outpost) "Vv" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/clothing/head/beret, /obj/item/clothing/head/beret, /obj/item/clothing/head/beret, @@ -8878,7 +8878,7 @@ }, /area/oscar_outpost) "VI" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/food_or_drink/beer/oscaroutpost, /turf/open/floor/plating/ground/dirt, /area/oscar_outpost/village/fairgrounds) @@ -8898,12 +8898,12 @@ /turf/open/floor/plating/ground/dirt, /area/oscar_outpost/village/fairgrounds) "VQ" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/food_or_drink/cheesewedge, /turf/open/floor/plating/ground/dirt, /area/oscar_outpost/village/fairgrounds) "VT" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/computer/emails{ dir = 8 }, @@ -9140,7 +9140,7 @@ /turf/closed/mineral/smooth, /area/oscar_outpost/outside/rock) "Xa" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/structure/reagent_dispensers/beerkeg{ pixel_y = 5 }, @@ -9186,7 +9186,7 @@ /turf/closed/wall/mainship, /area/oscar_outpost/base) "Xf" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/food_or_drink/wine{ pixel_x = 1; pixel_y = 7 @@ -9220,7 +9220,7 @@ pixel_x = 9; pixel_y = 7 }, -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /turf/open/floor/wood, /area/oscar_outpost/village/east) "Xj" = ( @@ -9293,17 +9293,17 @@ pixel_x = -9; pixel_y = 7 }, -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /turf/open/floor/wood, /area/oscar_outpost/village/east) "Xx" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/clothing/glasses/regular/hipster, /obj/structure/sign/poster, /turf/open/floor/wood, /area/oscar_outpost/village/east) "Xy" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/reagent_containers/food/drinks/coffee{ pixel_y = 11 }, @@ -9394,7 +9394,7 @@ /turf/open/floor/wood, /area/oscar_outpost/village/south) "XR" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/food_or_drink/outdoors_snacks, /turf/open/floor/plating/ground/dirt, /area/oscar_outpost/village/fairgrounds) @@ -9467,7 +9467,7 @@ /turf/open/floor, /area/oscar_outpost/village/south) "Yh" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/paper{ desc = "wait a minute, isn't project Berserker classified? and who made this?"; name = "Project Berserker Wargame"; @@ -9951,7 +9951,7 @@ /turf/open/floor/plating/ground/dirt, /area/oscar_outpost/village/fairgrounds) "ZQ" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /turf/open/floor/tile/dark, /area/oscar_outpost/base) "ZR" = ( diff --git a/_maps/map_files/slumbridge/slumbridge.dmm b/_maps/map_files/slumbridge/slumbridge.dmm index 7266d693b48..c5f9d81d8e8 100644 --- a/_maps/map_files/slumbridge/slumbridge.dmm +++ b/_maps/map_files/slumbridge/slumbridge.dmm @@ -1497,7 +1497,7 @@ /turf/open/floor/wood, /area/slumbridge/inside/colony/bar) "bjd" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/weapon/gun/pistol/m1911, /obj/item/ammo_magazine/pistol/m1911, /obj/item/ammo_magazine/pistol/m1911, @@ -3332,7 +3332,7 @@ /turf/open/floor, /area/slumbridge/inside/engi/engineroom) "cxu" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/computer/emails, /turf/open/floor/tile/white, /area/slumbridge/inside/pmcdome/dorms) @@ -3440,7 +3440,7 @@ /turf/open/floor/prison/kitchen, /area/slumbridge/inside/colony/kitchen) "cBw" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/computer/med_data, /turf/open/floor/tile/cmo, /area/slumbridge/inside/medical/cmo) @@ -5152,7 +5152,7 @@ /turf/open/floor/tile/dark/brown2, /area/slumbridge/inside/colony/orestorage) "dSD" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/tile/dark/blue2/corner{ dir = 1 }, @@ -5904,7 +5904,7 @@ /turf/open/floor/plating/ground/dirtgrassborder/autosmooth/buildable, /area/slumbridge/caves/southeastcaves) "exY" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /turf/open/floor/tile/dark/green2{ dir = 8 }, @@ -9012,7 +9012,7 @@ /turf/open/floor/wood, /area/slumbridge/inside/colony/bar) "gWy" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/atmospherics/pipe/simple/green/hidden{ dir = 4 }, @@ -11504,7 +11504,7 @@ /turf/open/floor/prison/blackfloor, /area/slumbridge/inside/colony/vault) "iGv" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/greytide, /obj/effect/spawner/random/misc/greytide, /turf/open/floor/wood/variable/mosaic, @@ -12247,7 +12247,7 @@ /turf/open/floor/plating/ground/dirt, /area/slumbridge/outside/southeast) "jmg" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/reagentgrinder, /turf/open/floor/tile/dark/green2{ dir = 8 @@ -12429,7 +12429,7 @@ /area/slumbridge/inside/sombase/east) "jsh" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/toy/dice/d20, /turf/open/floor/tile/white, /area/slumbridge/inside/pmcdome/dorms) @@ -12509,7 +12509,7 @@ }, /area/slumbridge/inside/sombase/hangar) "jup" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/prop/mainship/gelida/register{ dir = 4 }, @@ -13893,7 +13893,7 @@ }, /area/slumbridge/inside/houses/dorms) "kwX" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/window/reinforced, /obj/effect/spawner/random/food_or_drink/drink_alcohol_bottle, /turf/open/floor/mainship/floor, @@ -15480,7 +15480,7 @@ /turf/open/floor/prison, /area/slumbridge/inside/prison/innerring) "lEX" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/light{ dir = 1 }, @@ -16743,7 +16743,7 @@ /turf/open/floor/plating/plating_catwalk, /area/slumbridge/inside/sombase/west) "mzF" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/computer/crew, /turf/open/floor/tile/cmo, /area/slumbridge/inside/medical/cmo) @@ -17082,7 +17082,7 @@ /area/slumbridge/inside/pmcdome) "mOy" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/toy/dice, /turf/open/floor/tile/white, /area/slumbridge/inside/pmcdome/dorms) @@ -17223,7 +17223,7 @@ /turf/open/floor/prison/plate, /area/slumbridge/inside/prison/innerring) "mVO" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/window/reinforced, /obj/effect/spawner/random/food_or_drink/drink_alcohol_bottle, /turf/open/floor/mainship/black/corner{ @@ -17805,7 +17805,7 @@ /turf/open/floor/prison, /area/slumbridge/inside/prison/outerringsouth) "nrJ" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/trash/tray, /obj/item/tool/kitchen/utensil/pspoon{ pixel_x = -9 @@ -18536,7 +18536,7 @@ /turf/open/floor/tile/white, /area/slumbridge/inside/pmcdome/dorms) "nOC" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/taperecorder, /turf/open/floor/tile/dark/blue2/corner{ dir = 1 @@ -18805,7 +18805,7 @@ /turf/open/floor/tile/dark/purple2, /area/slumbridge/inside/zeta/south) "nYP" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/misc/trash, /turf/open/floor/tile/dark/green2{ dir = 8 @@ -19788,7 +19788,7 @@ /turf/open/floor/tile/yellow/full, /area/slumbridge/inside/engi/central) "oMP" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/computer/med_data/laptop, /obj/item/tool/screwdriver, /obj/machinery/light, @@ -20210,7 +20210,7 @@ /turf/open/floor/prison, /area/slumbridge/inside/prison/innerring) "pdj" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/door/window/right{ dir = 2 }, @@ -20476,7 +20476,7 @@ /turf/open/floor/plating/ground/mars/random/cave, /area/slumbridge/caves/northwestcaves) "ppE" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/newspaper, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, @@ -20487,7 +20487,7 @@ /turf/open/floor/mainship/ai, /area/slumbridge/inside/houses/recreational) "pqm" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/ammo_magazine/shotgun/beanbag, /obj/item/weapon/gun/shotgun/pump/trenchgun, /obj/machinery/light{ @@ -21057,7 +21057,7 @@ /turf/open/floor/tile/purple/taupepurple, /area/slumbridge/inside/houses/recreational) "pMQ" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/food_or_drink/wine, /turf/open/floor/plating, /area/slumbridge/inside/colony/kitchen) @@ -21161,7 +21161,7 @@ /turf/open/floor/wood, /area/slumbridge/inside/houses/dorms) "pPl" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = -7; pixel_y = -1 @@ -24290,7 +24290,7 @@ /turf/closed/wall/r_wall, /area/slumbridge/inside/engi/engineroom) "saM" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/decal/cleanable/dirt, /obj/structure/nuke_disk_candidate, /turf/open/floor/tile/cmo, @@ -26017,7 +26017,7 @@ /turf/open/floor/tile/green/whitegreen, /area/slumbridge/inside/medical/southern) "trn" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/computer/med_data/laptop, /turf/open/floor/tile/dark/blue2/corner{ dir = 1 @@ -26140,7 +26140,7 @@ /turf/open/floor/plating/ground/snow, /area/slumbridge/landingzonetwo) "twh" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/toy/dice/d20, /obj/item/trash/barcardine, /obj/machinery/atmospherics/pipe/simple/green/hidden{ @@ -26703,7 +26703,7 @@ /turf/open/floor/tile/bar, /area/slumbridge/inside/houses/recreational) "tSt" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/effect/spawner/random/misc/trash, /turf/open/floor/wood, /area/slumbridge/inside/colony/bar) @@ -26897,7 +26897,7 @@ /turf/open/floor/tile/green/whitegreenfull, /area/slumbridge/inside/hydrotreatment) "tZp" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/misc/paperbin, /turf/open/floor/tile/dark/green2{ dir = 8 @@ -27139,7 +27139,7 @@ }, /area/slumbridge/inside/houses/dorms) "ukf" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /turf/open/floor/wood, /area/slumbridge/inside/prison/outerringsouth) "ukh" = ( @@ -28351,7 +28351,7 @@ /turf/open/floor/plating/asteroidfloor, /area/slumbridge/outside/northwest) "viB" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/window/reinforced, /obj/effect/spawner/random/food_or_drink/drink_alcohol_bottle, /obj/machinery/atmospherics/pipe/simple/green/hidden, @@ -29475,7 +29475,7 @@ /turf/open/floor/plating/icefloor, /area/shuttle/drop2/lz2) "vVk" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/computer3, /turf/open/floor/tile/white, /area/slumbridge/inside/pmcdome/dorms) @@ -31980,7 +31980,7 @@ }, /area/slumbridge/landingzonetwo) "xOD" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/newspaper, /turf/open/floor/prison, /area/slumbridge/inside/prison/outerringsouth) diff --git a/_maps/modularmaps/EORG/cs_mansion.dmm b/_maps/modularmaps/EORG/cs_mansion.dmm index c497ebd2c03..7acff92b339 100644 --- a/_maps/modularmaps/EORG/cs_mansion.dmm +++ b/_maps/modularmaps/EORG/cs_mansion.dmm @@ -24,7 +24,7 @@ /turf/open/floor/mainship/mono, /area/deathmatch) "aY" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/weapon/gun/minigun, /obj/item/ammo_magazine/minigun_powerpack, /turf/open/floor/wood, @@ -220,7 +220,7 @@ /turf/open/floor/wood, /area/deathmatch) "lE" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/landmark/weapon_spawn/tier4_weapon_spawn, /turf/open/floor/wood, /area/deathmatch) @@ -245,7 +245,7 @@ /turf/open/floor/mainship/mono, /area/deathmatch) "nK" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/structure/largecrate/random/case, /turf/open/floor/wood, /area/deathmatch) @@ -388,7 +388,7 @@ /turf/open/floor/tile/dark, /area/deathmatch) "to" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/effect/spawner/random/misc/plushie/nospawnninetyfive, /turf/open/floor/wood, /area/deathmatch) @@ -411,7 +411,7 @@ /turf/open/floor/grass, /area/deathmatch) "ua" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /turf/open/floor/wood, /area/deathmatch) "uF" = ( @@ -516,7 +516,7 @@ /turf/open/floor/wood, /area/deathmatch) "yu" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/light{ dir = 1 }, @@ -658,7 +658,7 @@ /turf/open/floor/plating/plating_catwalk, /area/deathmatch) "DA" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/structure/largecrate/random/case/small, /turf/open/floor/wood, /area/deathmatch) @@ -738,7 +738,7 @@ /turf/open/floor/mainship/mono, /area/deathmatch) "GF" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/largecrate/random/case/small, /turf/open/floor/wood, /area/deathmatch) @@ -996,7 +996,7 @@ /area/deathmatch) "Sz" = ( /obj/effect/decal/cleanable/cobweb2, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/landmark/weapon_spawn/tier3_weapon_spawn, /turf/open/floor/wood, /area/deathmatch) @@ -1120,7 +1120,7 @@ /turf/open/floor/plating/plating_catwalk, /area/deathmatch) "WT" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/landmark/weapon_spawn/tier3_weapon_spawn, /turf/open/floor/wood, /area/deathmatch) diff --git a/_maps/modularmaps/EORG/cs_militia.dmm b/_maps/modularmaps/EORG/cs_militia.dmm index e8fa8e2e7f8..6880e5afe46 100644 --- a/_maps/modularmaps/EORG/cs_militia.dmm +++ b/_maps/modularmaps/EORG/cs_militia.dmm @@ -18,7 +18,7 @@ }, /area/deathmatch) "bQ" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /turf/open/floor/wood, /area/deathmatch) "bZ" = ( @@ -242,7 +242,7 @@ /turf/open/floor/plating/ground/mars/random/sand, /area/deathmatch) "xF" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/effect/landmark/weapon_spawn/tier1_weapon_spawn, /turf/open/floor/wood, /area/deathmatch) diff --git a/_maps/modularmaps/EORG/cs_office.dmm b/_maps/modularmaps/EORG/cs_office.dmm index 78bd3c41a4a..c451002217f 100644 --- a/_maps/modularmaps/EORG/cs_office.dmm +++ b/_maps/modularmaps/EORG/cs_office.dmm @@ -21,7 +21,7 @@ }, /area/deathmatch) "av" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /obj/item/tool/pen, /obj/effect/landmark/weapon_spawn/tier3_weapon_spawn, @@ -47,7 +47,7 @@ }, /area/deathmatch) "bC" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/landmark/weapon_spawn/tier2_weapon_spawn, /turf/open/floor/tile/dark/blue2{ dir = 4 @@ -129,7 +129,7 @@ /turf/open/floor/plating/ground/snow/layer1, /area/deathmatch) "dF" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/radio, /obj/machinery/light{ dir = 4 @@ -267,7 +267,7 @@ /turf/open/floor/stairs, /area/deathmatch) "gX" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/radio, /obj/effect/decal/cleanable/dirt, /turf/open/floor/tile/dark/blue2{ @@ -335,7 +335,7 @@ /turf/open/floor/tile/cmo, /area/deathmatch) "ix" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/item/tool/hand_labeler, /turf/open/floor/tile/dark2, @@ -347,7 +347,7 @@ }, /area/deathmatch) "iI" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/light{ dir = 4 }, @@ -365,7 +365,7 @@ /turf/open/floor/tile/arrival, /area/deathmatch) "js" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/tool/pen, /obj/item/clipboard, /turf/open/floor/tile/dark/blue2{ @@ -390,7 +390,7 @@ }, /area/deathmatch) "kx" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /obj/item/tool/pen, /obj/effect/landmark/weapon_spawn/tier3_weapon_spawn, @@ -482,7 +482,7 @@ }, /area/deathmatch) "ml" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/recharger, /obj/effect/decal/cleanable/dirt, /turf/open/floor/tile/dark2, @@ -515,7 +515,7 @@ }, /area/deathmatch) "nK" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /turf/open/floor/tile/dark/blue2{ dir = 4 @@ -540,7 +540,7 @@ }, /area/deathmatch) "og" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/radio, /obj/machinery/light{ dir = 4 @@ -887,7 +887,7 @@ /turf/open/floor/tile/arrival, /area/deathmatch) "vL" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /obj/item/tool/pen, /turf/open/floor/tile/dark/blue2{ @@ -934,7 +934,7 @@ }, /area/deathmatch) "wN" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/radio, /obj/effect/landmark/weapon_spawn/tier3_weapon_spawn, /turf/open/floor/tile/dark2, @@ -1210,7 +1210,7 @@ }, /area/deathmatch) "Cq" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/tool/hand_labeler, /obj/effect/landmark/weapon_spawn/tier3_weapon_spawn, /turf/open/floor/tile/dark2, @@ -1291,7 +1291,7 @@ }, /area/deathmatch) "Eq" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/stack/sheet/cardboard{ amount = 50 }, @@ -1403,7 +1403,7 @@ /turf/open/floor/tile/dark2, /area/deathmatch) "Hg" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/effect/decal/cleanable/dirt, /turf/open/floor/tile/dark2, @@ -1551,7 +1551,7 @@ /turf/open/floor/stairs, /area/deathmatch) "Lo" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/clipboard, /turf/open/floor/tile/dark2, /area/deathmatch) @@ -1751,7 +1751,7 @@ }, /area/deathmatch) "PH" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /obj/item/tool/pen, /turf/open/floor/tile/dark/blue2/corner, @@ -1793,7 +1793,7 @@ }, /area/deathmatch) "Qj" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/recharger, /turf/open/floor/tile/dark2, /area/deathmatch) @@ -1834,7 +1834,7 @@ }, /area/deathmatch) "Rw" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /obj/item/tool/pen, /turf/open/floor/tile/dark2, @@ -1882,14 +1882,14 @@ /turf/open/floor/tile/dark/blue2, /area/deathmatch) "Sg" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/landmark/weapon_spawn/tier3_weapon_spawn, /turf/open/floor/tile/dark/blue2{ dir = 4 }, /area/deathmatch) "Sh" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/megaphone, /obj/effect/decal/cleanable/dirt, /turf/open/floor/tile/dark2, @@ -1920,7 +1920,7 @@ }, /area/deathmatch) "Tp" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/camera, /obj/effect/decal/cleanable/dirt, /turf/open/floor/tile/dark2, @@ -1949,7 +1949,7 @@ }, /area/deathmatch) "Uc" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/megaphone, /turf/open/floor/tile/dark/blue2{ dir = 4 @@ -2113,7 +2113,7 @@ /turf/open/floor/tile/dark/gray, /area/deathmatch) "XK" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/tile/dark2, /area/deathmatch) "XS" = ( @@ -2195,7 +2195,7 @@ /turf/open/floor/stairs, /area/deathmatch) "Zs" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/effect/landmark/weapon_spawn/tier2_weapon_spawn, /turf/open/floor/tile/dark2, diff --git a/_maps/modularmaps/EORG/de_inferno.dmm b/_maps/modularmaps/EORG/de_inferno.dmm index 78c6e422832..d05c27c9f3c 100644 --- a/_maps/modularmaps/EORG/de_inferno.dmm +++ b/_maps/modularmaps/EORG/de_inferno.dmm @@ -198,7 +198,7 @@ /area/deathmatch) "dA" = ( /obj/item/storage/bible, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/landmark/weapon_spawn/tier1_weapon_spawn, /turf/open/floor/wood/broken, /area/deathmatch) @@ -210,7 +210,7 @@ /turf/closed/wall/wood, /area/deathmatch) "dK" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/effect/landmark/weapon_spawn/tier1_weapon_spawn, /turf/open/floor/wood, /area/deathmatch) @@ -542,7 +542,7 @@ /turf/open/floor/wood, /area/deathmatch) "jc" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/toy/plush/farwa, /turf/open/floor/industrial, /area/deathmatch) @@ -556,7 +556,7 @@ /turf/open/floor/plating/asteroidfloor, /area/deathmatch) "jA" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/landmark/weapon_spawn/tier1_weapon_spawn, /turf/open/floor/wood, /area/deathmatch) @@ -569,13 +569,13 @@ /turf/open/floor/plating/asteroidplating, /area/deathmatch) "kh" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/bible, /obj/effect/landmark/weapon_spawn/tier4_weapon_spawn, /turf/open/floor/wood/broken, /area/deathmatch) "kq" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/toy/plush/rouny, /turf/open/floor/industrial, /area/deathmatch) @@ -608,7 +608,7 @@ /turf/open/floor/plating/asteroidplating, /area/deathmatch) "lK" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/largecrate/random/case/small, /turf/open/floor/wood, /area/deathmatch) @@ -676,7 +676,7 @@ /turf/open/floor/plating/asteroidplating, /area/deathmatch) "nv" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/landmark/weapon_spawn/tier1_weapon_spawn, /turf/open/floor/wood/broken, /area/deathmatch) @@ -806,7 +806,7 @@ /turf/open/floor/grass, /area/deathmatch) "rO" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/effect/landmark/weapon_spawn/tier4_weapon_spawn, /turf/open/floor/wood, /area/deathmatch) @@ -828,7 +828,7 @@ /turf/open/floor/tile/dark, /area/deathmatch) "sp" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/effect/landmark/weapon_spawn/tier4_weapon_spawn, /obj/effect/spawner/random/misc/plushie/nospawnninetyfive, /turf/open/floor/wood, @@ -902,7 +902,7 @@ /turf/open/floor/wood, /area/deathmatch) "uG" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/toy/plush/rouny{ dir = 4 }, @@ -918,7 +918,7 @@ /turf/open/floor/tile/dark, /area/deathmatch) "uS" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/toy/plush/lizard, /turf/open/floor/industrial, /area/deathmatch) @@ -948,7 +948,7 @@ /turf/open/floor/wood/broken, /area/deathmatch) "wu" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/bible, /obj/machinery/light{ dir = 8 @@ -1100,7 +1100,7 @@ /turf/open/floor/plating/asteroidfloor, /area/deathmatch) "Dn" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/landmark/weapon_spawn/tier2_weapon_spawn, /turf/open/floor/wood, /area/deathmatch) @@ -1167,7 +1167,7 @@ /turf/open/floor/plating/asteroidplating, /area/deathmatch) "GE" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/effect/landmark/weapon_spawn/tier3_weapon_spawn, /turf/open/floor/wood, /area/deathmatch) @@ -1359,7 +1359,7 @@ /turf/open/floor/plating/asteroidplating, /area/deathmatch) "Mz" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/toy/plush/snake, /turf/open/floor/industrial, /area/deathmatch) @@ -1469,7 +1469,7 @@ /turf/open/floor/wood, /area/deathmatch) "PO" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/item/toy/plush/moth, /turf/open/floor/industrial, /area/deathmatch) @@ -1653,7 +1653,7 @@ /area/deathmatch) "YJ" = ( /obj/effect/landmark/weapon_spawn/tier3_weapon_spawn, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/deathmatch) "YO" = ( diff --git a/_maps/modularmaps/big_red/barracks.dmm b/_maps/modularmaps/big_red/barracks.dmm index e7d8b2e4f0e..3e2ea05d260 100644 --- a/_maps/modularmaps/big_red/barracks.dmm +++ b/_maps/modularmaps/big_red/barracks.dmm @@ -663,7 +663,7 @@ /turf/open/floor/wood, /area/bigredv2/outside/admin_building) "Cu" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/bigredv2/outside/admin_building) "CU" = ( @@ -939,7 +939,7 @@ /turf/open/floor/tile/white, /area/bigredv2/outside/admin_building) "Mj" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/light{ dir = 8 }, @@ -1169,7 +1169,7 @@ }, /area/bigredv2/outside/admin_building) "Ue" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/light, /turf/open/floor/wood, /area/bigredv2/outside/admin_building) @@ -1197,7 +1197,7 @@ /turf/open/floor/tile/white, /area/bigredv2/outside/admin_building) "UL" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/misc/paperbin, /obj/item/tool/pen, /obj/machinery/light, diff --git a/_maps/modularmaps/big_red/bigredchapelvar1.dmm b/_maps/modularmaps/big_red/bigredchapelvar1.dmm index 1af8cdf4506..9959963b211 100644 --- a/_maps/modularmaps/big_red/bigredchapelvar1.dmm +++ b/_maps/modularmaps/big_red/bigredchapelvar1.dmm @@ -99,7 +99,7 @@ /turf/open/floor/engine/cult, /area/bigredv2/outside/chapel) "w" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/engine/cult, /area/bigredv2/outside/chapel) "x" = ( @@ -113,7 +113,7 @@ }, /area/bigredv2/outside/chapel) "z" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/tile/darkish, /area/bigredv2/outside/chapel) "A" = ( @@ -168,7 +168,7 @@ /obj/machinery/atmospherics/pipe/simple/green/hidden{ dir = 4 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/bible, /turf/open/floor/engine/cult, /area/bigredv2/outside/chapel) @@ -190,7 +190,7 @@ /turf/open/floor/tile/darkish, /area/bigredv2/outside/chapel) "P" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/landmark/weed_node, /turf/open/floor/tile/darkish, /area/bigredv2/outside/chapel) @@ -235,7 +235,7 @@ /turf/open/floor/tile/darkish, /area/bigredv2/outside/chapel) "Z" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/radio/headset/survivor, /obj/effect/landmark/weed_node, /turf/open/floor/engine/cult, diff --git a/_maps/modularmaps/big_red/bigredchapelvar2.dmm b/_maps/modularmaps/big_red/bigredchapelvar2.dmm index d329864b878..90a819d333e 100644 --- a/_maps/modularmaps/big_red/bigredchapelvar2.dmm +++ b/_maps/modularmaps/big_red/bigredchapelvar2.dmm @@ -29,11 +29,11 @@ /turf/open/floor/grayscale/darkred, /area/bigredv2/outside/chapel) "hN" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/engine/cult, /area/bigredv2/outside/chapel) "im" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/radio/headset/survivor, /obj/effect/landmark/weed_node, /turf/open/floor/engine/cult, @@ -173,7 +173,7 @@ }, /area/bigredv2/outside/chapel) "xk" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/landmark/weed_node, /obj/item/tool/candle, /turf/open/floor/tile/darkish, @@ -230,7 +230,7 @@ /turf/open/floor/grayscale/darkred, /area/bigredv2/outside/chapel) "Dk" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/weaponry/ammo, /obj/effect/spawner/random/weaponry/ammo, /turf/open/floor/tile/darkish, @@ -239,7 +239,7 @@ /obj/machinery/atmospherics/pipe/simple/green/hidden{ dir = 4 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/bible, /turf/open/floor/engine/cult, /area/bigredv2/outside/chapel) @@ -264,7 +264,7 @@ /turf/open/floor/tile/chapel, /area/bigredv2/outside/chapel) "Lr" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/tool/candle, /turf/open/floor/tile/darkish, /area/bigredv2/outside/chapel) @@ -316,7 +316,7 @@ /turf/open/floor/tile/chapel, /area/bigredv2/outside/chapel) "Sv" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/weapon/chainofcommand, /turf/open/floor/engine/cult, /area/bigredv2/outside/chapel) diff --git a/_maps/modularmaps/big_red/bigredlibraryvar1.dmm b/_maps/modularmaps/big_red/bigredlibraryvar1.dmm index cd1ac225c04..7f952e854ce 100644 --- a/_maps/modularmaps/big_red/bigredlibraryvar1.dmm +++ b/_maps/modularmaps/big_red/bigredlibraryvar1.dmm @@ -131,7 +131,7 @@ /turf/open/floor/wood, /area/bigredv2/outside/library) "u" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/paper, /turf/open/floor/wood, /area/bigredv2/outside/library) @@ -155,7 +155,7 @@ /turf/open/floor/wood, /area/bigredv2/outside/library) "y" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/bigredv2/outside/library) "z" = ( @@ -215,7 +215,7 @@ /turf/open/floor/wood, /area/bigredv2/outside/library) "K" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/toy/dice/d20, /turf/open/floor/wood, /area/bigredv2/outside/library) diff --git a/_maps/modularmaps/big_red/bigredlibraryvar2.dmm b/_maps/modularmaps/big_red/bigredlibraryvar2.dmm index b982ac4dc34..a761d352540 100644 --- a/_maps/modularmaps/big_red/bigredlibraryvar2.dmm +++ b/_maps/modularmaps/big_red/bigredlibraryvar2.dmm @@ -31,7 +31,7 @@ /turf/open/floor/wood, /area/bigredv2/outside/library) "gS" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/book/manual/nuclear, /turf/open/floor/wood, /area/bigredv2/outside/library) @@ -90,7 +90,7 @@ /turf/open/floor/plating, /area/bigredv2/outside/library) "pV" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/toy/dice/d20, /turf/open/floor/wood, /area/bigredv2/outside/library) @@ -224,7 +224,7 @@ /turf/open/floor/wood, /area/bigredv2/outside/library) "Ft" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/bigredv2/outside/library) "FB" = ( @@ -305,7 +305,7 @@ /turf/open/floor/wood, /area/bigredv2/outside/library) "NR" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/paper, /turf/open/floor/wood, /area/bigredv2/outside/library) diff --git a/_maps/modularmaps/big_red/bigredlibraryvar3.dmm b/_maps/modularmaps/big_red/bigredlibraryvar3.dmm index 537dbfbb570..e8dd18652eb 100644 --- a/_maps/modularmaps/big_red/bigredlibraryvar3.dmm +++ b/_maps/modularmaps/big_red/bigredlibraryvar3.dmm @@ -12,7 +12,7 @@ }, /area/bigredv2/outside/e) "cB" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/toy/dice/d20, /obj/item/paper/crumpled, /turf/open/floor/wood, @@ -32,7 +32,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/food_or_drink/drink_alcohol_bottle, /obj/effect/spawner/random/food_or_drink/drink_alcohol_bottle{ pixel_x = 1; @@ -185,7 +185,7 @@ /turf/open/floor/plating, /area/bigredv2/outside/library) "rO" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/pizzabox/meat{ pixel_x = -5; pixel_y = 12 @@ -234,7 +234,7 @@ /turf/open/floor/wood, /area/bigredv2/outside/library) "vX" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/pizzabox/meat{ pixel_x = -5; pixel_y = 12 @@ -251,7 +251,7 @@ /turf/open/floor/wood, /area/bigredv2/outside/library) "xB" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/toy/dice/d20, /obj/item/reagent_containers/food/snacks/pizzapasta/meatpizzaslice, /obj/effect/spawner/random/food_or_drink/drink_alcohol_bottle{ @@ -305,7 +305,7 @@ /turf/open/floor/wood, /area/bigredv2/outside/library) "Ez" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/pizzapasta/meatpizzaslice{ pixel_x = -3; pixel_y = 4 @@ -370,7 +370,7 @@ /turf/open/floor/carpet/side, /area/bigredv2/outside/library) "Nb" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/pizzapasta/meatpizzaslice, /obj/effect/spawner/random/food_or_drink/drink_alcohol_bottle, /obj/effect/spawner/random/food_or_drink/drink_alcohol_bottle, @@ -441,7 +441,7 @@ }, /area/bigredv2/outside/library) "Tw" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/paper, /turf/open/floor/wood, /area/bigredv2/outside/library) @@ -454,7 +454,7 @@ /turf/open/floor/wood, /area/bigredv2/outside/library) "VU" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/paper, /obj/item/paper/crumpled, /obj/effect/spawner/random/food_or_drink/drink_alcohol_bottle{ diff --git a/_maps/modularmaps/big_red/operation.dmm b/_maps/modularmaps/big_red/operation.dmm index ebd70ce0f3e..a0ed8880ada 100644 --- a/_maps/modularmaps/big_red/operation.dmm +++ b/_maps/modularmaps/big_red/operation.dmm @@ -394,7 +394,7 @@ /turf/open/floor/tile/white, /area/bigredv2/outside/admin_building) "qI" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/camera, /turf/open/floor/wood, /area/bigredv2/outside/admin_building) @@ -769,7 +769,7 @@ /turf/open/floor/tile/white, /area/bigredv2/outside/admin_building) "BV" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/spray/cleaner, /turf/open/floor/wood, /area/bigredv2/outside/admin_building) @@ -1070,7 +1070,7 @@ }, /area/bigredv2/outside/admin_building) "LH" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/tool/lighter/zippo, /turf/open/floor/wood, /area/bigredv2/outside/admin_building) @@ -1299,7 +1299,7 @@ /turf/open/floor/tile/white, /area/bigredv2/outside/admin_building) "TY" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/pinpointer, /turf/open/floor/wood, /area/bigredv2/outside/admin_building) @@ -1310,7 +1310,7 @@ /turf/open/floor/freezer, /area/bigredv2/outside/admin_building) "Ud" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/binoculars, /turf/open/floor/wood, /area/bigredv2/outside/admin_building) @@ -1399,7 +1399,7 @@ /turf/open/floor/tile/dark, /area/bigredv2/outside/admin_building) "Xb" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/bigredv2/outside/admin_building) "Xq" = ( diff --git a/_maps/modularmaps/lv624/internal_affairs.dmm b/_maps/modularmaps/lv624/internal_affairs.dmm index 2967e3e0d64..c25479d04e1 100644 --- a/_maps/modularmaps/lv624/internal_affairs.dmm +++ b/_maps/modularmaps/lv624/internal_affairs.dmm @@ -19,7 +19,7 @@ }, /area/lv624/lazarus/internal_affairs) "bV" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/lv624/lazarus/internal_affairs) "cf" = ( @@ -44,7 +44,7 @@ /turf/open/floor/grass, /area/lv624/lazarus/internal_affairs) "eq" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp, /turf/open/floor/wood, /area/lv624/lazarus/internal_affairs) @@ -169,7 +169,7 @@ /turf/open/floor/wood, /area/lv624/lazarus/internal_affairs) "no" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/machinery/random_broken_computer/crewmonitor, /turf/open/floor/wood, /area/lv624/lazarus/internal_affairs) @@ -184,7 +184,7 @@ /turf/open/floor/tile/blue/whiteblue, /area/lv624/lazarus/internal_affairs) "os" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/pinpointer, /turf/open/floor/wood, /area/lv624/lazarus/internal_affairs) @@ -195,7 +195,7 @@ }, /area/lv624/lazarus/internal_affairs) "rO" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/megaphone, /turf/open/floor/wood, /area/lv624/lazarus/internal_affairs) @@ -305,7 +305,7 @@ /turf/open/floor/tile/blue/whiteblue, /area/lv624/lazarus/internal_affairs) "EI" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/box/donkpockets, /obj/item/clothing/glasses/sunglasses/big{ pixel_y = 5 @@ -358,7 +358,7 @@ }, /area/lv624/lazarus/internal_affairs) "Jf" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/ashtray/glass, /obj/item/toy/deck, /obj/item/mecha_parts/part/gygax_head, diff --git a/_maps/modularmaps/lv624/newcavevar5.dmm b/_maps/modularmaps/lv624/newcavevar5.dmm index c8a92ec0909..e7268d52ac8 100644 --- a/_maps/modularmaps/lv624/newcavevar5.dmm +++ b/_maps/modularmaps/lv624/newcavevar5.dmm @@ -39,12 +39,12 @@ /turf/open/floor/wood/broken, /area/lv624/ground/caves/central2) "eF" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/weapon/gun/rifle/mg42, /turf/open/floor/wood, /area/lv624/ground/caves/central2) "eH" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/food_or_drink/kitchenknife/butcherweighted, /obj/effect/spawner/random/food_or_drink/kitchenknife/butcherweighted{ pixel_y = 6 @@ -132,7 +132,7 @@ }, /area/lv624/ground/caves/central1) "kK" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat{ pixel_y = 3 @@ -152,7 +152,7 @@ /turf/open/floor/wood, /area/lv624/ground/caves/central2) "mh" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/weaponry/ammo/machinegun, /obj/effect/spawner/random/weaponry/ammo/machinegun{ pixel_x = -5; @@ -161,7 +161,7 @@ /turf/open/floor/wood, /area/lv624/ground/caves/central2) "ne" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/weaponry/ammo/shotgun, /turf/open/floor/carpet/side{ dir = 10 @@ -181,7 +181,7 @@ /turf/open/floor/plating/ground/dirt, /area/lv624/ground/caves/central2) "os" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/machinery/microwave, /turf/open/floor/wood, /area/lv624/ground/caves/central2) @@ -205,14 +205,14 @@ /area/lv624/ground/caves/central2) "pP" = ( /obj/item/flashlight/lantern, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/lv624/ground/caves/central2) "qq" = ( /turf/open/floor/tile/dark, /area/lv624/ground/caves/central1) "qD" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/tool/candle, /obj/item/tool/match{ pixel_x = 5; @@ -221,7 +221,7 @@ /turf/open/floor/carpet/side, /area/lv624/ground/caves/central2) "qI" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/weapon/gun/shotgun/double, /turf/open/floor/wood, /area/lv624/ground/caves/central2) @@ -321,7 +321,7 @@ }, /area/lv624/ground/caves/central1) "xm" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/weaponry/ammo/machinegun, /obj/effect/spawner/random/weaponry/gun/machineguns{ pixel_x = -2; @@ -334,7 +334,7 @@ /turf/open/floor/wood, /area/lv624/ground/caves/central2) "xI" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/weaponry/ammo/shotgun, /turf/open/floor/carpet/side{ dir = 1 @@ -376,7 +376,7 @@ /turf/open/floor/wood, /area/lv624/ground/caves/central2) "BP" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lantern, /turf/open/floor/carpet/side{ dir = 6 @@ -415,7 +415,7 @@ /turf/open/floor/plating/ground/dirt, /area/lv624/ground/caves/central2) "GS" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/tool/candle, /obj/item/stack/sheet/metal{ pixel_x = 3 @@ -498,7 +498,7 @@ /turf/open/floor/wood, /area/lv624/ground/caves/central2) "Md" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/weaponry/ammo/machinegun, /obj/effect/spawner/random/weaponry/gun/machineguns{ pixel_x = -2; @@ -583,7 +583,7 @@ /turf/open/floor/plating/ground/dirt, /area/lv624/ground/caves/central2) "UX" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/weaponry/ammo/machinegun, /obj/effect/spawner/random/weaponry/gun/machineguns{ pixel_x = 2; @@ -592,12 +592,12 @@ /turf/open/floor/wood, /area/lv624/ground/caves/central2) "Vi" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lantern, /turf/open/floor/wood, /area/lv624/ground/caves/central2) "Vo" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/stack/sheet/metal{ pixel_x = 3; pixel_y = 1 @@ -605,7 +605,7 @@ /turf/open/floor/wood, /area/lv624/ground/caves/central2) "Vt" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/lv624/ground/caves/central2) "VE" = ( @@ -617,7 +617,7 @@ /area/lv624/ground/caves/central1) "Wl" = ( /obj/structure/barricade/sandbags, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lantern, /obj/item/weapon/baseballbat/metal, /turf/open/floor/wood, @@ -627,7 +627,7 @@ /turf/open/floor/wood, /area/lv624/ground/caves/central2) "Xu" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/tool/candle, /turf/open/floor/carpet/side{ dir = 5 diff --git a/_maps/modularmaps/lv624/newcavevar9.dmm b/_maps/modularmaps/lv624/newcavevar9.dmm index 869b962a60a..40c92100f7c 100644 --- a/_maps/modularmaps/lv624/newcavevar9.dmm +++ b/_maps/modularmaps/lv624/newcavevar9.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aD" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/tool/candle, /obj/item/tool/match{ pixel_x = 4; @@ -122,7 +122,7 @@ /area/lv624/ground/caves/central1) "po" = ( /obj/effect/decal/cleanable/blood/drip, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/weaponry/ammo/machinegun, /turf/open/floor/wood, /area/lv624/ground/caves/central2) @@ -142,7 +142,7 @@ /turf/open/floor/wood, /area/lv624/ground/caves/central2) "ru" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/weaponry/ammo/machinegun{ pixel_x = -5; pixel_y = 6 @@ -201,7 +201,7 @@ /area/lv624/ground/caves/central2) "zz" = ( /obj/item/flashlight/lantern, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/lv624/ground/caves/central2) "zN" = ( @@ -272,7 +272,7 @@ }, /area/lv624/ground/caves/central1) "IO" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/ammo_casing/shell, /obj/item/ammo_casing/shell, /obj/item/flashlight/lantern, @@ -288,7 +288,7 @@ /area/lv624/ground/caves/central2) "KV" = ( /obj/item/ammo_casing/shell, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/weaponry/gun/machineguns{ pixel_x = 2; pixel_y = 4 @@ -325,7 +325,7 @@ /turf/open/floor/wood/broken, /area/lv624/ground/caves/central2) "Np" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/fancy/candle_box, /turf/open/floor/wood, /area/lv624/ground/caves/central2) @@ -438,7 +438,7 @@ }, /area/lv624/ground/caves/central1) "YM" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/weaponry/gun/machineguns{ pixel_x = -2; pixel_y = 6 @@ -449,7 +449,7 @@ "Zg" = ( /obj/item/stack/sheet/wood, /obj/effect/decal/cleanable/dirt, -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/weaponry/ammo/machinegun, /turf/open/floor/wood, /area/lv624/ground/caves/central2) diff --git a/_maps/modularmaps/oscaroutpost/oscarnorthvar1.dmm b/_maps/modularmaps/oscaroutpost/oscarnorthvar1.dmm index c8ba370addc..9444139b6d6 100644 --- a/_maps/modularmaps/oscaroutpost/oscarnorthvar1.dmm +++ b/_maps/modularmaps/oscaroutpost/oscarnorthvar1.dmm @@ -82,7 +82,7 @@ /turf/open/floor/plating/ground/dirtgrassborder, /area/oscar_outpost/outside/west) "aT" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/machinery/light, /obj/item/ammo_magazine/hsg102/hsg_nest, /obj/item/ammo_magazine/hsg102/hsg_nest, @@ -444,7 +444,7 @@ /turf/open/floor/plating/ground/dirt, /area/oscar_outpost/outside/road) "er" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/glass/bucket, /obj/item/reagent_containers/glass/bucket, /obj/item/reagent_containers/glass/bucket, @@ -526,7 +526,7 @@ name = "barley"; plantname = "barley" }, -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/machinery/camera/autoname/mainship, /turf/open/floor, /area/oscar_outpost) @@ -712,7 +712,7 @@ /turf/open/floor/plating/ground/dirt, /area/oscar_outpost/outside/north) "gL" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/food/drinks/flask/barflask{ pixel_x = -8; pixel_y = 15 @@ -950,7 +950,7 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/west) "kk" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/glass/bucket, /turf/open/floor, /area/oscar_outpost) @@ -1393,7 +1393,7 @@ }, /area/oscar_outpost/outside/road) "pk" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/glass/bucket, /obj/item/reagent_containers/glass/bucket, /obj/item/reagent_containers/glass/bucket, @@ -1413,7 +1413,7 @@ /turf/closed/wall/mainship/research, /area/oscar_outpost) "pz" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/storage/box/condimentbottles{ pixel_x = -5; pixel_y = 12 @@ -1455,7 +1455,7 @@ /turf/open/ground/grass, /area/oscar_outpost) "pE" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/food/drinks/flask/barflask{ pixel_x = -8; pixel_y = 15 @@ -1653,7 +1653,7 @@ name = "barley"; plantname = "barley" }, -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /turf/open/floor, /area/oscar_outpost) "rs" = ( @@ -1683,7 +1683,7 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/northeast) "rG" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/glass/bucket/janibucket, /turf/open/floor, /area/oscar_outpost) @@ -2307,7 +2307,7 @@ name = "barley"; plantname = "barley" }, -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/machinery/light{ dir = 1 }, @@ -2484,7 +2484,7 @@ /turf/open/floor, /area/oscar_outpost) "Dj" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/food_or_drink/beer/oscaroutpost{ pixel_x = -5; pixel_y = 15 @@ -3062,7 +3062,7 @@ }, /area/oscar_outpost/outside/road) "Jn" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/food/drinks/flask/barflask{ pixel_x = -8; pixel_y = 15 @@ -3249,7 +3249,7 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/road) "KD" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/food/snacks/grown/grapes, /obj/item/reagent_containers/food/snacks/grown/grapes, /obj/item/reagent_containers/food/snacks/grown/grapes, @@ -3312,7 +3312,7 @@ name = "barley"; plantname = "barley" }, -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/food_or_drink/kitchen, /turf/open/floor, /area/oscar_outpost) @@ -4269,7 +4269,7 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/west) "Ye" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/food_or_drink/wine{ pixel_x = -8; pixel_y = 18 diff --git a/_maps/modularmaps/oscaroutpost/oscarnorthvar2.dmm b/_maps/modularmaps/oscaroutpost/oscarnorthvar2.dmm index 12462f31569..a3995e39510 100644 --- a/_maps/modularmaps/oscaroutpost/oscarnorthvar2.dmm +++ b/_maps/modularmaps/oscaroutpost/oscarnorthvar2.dmm @@ -84,7 +84,7 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/east) "aT" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /turf/open/floor, /area/oscar_outpost) "bb" = ( @@ -772,7 +772,7 @@ /turf/open/floor, /area/oscar_outpost) "gL" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = -8; pixel_y = 15 @@ -1066,7 +1066,7 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/road) "kk" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/glass/bucket, /turf/open/floor, /area/oscar_outpost) @@ -1277,7 +1277,7 @@ /turf/open/ground/grass, /area/oscar_outpost) "nv" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/food_or_drink/wine{ pixel_x = -8; pixel_y = 18 @@ -1520,7 +1520,7 @@ }, /area/oscar_outpost) "pk" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/glass/bucket, /obj/item/reagent_containers/glass/bucket, /obj/item/reagent_containers/glass/bucket, @@ -1546,7 +1546,7 @@ /turf/closed/wall/mainship/research, /area/oscar_outpost) "pz" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/storage/box/condimentbottles{ pixel_x = -5; pixel_y = 12 @@ -1574,7 +1574,7 @@ /turf/open/floor, /area/oscar_outpost) "pE" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = -8; pixel_y = 15 @@ -1759,7 +1759,7 @@ name = "barley"; plantname = "barley" }, -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/machinery/light{ dir = 1 }, @@ -1858,7 +1858,7 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/northwest) "rG" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/glass/bucket/janibucket, /turf/open/floor, /area/oscar_outpost) @@ -2044,7 +2044,7 @@ /turf/open/floor/plating/ground/dirtgrassborder, /area/oscar_outpost/outside/west) "tJ" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = -8; pixel_y = 15 @@ -2934,7 +2934,7 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/east) "Dj" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/food_or_drink/beer/oscaroutpost{ pixel_x = -5; pixel_y = 15 @@ -3538,7 +3538,7 @@ name = "barley"; plantname = "barley" }, -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /turf/open/floor, /area/oscar_outpost) "Iz" = ( @@ -3731,7 +3731,7 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/northeast) "KD" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/food/snacks/grown/grapes, /obj/item/reagent_containers/food/snacks/grown/grapes, /obj/item/reagent_containers/food/snacks/grown/grapes, @@ -3788,7 +3788,7 @@ name = "barley"; plantname = "barley" }, -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/food_or_drink/kitchen, /turf/open/floor, /area/oscar_outpost) @@ -4119,7 +4119,7 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/northwest) "OO" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/food_or_drink/beer/oscaroutpost{ pixel_x = -5; pixel_y = 15 @@ -4191,7 +4191,7 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/northeast) "OY" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/food_or_drink/beer/oscaroutpost{ pixel_x = -5; pixel_y = 15 @@ -4570,7 +4570,7 @@ }, /area/oscar_outpost/outside/northeast) "Rj" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = -8; pixel_y = 15 @@ -5297,7 +5297,7 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/road) "Ye" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/food_or_drink/wine{ pixel_x = -8; pixel_y = 18 diff --git a/_maps/modularmaps/oscaroutpost/oscarnorthvar3.dmm b/_maps/modularmaps/oscaroutpost/oscarnorthvar3.dmm index a9051e857ec..4cbd7c6f338 100644 --- a/_maps/modularmaps/oscaroutpost/oscarnorthvar3.dmm +++ b/_maps/modularmaps/oscaroutpost/oscarnorthvar3.dmm @@ -130,7 +130,7 @@ /turf/open/ground/grass, /area/oscar_outpost/outside/northeast) "aT" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /turf/open/floor, /area/oscar_outpost) "aW" = ( @@ -1147,7 +1147,7 @@ /turf/open/floor, /area/oscar_outpost) "gL" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = -8; pixel_y = 15 @@ -1637,7 +1637,7 @@ /turf/open/ground/grass, /area/oscar_outpost/outside/east) "kk" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/glass/bucket, /turf/open/floor, /area/oscar_outpost) @@ -1992,7 +1992,7 @@ /turf/open/floor/plating/ground/dirtgrassborder, /area/oscar_outpost/outside/east) "nv" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/food_or_drink/wine{ pixel_x = -8; pixel_y = 18 @@ -2330,7 +2330,7 @@ }, /area/oscar_outpost/outside/northeast) "pk" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/glass/bucket, /obj/item/reagent_containers/glass/bucket, /obj/item/reagent_containers/glass/bucket, @@ -2375,7 +2375,7 @@ /turf/closed/wall/mainship/research, /area/oscar_outpost) "pz" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/storage/box/condimentbottles{ pixel_x = -5; pixel_y = 12 @@ -2419,7 +2419,7 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/west) "pE" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = -8; pixel_y = 15 @@ -2708,7 +2708,7 @@ name = "barley"; plantname = "barley" }, -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/machinery/light{ dir = 1 }, @@ -2781,7 +2781,7 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/northwest) "rG" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/glass/bucket/janibucket, /turf/open/floor, /area/oscar_outpost) @@ -2945,7 +2945,7 @@ /turf/open/floor/plating/ground/dirtgrassborder, /area/oscar_outpost/outside/west) "tJ" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = -8; pixel_y = 15 @@ -3319,7 +3319,7 @@ name = "barley"; plantname = "barley" }, -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/food_or_drink/kitchen, /obj/effect/spawner/random/misc/plushie/nospawnninetynine, /turf/open/floor, @@ -4149,7 +4149,7 @@ /turf/open/ground/grass, /area/oscar_outpost/outside/northwest) "Dj" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/food_or_drink/beer/oscaroutpost{ pixel_x = -5; pixel_y = 15 @@ -4912,7 +4912,7 @@ name = "barley"; plantname = "barley" }, -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /turf/open/floor, /area/oscar_outpost) "Iz" = ( @@ -5134,7 +5134,7 @@ /turf/open/ground/grass, /area/oscar_outpost/outside/northwest) "KD" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/food/snacks/grown/grapes, /obj/item/reagent_containers/food/snacks/grown/grapes, /obj/item/reagent_containers/food/snacks/grown/grapes, @@ -5202,7 +5202,7 @@ name = "barley"; plantname = "barley" }, -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/food_or_drink/kitchen, /turf/open/floor, /area/oscar_outpost) @@ -5670,7 +5670,7 @@ /turf/open/ground/grass, /area/oscar_outpost/outside/west) "OO" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/food_or_drink/beer/oscaroutpost{ pixel_x = -5; pixel_y = 15 @@ -5760,7 +5760,7 @@ /turf/open/floor/plating/ground/dirt, /area/oscar_outpost/outside/west) "OY" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/food_or_drink/beer/oscaroutpost{ pixel_x = -5; pixel_y = 15 @@ -6225,7 +6225,7 @@ }, /area/oscar_outpost/outside/northeast) "Rj" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = -8; pixel_y = 15 @@ -6946,7 +6946,7 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/west) "Ye" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/food_or_drink/wine{ pixel_x = -8; pixel_y = 18 diff --git a/_maps/modularmaps/oscaroutpost/oscarnorthvar4.dmm b/_maps/modularmaps/oscaroutpost/oscarnorthvar4.dmm index 67511400b0e..fc7891b6f01 100644 --- a/_maps/modularmaps/oscaroutpost/oscarnorthvar4.dmm +++ b/_maps/modularmaps/oscaroutpost/oscarnorthvar4.dmm @@ -74,7 +74,7 @@ /turf/open/ground/grass, /area/oscar_outpost/outside/northwest) "aT" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/machinery/light, /obj/item/ammo_magazine/hsg102/hsg_nest, /obj/item/ammo_magazine/hsg102/hsg_nest, @@ -452,7 +452,7 @@ }, /area/oscar_outpost/outside/northwest) "er" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/glass/bucket, /obj/item/reagent_containers/glass/bucket, /obj/item/reagent_containers/glass/bucket, @@ -535,7 +535,7 @@ name = "barley"; plantname = "barley" }, -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/machinery/camera/autoname/mainship, /turf/open/floor, /area/oscar_outpost) @@ -720,7 +720,7 @@ }, /area/oscar_outpost/outside/east) "gL" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/food/drinks/flask/barflask{ pixel_x = -8; pixel_y = 15 @@ -994,7 +994,7 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/northeast) "kk" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/glass/bucket, /turf/open/floor, /area/oscar_outpost) @@ -1499,7 +1499,7 @@ }, /area/oscar_outpost/outside/road) "pk" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/glass/bucket, /obj/item/reagent_containers/glass/bucket, /obj/item/reagent_containers/glass/bucket, @@ -1526,7 +1526,7 @@ /turf/closed/wall/mainship/research, /area/oscar_outpost) "pz" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/storage/box/condimentbottles{ pixel_x = -5; pixel_y = 12 @@ -1576,7 +1576,7 @@ /turf/open/ground/grass, /area/oscar_outpost) "pE" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/food/drinks/flask/barflask{ pixel_x = -8; pixel_y = 15 @@ -1842,7 +1842,7 @@ name = "barley"; plantname = "barley" }, -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /turf/open/floor, /area/oscar_outpost) "rs" = ( @@ -1888,7 +1888,7 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/northeast) "rG" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/glass/bucket/janibucket, /turf/open/floor, /area/oscar_outpost) @@ -2674,7 +2674,7 @@ name = "barley"; plantname = "barley" }, -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/machinery/light{ dir = 1 }, @@ -2853,7 +2853,7 @@ /turf/open/ground/grass, /area/oscar_outpost/outside/northeast) "Dj" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/food_or_drink/beer/oscaroutpost{ pixel_x = -5; pixel_y = 15 @@ -3486,7 +3486,7 @@ }, /area/oscar_outpost/outside/northwest) "Jn" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/food/drinks/flask/barflask{ pixel_x = -8; pixel_y = 15 @@ -3627,7 +3627,7 @@ }, /area/oscar_outpost) "KD" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/item/reagent_containers/food/snacks/grown/grapes, /obj/item/reagent_containers/food/snacks/grown/grapes, /obj/item/reagent_containers/food/snacks/grown/grapes, @@ -3700,7 +3700,7 @@ name = "barley"; plantname = "barley" }, -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/food_or_drink/kitchen, /turf/open/floor, /area/oscar_outpost) @@ -5123,7 +5123,7 @@ /turf/open/floor/plating/ground/dirt, /area/oscar_outpost/outside/northwest) "Ye" = ( -/obj/structure/table/rusticwoodentable, +/obj/structure/table/wood/rustic, /obj/effect/spawner/random/food_or_drink/wine{ pixel_x = -8; pixel_y = 18 diff --git a/_maps/modularmaps/oscaroutpost/oscarsouthvar1.dmm b/_maps/modularmaps/oscaroutpost/oscarsouthvar1.dmm index ad1a03cbcfb..ca3e38c9477 100644 --- a/_maps/modularmaps/oscaroutpost/oscarsouthvar1.dmm +++ b/_maps/modularmaps/oscaroutpost/oscarsouthvar1.dmm @@ -1464,7 +1464,7 @@ /turf/open/floor/grayscale/black, /area/oscar_outpost/village/abandonedbase) "rL" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/faxmachine, /turf/open/floor/carpet, /area/oscar_outpost/village/abandonedbase) @@ -1841,7 +1841,7 @@ /turf/open/floor/grayscale/black, /area/oscar_outpost/village/abandonedbase) "wt" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/trash/cigbutt/cigarbutt{ pixel_y = 14 }, @@ -1861,7 +1861,7 @@ /turf/open/floor/plating/icefloor/warnplate, /area/oscar_outpost/village/abandonedbase/tadlandingzone) "wI" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/machinery/random_broken_computer/small/pc, /turf/open/floor/carpet, /area/oscar_outpost/village/abandonedbase) @@ -2392,7 +2392,7 @@ /turf/open/floor/grayscale/black, /area/oscar_outpost/village/abandonedbase) "Ej" = ( -/obj/structure/table/fancywoodentable{ +/obj/structure/table/wood/fancy{ pixel_y = 5 }, /obj/item/tool/pen, @@ -2836,7 +2836,7 @@ /turf/open/floor/mainship/sterile/dark, /area/oscar_outpost/village/abandonedbase) "KL" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/machinery/random_broken_computer/small/pc{ dir = 4 }, @@ -3258,7 +3258,7 @@ /turf/open/floor/grayscale/black, /area/oscar_outpost/village/abandonedbase) "Rn" = ( -/obj/structure/table/fancywoodentable{ +/obj/structure/table/wood/fancy{ pixel_y = 5 }, /obj/item/tool/pen, @@ -3700,7 +3700,7 @@ pixel_x = -8 }, /obj/item/reagent_containers/food/drinks/bottle/vodka, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/light, /turf/open/floor/carpet, /area/oscar_outpost/village/abandonedbase) diff --git a/_maps/modularmaps/oscaroutpost/oscarsouthvar2.dmm b/_maps/modularmaps/oscaroutpost/oscarsouthvar2.dmm index 74d0211d3b9..d76550149bd 100644 --- a/_maps/modularmaps/oscaroutpost/oscarsouthvar2.dmm +++ b/_maps/modularmaps/oscaroutpost/oscarsouthvar2.dmm @@ -1386,7 +1386,7 @@ /turf/open/floor/grayscale/black, /area/oscar_outpost/village/abandonedbase) "rL" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/faxmachine, /turf/open/floor/carpet, /area/oscar_outpost/village/abandonedbase) @@ -1722,7 +1722,7 @@ /turf/open/floor/grayscale/black, /area/oscar_outpost/village/abandonedbase) "wt" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/trash/cigbutt/cigarbutt{ pixel_y = 14 }, @@ -1738,7 +1738,7 @@ /turf/open/floor/wood, /area/oscar_outpost/village/abandonedbase) "wI" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/machinery/random_broken_computer/small/pc, /turf/open/floor/carpet, /area/oscar_outpost/village/abandonedbase) @@ -2215,7 +2215,7 @@ /turf/open/floor/grayscale/black, /area/oscar_outpost/village/abandonedbase) "Ej" = ( -/obj/structure/table/fancywoodentable{ +/obj/structure/table/wood/fancy{ pixel_y = 5 }, /obj/item/tool/pen, @@ -2610,7 +2610,7 @@ /turf/open/floor/mainship/sterile/dark, /area/oscar_outpost/village/abandonedbase) "KL" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/machinery/random_broken_computer/small/pc{ dir = 4 }, @@ -3007,7 +3007,7 @@ /turf/open/floor/grayscale/black, /area/oscar_outpost/village/abandonedbase) "Rn" = ( -/obj/structure/table/fancywoodentable{ +/obj/structure/table/wood/fancy{ pixel_y = 5 }, /obj/item/tool/pen, @@ -3435,7 +3435,7 @@ pixel_x = -8 }, /obj/item/reagent_containers/food/drinks/bottle/vodka, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/light, /turf/open/floor/carpet, /area/oscar_outpost/village/abandonedbase) diff --git a/_maps/modularmaps/oscaroutpost/oscarsouthvar3.dmm b/_maps/modularmaps/oscaroutpost/oscarsouthvar3.dmm index 5d513db9f39..bd5aaa4f252 100644 --- a/_maps/modularmaps/oscaroutpost/oscarsouthvar3.dmm +++ b/_maps/modularmaps/oscaroutpost/oscarsouthvar3.dmm @@ -1441,7 +1441,7 @@ /turf/open/floor/grayscale/black, /area/oscar_outpost/village/abandonedbase) "rL" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/faxmachine, /turf/open/floor/carpet, /area/oscar_outpost/village/abandonedbase) @@ -1823,7 +1823,7 @@ /turf/open/floor/grayscale/black, /area/oscar_outpost/village/abandonedbase) "wt" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/trash/cigbutt/cigarbutt{ pixel_y = 14 }, @@ -1843,7 +1843,7 @@ /turf/open/floor/plating/icefloor/warnplate, /area/oscar_outpost/village/abandonedbase/tadlandingzone) "wI" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/machinery/random_broken_computer/small/pc, /turf/open/floor/carpet, /area/oscar_outpost/village/abandonedbase) @@ -2346,7 +2346,7 @@ /turf/open/floor/grayscale/black, /area/oscar_outpost/village/abandonedbase) "Ej" = ( -/obj/structure/table/fancywoodentable{ +/obj/structure/table/wood/fancy{ pixel_y = 5 }, /obj/item/tool/pen, @@ -2738,7 +2738,7 @@ /turf/open/floor/grayscale/black, /area/oscar_outpost/village/abandonedbase) "KL" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/machinery/random_broken_computer/small/pc{ dir = 4 }, @@ -3122,7 +3122,7 @@ /turf/open/floor/grayscale/black, /area/oscar_outpost/village/abandonedbase) "Rn" = ( -/obj/structure/table/fancywoodentable{ +/obj/structure/table/wood/fancy{ pixel_y = 5 }, /obj/item/tool/pen, @@ -3530,7 +3530,7 @@ pixel_x = -8 }, /obj/item/reagent_containers/food/drinks/bottle/vodka, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/light, /turf/open/floor/carpet, /area/oscar_outpost/village/abandonedbase) diff --git a/_maps/modularmaps/oscaroutpost/oscarsouthvar4.dmm b/_maps/modularmaps/oscaroutpost/oscarsouthvar4.dmm index f40dfdd9399..f4b1c27a5ce 100644 --- a/_maps/modularmaps/oscaroutpost/oscarsouthvar4.dmm +++ b/_maps/modularmaps/oscaroutpost/oscarsouthvar4.dmm @@ -864,7 +864,7 @@ /turf/open/floor/plating, /area/oscar_outpost/village/abandonedbase) "rL" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/faxmachine, /turf/open/floor/carpet, /area/oscar_outpost/village/abandonedbase) @@ -1006,7 +1006,7 @@ /turf/open/floor/grayscale/black, /area/oscar_outpost/village/abandonedbase) "wI" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/machinery/random_broken_computer/small/pc, /turf/open/floor/carpet, /area/oscar_outpost/village/abandonedbase) @@ -1319,7 +1319,7 @@ /turf/open/floor/grayscale/black, /area/oscar_outpost/village/abandonedbase) "Ej" = ( -/obj/structure/table/fancywoodentable{ +/obj/structure/table/wood/fancy{ pixel_y = 5 }, /obj/item/tool/pen, @@ -1534,7 +1534,7 @@ /turf/open/floor/mainship/sterile/dark, /area/oscar_outpost/village/abandonedbase) "KL" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/machinery/random_broken_computer/small/pc{ dir = 4 }, @@ -1787,7 +1787,7 @@ /turf/open/floor/plating/ground/dirt, /area/oscar_outpost/village/abandonedbase) "Rn" = ( -/obj/structure/table/fancywoodentable{ +/obj/structure/table/wood/fancy{ pixel_y = 5 }, /obj/item/tool/pen, @@ -2058,7 +2058,7 @@ pixel_x = -8 }, /obj/item/reagent_containers/food/drinks/bottle/vodka, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/light, /turf/open/floor/carpet, /area/oscar_outpost/village/abandonedbase) diff --git a/_maps/modularmaps/oscaroutpost/oscarsouthvar5.dmm b/_maps/modularmaps/oscaroutpost/oscarsouthvar5.dmm index cfdc4573782..3330e276ed6 100644 --- a/_maps/modularmaps/oscaroutpost/oscarsouthvar5.dmm +++ b/_maps/modularmaps/oscaroutpost/oscarsouthvar5.dmm @@ -1388,7 +1388,7 @@ /turf/open/floor/grayscale/black, /area/oscar_outpost/village/abandonedbase) "rL" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/faxmachine, /turf/open/floor/carpet, /area/oscar_outpost/village/abandonedbase) @@ -1728,7 +1728,7 @@ /turf/open/floor/grayscale/black, /area/oscar_outpost/village/abandonedbase) "wt" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/trash/cigbutt/cigarbutt{ pixel_y = 14 }, @@ -1744,7 +1744,7 @@ /turf/open/floor/wood, /area/oscar_outpost/village/abandonedbase) "wI" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/machinery/random_broken_computer/small/pc, /turf/open/floor/carpet, /area/oscar_outpost/village/abandonedbase) @@ -2221,7 +2221,7 @@ /turf/open/floor/grayscale/black, /area/oscar_outpost/village/abandonedbase) "Ej" = ( -/obj/structure/table/fancywoodentable{ +/obj/structure/table/wood/fancy{ pixel_y = 5 }, /obj/item/tool/pen, @@ -2608,7 +2608,7 @@ /turf/open/floor/mainship/sterile/dark, /area/oscar_outpost/village/abandonedbase) "KL" = ( -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/effect/spawner/random/machinery/random_broken_computer/small/pc{ dir = 4 }, @@ -3011,7 +3011,7 @@ /turf/open/floor/grayscale/black, /area/oscar_outpost/village/abandonedbase) "Rn" = ( -/obj/structure/table/fancywoodentable{ +/obj/structure/table/wood/fancy{ pixel_y = 5 }, /obj/item/tool/pen, @@ -3446,7 +3446,7 @@ pixel_x = -8 }, /obj/item/reagent_containers/food/drinks/bottle/vodka, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/machinery/light, /turf/open/floor/carpet, /area/oscar_outpost/village/abandonedbase) diff --git a/_maps/modularmaps/oscaroutpost/oscarsouthvar7.dmm b/_maps/modularmaps/oscaroutpost/oscarsouthvar7.dmm index faf7fd83092..0d55e5f060a 100644 --- a/_maps/modularmaps/oscaroutpost/oscarsouthvar7.dmm +++ b/_maps/modularmaps/oscaroutpost/oscarsouthvar7.dmm @@ -397,7 +397,7 @@ /turf/open/floor/wood, /area/oscar_outpost/village/abandonedbase) "lx" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/toy/deck, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -408,7 +408,7 @@ /turf/open/floor/wood/broken, /area/oscar_outpost/village/abandonedbase) "lA" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/ashtray/glass, /obj/item/trash/cigbutt, /obj/item/trash/cigbutt, @@ -635,7 +635,7 @@ /turf/open/floor/tile/bar, /area/oscar_outpost/village/abandonedbase) "pq" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/spacecash/bundle/c10, /obj/item/toy/deck, /turf/open/floor/wood, @@ -808,7 +808,7 @@ /turf/open/floor/tile/bar, /area/oscar_outpost/village/abandonedbase) "tT" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/ai_node, /turf/open/floor/wood, /area/oscar_outpost/village/abandonedbase) @@ -837,7 +837,7 @@ /turf/open/floor/tile/bar, /area/oscar_outpost/village/abandonedbase) "uv" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/pizzabox/margherita, /obj/item/trash/chips, /obj/machinery/light{ @@ -968,7 +968,7 @@ /turf/closed/mineral/smooth, /area/oscar_outpost/outside/rock) "yX" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/structure/platform, /turf/open/floor/wood, /area/oscar_outpost/village/abandonedbase) @@ -1274,7 +1274,7 @@ /turf/open/floor/tile/bar, /area/oscar_outpost/village/abandonedbase) "Ga" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/storage/donut_box, /obj/item/tool/lighter, /obj/machinery/light{ @@ -1696,7 +1696,7 @@ /turf/open/floor/tile/bar, /area/oscar_outpost/village/abandonedbase) "Qj" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /turf/open/floor/wood, /area/oscar_outpost/village/abandonedbase) "Qq" = ( @@ -1892,7 +1892,7 @@ /turf/open/floor/tile/bar, /area/oscar_outpost/village/abandonedbase) "Ur" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/toy/deck, /obj/item/spacecash/bundle/c10, /turf/open/floor/wood, @@ -2028,12 +2028,12 @@ /turf/open/floor/wood, /area/oscar_outpost/village/abandonedbase) "WA" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/effect/spawner/random/machinery/random_broken_computer/small/emails, /turf/open/floor/wood, /area/oscar_outpost/village/abandonedbase) "WM" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/flashlight/lamp/green, /turf/open/floor/wood, /area/oscar_outpost/village/abandonedbase) @@ -2132,7 +2132,7 @@ /turf/open/floor/tile/bar, /area/oscar_outpost/village/abandonedbase) "XY" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/folder/blue, /turf/open/floor/wood, /area/oscar_outpost/village/abandonedbase) @@ -2169,7 +2169,7 @@ /turf/open/floor/tile/bar, /area/oscar_outpost/village/abandonedbase) "Yy" = ( -/obj/structure/table/woodentable, +/obj/structure/table/wood, /obj/item/newspaper, /turf/open/floor/wood, /area/oscar_outpost/village/abandonedbase) diff --git a/_maps/shuttles/minidropship_mobile_bar.dmm b/_maps/shuttles/minidropship_mobile_bar.dmm index a63dc328826..2d16c6becf3 100644 --- a/_maps/shuttles/minidropship_mobile_bar.dmm +++ b/_maps/shuttles/minidropship_mobile_bar.dmm @@ -19,7 +19,7 @@ }, /area/shuttle/minidropship) "e" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/machinery/chem_dispenser/beer{ dir = 4 }, @@ -44,7 +44,7 @@ id = "minidropship_podlock" }, /obj/machinery/door/poddoor/shutters/transit/nonsmoothing, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/structure/barricade/metal{ dir = 4 }, @@ -64,7 +64,7 @@ id = "minidropship_podlock" }, /obj/machinery/door/poddoor/shutters/transit/nonsmoothing, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/structure/barricade/metal{ dir = 8 }, @@ -99,7 +99,7 @@ id = "minidropship_podlock" }, /obj/machinery/door/poddoor/shutters/transit/nonsmoothing, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/structure/dropship_piece/tadpole/engine{ dir = 1; pixel_x = -23 @@ -168,7 +168,7 @@ id = "minidropship_podlock" }, /obj/machinery/door/poddoor/shutters/transit/nonsmoothing, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/item/reagent_containers/glass/rag, /obj/structure/barricade/metal{ dir = 4 @@ -242,7 +242,7 @@ /turf/open/floor/carpet/side, /area/shuttle/minidropship) "M" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/wood/gambling, /obj/machinery/chem_dispenser/soda{ dir = 4 }, @@ -303,7 +303,7 @@ /obj/machinery/reagentgrinder{ pixel_y = 5 }, -/obj/structure/table/fancywoodentable, +/obj/structure/table/wood/fancy, /obj/structure/barricade/metal{ dir = 4 }, diff --git a/code/__DEFINES/footsteps.dm b/code/__DEFINES/footsteps.dm index 1d32f06317b..ab292dc4d43 100644 --- a/code/__DEFINES/footsteps.dm +++ b/code/__DEFINES/footsteps.dm @@ -3,9 +3,13 @@ #define FOOTSTEP_PLATING "plating" #define FOOTSTEP_CARPET "carpet" #define FOOTSTEP_SAND "sand" +#define FOOTSTEP_DIRT "dirt" #define FOOTSTEP_GRASS "grass" +#define FOOTSTEP_WET "wet" #define FOOTSTEP_WATER "water" +#define FOOTSTEP_SWIM "swim" #define FOOTSTEP_RESIN "resin" +#define FOOTSTEP_HULL "hull" #define FOOTSTEP_CATWALK "catwalk" #define FOOTSTEP_SNOW "snow" #define FOOTSTEP_ICE "ice" @@ -51,6 +55,11 @@ GLOBAL_LIST_INIT(shoefootstep, list( 'sound/effects/footstep/carpet4.ogg', 'sound/effects/footstep/carpet5.ogg'), 75, -1), FOOTSTEP_SAND = list(list( + 'sound/effects/footstep/sand1.ogg', + 'sound/effects/footstep/sand2.ogg', + 'sound/effects/footstep/sand3.ogg', + 'sound/effects/footstep/asteroid4.ogg'), 75, 0), + FOOTSTEP_DIRT = list(list( 'sound/effects/footstep/asteroid1.ogg', 'sound/effects/footstep/asteroid2.ogg', 'sound/effects/footstep/asteroid3.ogg', @@ -61,14 +70,28 @@ GLOBAL_LIST_INIT(shoefootstep, list( 'sound/effects/footstep/grass2.ogg', 'sound/effects/footstep/grass3.ogg', 'sound/effects/footstep/grass4.ogg'), 75, 0), + FOOTSTEP_WET = list(list( + 'sound/effects/footstep/waterstep1.ogg', + 'sound/effects/footstep/waterstep2.ogg', + 'sound/effects/footstep/water3.ogg'), 100, 1), FOOTSTEP_WATER = list(list( 'sound/effects/footstep/water1.ogg', 'sound/effects/footstep/water2.ogg', 'sound/effects/footstep/water3.ogg', 'sound/effects/footstep/water4.ogg'), 100, 1), + FOOTSTEP_SWIM = list(list( + 'sound/effects/footstep/swimming1.ogg', + 'sound/effects/footstep/swimming2.ogg', + 'sound/effects/footstep/swimming3.ogg'), 100, 1), FOOTSTEP_RESIN = list(list( 'sound/effects/footstep/alien/resin_move1.ogg', 'sound/effects/footstep/alien/resin_move2.ogg',), 50, 2), + FOOTSTEP_HULL = list(list( + 'sound/effects/footstep/hull1.ogg', + 'sound/effects/footstep/hull2.ogg', + 'sound/effects/footstep/hull3.ogg', + 'sound/effects/footstep/hull4.ogg', + 'sound/effects/footstep/hull5.ogg'), 100, 1), FOOTSTEP_CATWALK = list(list( 'sound/effects/footstep/catwalk1.ogg', 'sound/effects/footstep/catwalk2.ogg', @@ -115,6 +138,13 @@ GLOBAL_LIST_INIT(shoefootstep, list( //bare footsteps lists GLOBAL_LIST_INIT(barefootstep, list( + FOOTSTEP_FLOOR = list(list( + 'sound/effects/footstep/woodbarefoot1.ogg', + 'sound/effects/footstep/woodbarefoot2.ogg', + 'sound/effects/footstep/woodbarefoot3.ogg', + 'sound/effects/footstep/woodbarefoot4.ogg', + 'sound/effects/footstep/woodbarefoot5.ogg' + ), 80, -1), FOOTSTEP_WOOD = list(list( 'sound/effects/footstep/woodbarefoot1.ogg', 'sound/effects/footstep/woodbarefoot2.ogg', @@ -140,6 +170,11 @@ GLOBAL_LIST_INIT(barefootstep, list( 'sound/effects/footstep/carpetbarefoot4.ogg', 'sound/effects/footstep/carpetbarefoot5.ogg'), 75, -2), FOOTSTEP_SAND = list(list( + 'sound/effects/footstep/sand1.ogg', + 'sound/effects/footstep/sand2.ogg', + 'sound/effects/footstep/sand3.ogg', + 'sound/effects/footstep/asteroid4.ogg'), 60, 0), + FOOTSTEP_DIRT = list(list( 'sound/effects/footstep/asteroid1.ogg', 'sound/effects/footstep/asteroid2.ogg', 'sound/effects/footstep/asteroid3.ogg', @@ -150,14 +185,28 @@ GLOBAL_LIST_INIT(barefootstep, list( 'sound/effects/footstep/grass2.ogg', 'sound/effects/footstep/grass3.ogg', 'sound/effects/footstep/grass4.ogg'), 75, 0), + FOOTSTEP_WET = list(list( + 'sound/effects/footstep/waterstep1.ogg', + 'sound/effects/footstep/waterstep2.ogg', + 'sound/effects/footstep/water3.ogg'), 100, 1), FOOTSTEP_WATER = list(list( 'sound/effects/footstep/water1.ogg', 'sound/effects/footstep/water2.ogg', 'sound/effects/footstep/water3.ogg', 'sound/effects/footstep/water4.ogg'), 100, 1), + FOOTSTEP_SWIM = list(list( + 'sound/effects/footstep/swimming1.ogg', + 'sound/effects/footstep/swimming2.ogg', + 'sound/effects/footstep/swimming3.ogg'), 100, 1), FOOTSTEP_RESIN = list(list( 'sound/effects/footstep/alien/resin_move1.ogg', 'sound/effects/footstep/alien/resin_move2.ogg',), 70, 2), + FOOTSTEP_HULL = list(list( + 'sound/effects/footstep/hull1.ogg', + 'sound/effects/footstep/hull2.ogg', + 'sound/effects/footstep/hull3.ogg', + 'sound/effects/footstep/hull4.ogg', + 'sound/effects/footstep/hull5.ogg'), 80, 1), FOOTSTEP_CATWALK = list(list( 'sound/effects/footstep/catwalk1.ogg', 'sound/effects/footstep/catwalk2.ogg', @@ -230,24 +279,43 @@ GLOBAL_LIST_INIT(xenomediumstep, list( 'sound/effects/footstep/carpetbarefoot4.ogg', 'sound/effects/footstep/carpetbarefoot5.ogg'), 55, -1), FOOTSTEP_SAND = list(list( + 'sound/effects/footstep/sand1.ogg', + 'sound/effects/footstep/sand2.ogg', + 'sound/effects/footstep/sand3.ogg', + 'sound/effects/footstep/asteroid4.ogg'), 55, 0), + FOOTSTEP_DIRT = list(list( 'sound/effects/footstep/asteroid1.ogg', 'sound/effects/footstep/asteroid2.ogg', 'sound/effects/footstep/asteroid3.ogg', 'sound/effects/footstep/asteroid4.ogg', - 'sound/effects/footstep/asteroid5.ogg'), 55, 1), + 'sound/effects/footstep/asteroid5.ogg'), 55, 0), FOOTSTEP_GRASS = list(list( 'sound/effects/footstep/grass1.ogg', 'sound/effects/footstep/grass2.ogg', 'sound/effects/footstep/grass3.ogg', 'sound/effects/footstep/grass4.ogg'), 65, 1), + FOOTSTEP_WET = list(list( + 'sound/effects/footstep/waterstep1.ogg', + 'sound/effects/footstep/waterstep2.ogg', + 'sound/effects/footstep/water3.ogg'), 50, 1), FOOTSTEP_WATER = list(list( 'sound/effects/footstep/water1.ogg', 'sound/effects/footstep/water2.ogg', 'sound/effects/footstep/water3.ogg', 'sound/effects/footstep/water4.ogg'), 50, 1), + FOOTSTEP_SWIM = list(list( + 'sound/effects/footstep/swimming1.ogg', + 'sound/effects/footstep/swimming2.ogg', + 'sound/effects/footstep/swimming3.ogg'), 50, 1), FOOTSTEP_RESIN = list(list( 'sound/effects/footstep/alien/resin_move1.ogg', 'sound/effects/footstep/alien/resin_move2.ogg',), 15, -4), + FOOTSTEP_HULL = list(list( + 'sound/effects/footstep/hull1.ogg', + 'sound/effects/footstep/hull2.ogg', + 'sound/effects/footstep/hull3.ogg', + 'sound/effects/footstep/hull4.ogg', + 'sound/effects/footstep/hull5.ogg'), 70, 1), FOOTSTEP_CATWALK = list(list( 'sound/effects/footstep/catwalk1.ogg', 'sound/effects/footstep/catwalk2.ogg', @@ -319,22 +387,43 @@ GLOBAL_LIST_INIT(xenoheavystep, list( 'sound/effects/footstep/heavy2.ogg', 'sound/effects/footstep/heavy3.ogg'), 100, 2), FOOTSTEP_SAND = list(list( - 'sound/effects/footstep/heavy1.ogg', - 'sound/effects/footstep/heavy2.ogg', - 'sound/effects/footstep/heavy3.ogg'), 100, 2), + 'sound/effects/footstep/sand1.ogg', + 'sound/effects/footstep/sand2.ogg', + 'sound/effects/footstep/sand3.ogg', + 'sound/effects/footstep/asteroid4.ogg'), 100, 0), + FOOTSTEP_DIRT = list(list( + 'sound/effects/footstep/asteroid1.ogg', + 'sound/effects/footstep/asteroid2.ogg', + 'sound/effects/footstep/asteroid3.ogg', + 'sound/effects/footstep/asteroid4.ogg', + 'sound/effects/footstep/asteroid5.ogg'), 100, 0), FOOTSTEP_GRASS = list(list( 'sound/effects/footstep/heavy1.ogg', 'sound/effects/footstep/heavy2.ogg', 'sound/effects/footstep/heavy3.ogg'), 100, 2), + FOOTSTEP_WET = list(list( + 'sound/effects/footstep/waterstep1.ogg', + 'sound/effects/footstep/waterstep2.ogg', + 'sound/effects/footstep/water3.ogg'), 100, 1), FOOTSTEP_WATER = list(list( 'sound/effects/footstep/water1.ogg', 'sound/effects/footstep/water2.ogg', 'sound/effects/footstep/water3.ogg', - 'sound/effects/footstep/water4.ogg'), 50, 1), + 'sound/effects/footstep/water4.ogg'), 100, 1), + FOOTSTEP_SWIM = list(list( + 'sound/effects/footstep/swimming1.ogg', + 'sound/effects/footstep/swimming2.ogg', + 'sound/effects/footstep/swimming3.ogg'), 100, 1), FOOTSTEP_RESIN = list(list( 'sound/effects/footstep/heavy1.ogg', 'sound/effects/footstep/heavy2.ogg', 'sound/effects/footstep/heavy3.ogg'), 100, 2), + FOOTSTEP_HULL = list(list( + 'sound/effects/footstep/hull1.ogg', + 'sound/effects/footstep/hull2.ogg', + 'sound/effects/footstep/hull3.ogg', + 'sound/effects/footstep/hull4.ogg', + 'sound/effects/footstep/hull5.ogg'), 100, 1), FOOTSTEP_CATWALK = list(list( 'sound/effects/footstep/heavy1.ogg', 'sound/effects/footstep/heavy2.ogg', @@ -383,6 +472,10 @@ GLOBAL_LIST_INIT(xenostompy, list( 'sound/effects/footstep/alien/large1.ogg', 'sound/effects/footstep/alien/large2.ogg', 'sound/effects/footstep/alien/large3.ogg'), 55, 1), + FOOTSTEP_DIRT = list(list( + 'sound/effects/footstep/alien/large1.ogg', + 'sound/effects/footstep/alien/large2.ogg', + 'sound/effects/footstep/alien/large3.ogg'), 55, 1), FOOTSTEP_GRASS = list(list( 'sound/effects/footstep/alien/large1.ogg', 'sound/effects/footstep/alien/large2.ogg', @@ -412,10 +505,18 @@ GLOBAL_LIST_INIT(xenostompy, list( 'sound/effects/footstep/alien/large1.ogg', 'sound/effects/footstep/alien/large2.ogg', 'sound/effects/footstep/alien/large3.ogg'), 55, 1), + FOOTSTEP_SWIM = list(list( + 'sound/effects/footstep/swimming1.ogg', + 'sound/effects/footstep/swimming2.ogg', + 'sound/effects/footstep/swimming3.ogg'), 100, 1), FOOTSTEP_RESIN = list(list( 'sound/effects/footstep/alien/large1.ogg', 'sound/effects/footstep/alien/large2.ogg', 'sound/effects/footstep/alien/large3.ogg'), 40, -1), + FOOTSTEP_HULL = list(list( + 'sound/effects/footstep/alien/large1.ogg', + 'sound/effects/footstep/alien/large2.ogg', + 'sound/effects/footstep/alien/large3.ogg'), 50, 1), )) GLOBAL_LIST_INIT(predalienstompy, list( @@ -443,6 +544,10 @@ GLOBAL_LIST_INIT(predalienstompy, list( 'sound/effects/footstep/alien/medium1.ogg', 'sound/effects/footstep/alien/medium2.ogg', 'sound/effects/footstep/alien/medium3.ogg'), 55, 1), + FOOTSTEP_DIRT = list(list( + 'sound/effects/footstep/alien/medium1.ogg', + 'sound/effects/footstep/alien/medium2.ogg', + 'sound/effects/footstep/alien/medium3.ogg'), 55, 1), FOOTSTEP_GRASS = list(list( 'sound/effects/footstep/alien/medium1.ogg', 'sound/effects/footstep/alien/medium2.ogg', @@ -472,8 +577,16 @@ GLOBAL_LIST_INIT(predalienstompy, list( 'sound/effects/footstep/alien/medium1.ogg', 'sound/effects/footstep/alien/medium2.ogg', 'sound/effects/footstep/alien/medium3.ogg'), 55, 1), + FOOTSTEP_SWIM = list(list( + 'sound/effects/footstep/swimming1.ogg', + 'sound/effects/footstep/swimming2.ogg', + 'sound/effects/footstep/swimming3.ogg'), 70, -1), FOOTSTEP_RESIN = list(list( 'sound/effects/footstep/alien/medium1.ogg', 'sound/effects/footstep/alien/medium2.ogg', 'sound/effects/footstep/alien/medium3.ogg'), 40, -1), + FOOTSTEP_HULL = list(list( + 'sound/effects/footstep/alien/medium1.ogg', + 'sound/effects/footstep/alien/medium2.ogg', + 'sound/effects/footstep/alien/medium3.ogg'), 40, -1), )) diff --git a/code/datums/elements/footstep.dm b/code/datums/elements/footstep.dm index fa820a46ff2..b54b07558f4 100644 --- a/code/datums/elements/footstep.dm +++ b/code/datums/elements/footstep.dm @@ -41,12 +41,10 @@ footstep_sounds = GLOB.xenomediumstep if(FOOTSTEP_XENO_HEAVY) footstep_sounds = GLOB.xenoheavystep - //RUTGMC EDIT ADDITION BEGIN - XENO_STOMP if(FOOTSTEP_XENO_STOMPY) footstep_sounds = GLOB.xenostompy if(FOOTSTEP_PREDALIEN_STOMPY) footstep_sounds = GLOB.predalienstompy - //RUTGMC EDIT ADDITION END RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(simplestep_wrapper)) RegisterSignal(target, COMSIG_ELEMENT_JUMP_ENDED, PROC_REF(play_simplestep)) steps_for_living[target] = 0 @@ -143,12 +141,10 @@ turf_footstep = source_loc.barefootstep if(FOOTSTEP_MOB_SHOE) turf_footstep = source_loc.shoefootstep - //RUTGMC EDIT ADDITION BEGIN - XENO_STOMP if(FOOTSTEP_XENO_STOMPY) turf_footstep = source_loc.mediumxenofootstep if(FOOTSTEP_PREDALIEN_STOMPY) turf_footstep = source_loc.mediumxenofootstep - //RUTGMC EDIT ADDITION END if(!turf_footstep) return playsound( diff --git a/code/game/atoms/atom_movable.dm b/code/game/atoms/atom_movable.dm index d421e50688b..2a6db8a92b1 100644 --- a/code/game/atoms/atom_movable.dm +++ b/code/game/atoms/atom_movable.dm @@ -1202,3 +1202,13 @@ RU TGMC EDIT */ //Throws AM away from something /atom/movable/proc/knockback(source, distance, speed, dir, knockback_force = MOVE_FORCE_EXTREMELY_STRONG) safe_throw_at(get_ranged_target_turf(src, dir ? dir : get_dir(source, src), distance), distance, speed, source, FALSE, knockback_force) + +///overrides the turf's normal footstep sound +/atom/movable/proc/footstep_override(atom/movable/source, list/footstep_overrides) + SIGNAL_HANDLER + return //override as required with the specific footstep sound + +///returns that src is covering its turf. Used to prevent turf interactions such as water +/atom/movable/proc/turf_cover_check(atom/movable/source) + SIGNAL_HANDLER + return TRUE diff --git a/code/game/objects/effects/decals/turfdecals/environmental.dm b/code/game/objects/effects/decals/turfdecals/environmental.dm index 1edc04bd59e..402075271b4 100644 --- a/code/game/objects/effects/decals/turfdecals/environmental.dm +++ b/code/game/objects/effects/decals/turfdecals/environmental.dm @@ -82,6 +82,15 @@ SMOOTH_GROUP_GRILLE, ) +/obj/effect/turf_decal/riverdecal/Initialize(mapload) + . = ..() + var/static/list/connections = list( + COMSIG_FIND_FOOTSTEP_SOUND = TYPE_PROC_REF(/atom/movable, footstep_override), + ) + AddElement(/datum/element/connect_loc, connections) + +/obj/effect/turf_decal/footstep_override(atom/movable/source, list/footstep_overrides) + footstep_overrides[FOOTSTEP_WET] = layer /obj/effect/turf_decal/riverdecal/edge icon_state = "riverdecal_edge" diff --git a/code/game/objects/effects/spawners/random/misc_structure.dm b/code/game/objects/effects/spawners/random/misc_structure.dm index 406fff421e9..7e7641348a6 100644 --- a/code/game/objects/effects/spawners/random/misc_structure.dm +++ b/code/game/objects/effects/spawners/random/misc_structure.dm @@ -300,7 +300,7 @@ icon_state = "random_wood_table" spawn_loot_chance = 95 loot = list( - /obj/structure/table/woodentable = 99, + /obj/structure/table/wood = 99, /obj/effect/spawner/random/engineering/wood = 1, ) diff --git a/code/game/objects/effects/weeds.dm b/code/game/objects/effects/weeds.dm index 04a90400900..fec79dacdc2 100644 --- a/code/game/objects/effects/weeds.dm +++ b/code/game/objects/effects/weeds.dm @@ -38,7 +38,7 @@ /obj/alien/weeds/Initialize(mapload, obj/alien/weeds/node/node, swapped = FALSE) . = ..() var/static/list/connections = list( - COMSIG_FIND_FOOTSTEP_SOUND = PROC_REF(footstep_override) + COMSIG_FIND_FOOTSTEP_SOUND = TYPE_PROC_REF(/atom/movable, footstep_override) ) AddElement(/datum/element/connect_loc, connections) @@ -131,8 +131,7 @@ parent_node = null ///overrides the turf's normal footstep sound -/obj/alien/weeds/proc/footstep_override(atom/movable/source, list/footstep_overrides) - SIGNAL_HANDLER +/obj/alien/weeds/footstep_override(atom/movable/source, list/footstep_overrides) footstep_overrides[FOOTSTEP_RESIN] = layer /obj/alien/weeds/sticky diff --git a/code/game/objects/items/frames/table_rack.dm b/code/game/objects/items/frames/table_rack.dm index e13d0f43fe2..a3b3fe87c38 100644 --- a/code/game/objects/items/frames/table_rack.dm +++ b/code/game/objects/items/frames/table_rack.dm @@ -1,6 +1,3 @@ - - - /* * Table Parts */ @@ -99,7 +96,7 @@ desc = "A kit for a table, including a large, flat wooden surface and four legs. Some assembly required." icon_state = "wood_tableparts" flags_atom = null - table_type = /obj/structure/table/woodentable + table_type = /obj/structure/table/wood deconstruct_type = /obj/item/stack/sheet/wood /obj/item/frame/table/wood/attackby(obj/item/I, mob/user, params) @@ -129,7 +126,7 @@ desc = "A kit for a table, including a large, flat wooden and carpet surface and four legs. Some assembly required." icon_state = "gamble_tableparts" flags_atom = null - table_type = /obj/structure/table/gamblingtable + table_type = /obj/structure/table/wood/gambling deconstruct_type = /obj/item/stack/sheet/wood /obj/item/frame/table/gambling/attackby(obj/item/I, mob/user, params) @@ -141,11 +138,6 @@ new /obj/item/frame/table/wood(loc) qdel(src) - - - - - /* * Rack Parts */ diff --git a/code/game/objects/machinery/OpTable.dm b/code/game/objects/machinery/OpTable.dm index 9c0f0aff6c0..84c415c337b 100644 --- a/code/game/objects/machinery/OpTable.dm +++ b/code/game/objects/machinery/OpTable.dm @@ -27,6 +27,8 @@ var/static/list/connections = list( COMSIG_OBJ_TRY_ALLOW_THROUGH = PROC_REF(can_climb_over), + COMSIG_FIND_FOOTSTEP_SOUND = TYPE_PROC_REF(/atom/movable, footstep_override), + COMSIG_TURF_CHECK_COVERED = TYPE_PROC_REF(/atom/movable, turf_cover_check), ) AddElement(/datum/element/connect_loc, connections) diff --git a/code/game/objects/machinery/spaceheater.dm b/code/game/objects/machinery/spaceheater.dm index dce6d168fcf..7393db5fb49 100644 --- a/code/game/objects/machinery/spaceheater.dm +++ b/code/game/objects/machinery/spaceheater.dm @@ -22,6 +22,8 @@ update_icon() var/static/list/connections = list( COMSIG_OBJ_TRY_ALLOW_THROUGH = PROC_REF(can_climb_over), + COMSIG_FIND_FOOTSTEP_SOUND = TYPE_PROC_REF(/atom/movable, footstep_override), + COMSIG_TURF_CHECK_COVERED = TYPE_PROC_REF(/atom/movable, turf_cover_check), ) AddElement(/datum/element/connect_loc, connections) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 5f360dcff84..3b053a9454e 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -321,3 +321,6 @@ I.cut_apart(user, name, src) deconstruct(FALSE) return TRUE + +/obj/footstep_override(atom/movable/source, list/footstep_overrides) + footstep_overrides[FOOTSTEP_PLATING] = layer diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index ff11335af18..80bca35aa15 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -180,16 +180,6 @@ /obj/structure/get_acid_delay() return 4 SECONDS -///overrides the turf's normal footstep sound -/obj/structure/proc/footstep_override(atom/movable/source, list/footstep_overrides) - SIGNAL_HANDLER - return //override as required with the specific footstep sound - -///returns that src is covering its turf. Used to prevent turf interactions such as water -/obj/structure/proc/turf_cover_check(atom/movable/source) - SIGNAL_HANDLER - return TRUE - /obj/structure/effect_smoke(obj/effect/particle_effect/smoke/S) . = ..() if(CHECK_BITFIELD(S.smoke_traits, SMOKE_XENO_ACID)) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index cc9cbb66fc5..27f738da285 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -18,6 +18,8 @@ . = ..() var/static/list/connections = list( COMSIG_OBJ_TRY_ALLOW_THROUGH = PROC_REF(can_climb_over), + COMSIG_FIND_FOOTSTEP_SOUND = TYPE_PROC_REF(/atom/movable, footstep_override), + COMSIG_TURF_CHECK_COVERED = TYPE_PROC_REF(/atom/movable, turf_cover_check), ) AddElement(/datum/element/connect_loc, connections) diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index f0dd64ea9c2..8b334eceffd 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -197,6 +197,16 @@ opacity = TRUE color = "#7a8c54" +/obj/structure/flora/grass/tallgrass/Initialize(mapload) + . = ..() + var/static/list/connections = list( + COMSIG_FIND_FOOTSTEP_SOUND = TYPE_PROC_REF(/atom/movable, footstep_override), + ) + AddElement(/datum/element/connect_loc, connections) + +/obj/structure/flora/grass/tallgrass/footstep_override(atom/movable/source, list/footstep_overrides) + footstep_overrides[FOOTSTEP_GRASS] = layer + /obj/structure/flora/grass/tallgrass/tallgrasscorner name = "tall grass" icon_state = "tallgrass_corner" diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index 9e94dfb7949..a5e66d64235 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -71,8 +71,8 @@ /obj/structure/catwalk/Initialize(mapload) . = ..() var/static/list/connections = list( - COMSIG_FIND_FOOTSTEP_SOUND = PROC_REF(footstep_override), - COMSIG_TURF_CHECK_COVERED = PROC_REF(turf_cover_check), + COMSIG_FIND_FOOTSTEP_SOUND = TYPE_PROC_REF(/atom/movable, footstep_override), + COMSIG_TURF_CHECK_COVERED = TYPE_PROC_REF(/atom/movable, turf_cover_check), ) AddElement(/datum/element/connect_loc, connections) diff --git a/code/game/objects/structures/misc.dm b/code/game/objects/structures/misc.dm index f0b59f3d87d..6bc6a4ad369 100644 --- a/code/game/objects/structures/misc.dm +++ b/code/game/objects/structures/misc.dm @@ -219,8 +219,8 @@ update_icon() var/static/list/connections = list( - COMSIG_FIND_FOOTSTEP_SOUND = PROC_REF(footstep_override), - COMSIG_TURF_CHECK_COVERED = PROC_REF(turf_cover_check), + COMSIG_FIND_FOOTSTEP_SOUND = TYPE_PROC_REF(/atom/movable, footstep_override), + COMSIG_TURF_CHECK_COVERED = TYPE_PROC_REF(/atom/movable, turf_cover_check), ) AddElement(/datum/element/connect_loc, connections) diff --git a/code/game/objects/structures/reagent_dispensers.dm b/code/game/objects/structures/reagent_dispensers.dm index 223f1131fe7..3e8a90954b6 100644 --- a/code/game/objects/structures/reagent_dispensers.dm +++ b/code/game/objects/structures/reagent_dispensers.dm @@ -40,6 +40,8 @@ var/static/list/connections = list( COMSIG_OBJ_TRY_ALLOW_THROUGH = PROC_REF(can_climb_over), + COMSIG_FIND_FOOTSTEP_SOUND = TYPE_PROC_REF(/atom/movable, footstep_override), + COMSIG_TURF_CHECK_COVERED = TYPE_PROC_REF(/atom/movable, turf_cover_check), ) AddElement(/datum/element/connect_loc, connections) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 22d8b68ecdb..4a51bc91d1c 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -29,28 +29,6 @@ smoothing_groups = list(SMOOTH_GROUP_TABLES_GENERAL) canSmoothWith = list(SMOOTH_GROUP_TABLES_GENERAL) -/obj/structure/table/deconstruct(disassembled) - if(disassembled) - new parts(loc) - else - if(reinforced) - if(prob(50)) - new /obj/item/stack/rods(loc) - if(dropmetal) - new sheet_type(src) - return ..() - -/obj/structure/table/proc/update_adjacent(location = loc) - for(var/direction in CARDINAL_ALL_DIRS) - var/obj/structure/table/table = locate(/obj/structure/table, get_step(location,direction)) - if(!table) - continue - INVOKE_NEXT_TICK(table, TYPE_PROC_REF(/atom, update_icon)) - -/obj/structure/table/Destroy() - update_adjacent(loc) //so neighbouring tables get updated correctly - return ..() - /obj/structure/table/Initialize(mapload) . = ..() for(var/obj/structure/table/evil_table in loc) @@ -64,17 +42,26 @@ COMSIG_ATOM_ENTERED = PROC_REF(on_cross), COMSIG_ATOM_EXIT = PROC_REF(on_try_exit), COMSIG_OBJ_TRY_ALLOW_THROUGH = PROC_REF(can_climb_over), + COMSIG_FIND_FOOTSTEP_SOUND = TYPE_PROC_REF(/atom/movable, footstep_override), + COMSIG_TURF_CHECK_COVERED = TYPE_PROC_REF(/atom/movable, turf_cover_check), ) AddElement(/datum/element/connect_loc, connections) -/obj/structure/table/proc/on_cross(datum/source, atom/movable/O, oldloc, oldlocs) - SIGNAL_HANDLER - if(!istype(O,/mob/living/carbon/xenomorph/ravager)) - return - var/mob/living/carbon/xenomorph/M = O - if(!M.stat) //No dead xenos jumpin on the bed~ - visible_message(span_danger("[O] plows straight through [src]!")) - deconstruct(FALSE) +/obj/structure/table/Destroy() + update_adjacent(loc) //so neighbouring tables get updated correctly + return ..() + +/obj/structure/table/deconstruct(disassembled) + if(disassembled) + new parts(loc) + return ..() + + if(reinforced) + if(prob(50)) + new /obj/item/stack/rods(loc) + if(dropmetal) + new sheet_type(src) + return ..() /obj/structure/table/update_icon_state() . = ..() @@ -175,6 +162,24 @@ return TRUE +///Updates connected tables when required +/obj/structure/table/proc/update_adjacent(location = loc) + for(var/direction in CARDINAL_ALL_DIRS) + var/obj/structure/table/table = locate(/obj/structure/table, get_step(location,direction)) + if(!table) + continue + INVOKE_NEXT_TICK(table, TYPE_PROC_REF(/atom, update_icon)) + +///Snowflake check to let ravagers kill tables +/obj/structure/table/proc/on_cross(datum/source, atom/movable/O, oldloc, oldlocs) + SIGNAL_HANDLER + if(!istype(O,/mob/living/carbon/xenomorph/ravager)) + return + var/mob/living/carbon/xenomorph/M = O + if(!M.stat) //No dead xenos jumpin on the bed~ + visible_message(span_danger("[O] plows straight through [src]!")) + deconstruct(FALSE) + /obj/structure/table/proc/straight_table_check(direction) var/obj/structure/table/T for(var/angle in list(-90, 90)) @@ -330,7 +335,7 @@ /* * Wooden tables */ -/obj/structure/table/woodentable +/obj/structure/table/wood name = "wooden table" desc = "A square wood surface resting on four legs. Useful to put stuff on. Can be flipped in emergencies to act as cover." icon = 'icons/obj/smooth_objects/wood_table_reinforced.dmi' @@ -342,10 +347,13 @@ hit_sound = 'sound/effects/woodhit.ogg' max_integrity = 20 -/obj/structure/table/woodentable/add_debris_element() +/obj/structure/table/wood/add_debris_element() AddElement(/datum/element/debris, DEBRIS_WOOD, -10, 5) -/obj/structure/table/fancywoodentable +/obj/structure/table/wood/footstep_override(atom/movable/source, list/footstep_overrides) + footstep_overrides[FOOTSTEP_WOOD] = layer + +/obj/structure/table/wood/fancy name = "fancy wooden table" desc = "An expensive fancy wood surface resting on four legs. Useful to put stuff on. Can be flipped in emergencies to act as cover." icon = 'icons/obj/smooth_objects/fancy_table.dmi' @@ -354,10 +362,7 @@ table_prefix = "fwood" parts = /obj/item/frame/table/fancywood -/obj/structure/table/fancywoodentable/add_debris_element() - AddElement(/datum/element/debris, DEBRIS_WOOD, -10, 5) - -/obj/structure/table/rusticwoodentable +/obj/structure/table/wood/rustic name = "rustic wooden table" desc = "A rustic wooden surface resting on four legs. Useful to put stuff on. Can be flipped in emergencies to act as cover." icon = 'icons/obj/smooth_objects/rustic_table.dmi' @@ -366,22 +371,7 @@ table_prefix = "pwood" parts = /obj/item/frame/table/rusticwood -/obj/structure/table/rusticwoodentable/add_debris_element() - AddElement(/datum/element/debris, DEBRIS_WOOD, -10, 5) - -/obj/structure/table/black - name = "black metal table" - desc = "A sleek black metallic surface resting on four legs. Useful to put stuff on. Can be flipped in emergencies to act as cover." - icon = 'icons/obj/smooth_objects/black_table.dmi' - icon_state = "black_table-0" - base_icon_state = "black_table" - table_prefix = "black" - parts = /obj/item/frame/table - -/* -* Gambling tables -*/ -/obj/structure/table/gamblingtable +/obj/structure/table/wood/gambling name = "gambling table" desc = "A curved wood and carpet surface resting on four legs. Used for gambling games. Can be flipped in emergencies to act as cover." icon = 'icons/obj/smooth_objects/pool_table.dmi' @@ -392,9 +382,16 @@ table_prefix = "gamble" hit_sound = 'sound/effects/woodhit.ogg' max_integrity = 20 -/* -* Reinforced tables -*/ + +/obj/structure/table/black + name = "black metal table" + desc = "A sleek black metallic surface resting on four legs. Useful to put stuff on. Can be flipped in emergencies to act as cover." + icon = 'icons/obj/smooth_objects/black_table.dmi' + icon_state = "black_table-0" + base_icon_state = "black_table" + table_prefix = "black" + parts = /obj/item/frame/table + /obj/structure/table/reinforced name = "reinforced table" desc = "A square metal surface resting on four legs. This one has side panels, making it useful as a desk, but impossible to flip." @@ -518,6 +515,8 @@ var/static/list/connections = list( COMSIG_ATOM_ENTERED = PROC_REF(on_cross), COMSIG_OBJ_TRY_ALLOW_THROUGH = PROC_REF(can_climb_over), + COMSIG_FIND_FOOTSTEP_SOUND = TYPE_PROC_REF(/atom/movable, footstep_override), + COMSIG_TURF_CHECK_COVERED = TYPE_PROC_REF(/atom/movable, turf_cover_check), ) AddElement(/datum/element/connect_loc, connections) diff --git a/code/game/objects/structures/window_frame.dm b/code/game/objects/structures/window_frame.dm index 80fb08ccad8..7f5e1899e26 100644 --- a/code/game/objects/structures/window_frame.dm +++ b/code/game/objects/structures/window_frame.dm @@ -41,6 +41,8 @@ var/static/list/connections = list( COMSIG_OBJ_TRY_ALLOW_THROUGH = PROC_REF(can_climb_over), + COMSIG_FIND_FOOTSTEP_SOUND = TYPE_PROC_REF(/atom/movable, footstep_override), + COMSIG_TURF_CHECK_COVERED = TYPE_PROC_REF(/atom/movable, turf_cover_check), ) AddElement(/datum/element/connect_loc, connections) diff --git a/code/game/turfs/floor_ground.dm b/code/game/turfs/floor_ground.dm index 871fb521586..42afe833b3a 100644 --- a/code/game/turfs/floor_ground.dm +++ b/code/game/turfs/floor_ground.dm @@ -4,6 +4,10 @@ name = "ground dirt" icon = 'icons/turf/ground_map.dmi' icon_state = "desert" + shoefootstep = FOOTSTEP_DIRT + barefootstep = FOOTSTEP_DIRT + mediumxenofootstep = FOOTSTEP_DIRT + minimap_color = MINIMAP_DIRT /turf/open/floor/plating/ground/broken_states() return icon_state @@ -20,7 +24,6 @@ shoefootstep = FOOTSTEP_SAND barefootstep = FOOTSTEP_SAND mediumxenofootstep = FOOTSTEP_SAND - minimap_color = MINIMAP_DIRT icon_variants = 4 /turf/open/floor/plating/ground/dirt/normal_states() @@ -51,17 +54,11 @@ /turf/open/floor/plating/ground/dirt_desert name = "desert" icon_state = "desert_alt" - shoefootstep = FOOTSTEP_SAND - barefootstep = FOOTSTEP_SAND - mediumxenofootstep = FOOTSTEP_SAND icon_variants = 2 /turf/open/floor/plating/ground/dirtgrassborder name = "grass" icon_state = "grassdirt_edge" - shoefootstep = FOOTSTEP_SAND - barefootstep = FOOTSTEP_SAND - mediumxenofootstep = FOOTSTEP_SAND smoothing_groups = list(SMOOTH_GROUP_JUNGLE_FLOOR) /turf/open/floor/plating/ground/dirtgrassborder/corner @@ -74,10 +71,6 @@ name = "dirt" icon = 'icons/turf/dirt.dmi' icon_state = "gyellow" - shoefootstep = FOOTSTEP_SAND - barefootstep = FOOTSTEP_SAND - mediumxenofootstep = FOOTSTEP_SAND - minimap_color = MINIMAP_DIRT /turf/open/floor/plating/ground/dirt_alt/random/Initialize(mapload) . = ..() @@ -86,19 +79,11 @@ /turf/open/floor/plating/ground/dirt2 name = "dirt" icon_state = "dirt" - shoefootstep = FOOTSTEP_SAND - barefootstep = FOOTSTEP_SAND - mediumxenofootstep = FOOTSTEP_SAND - minimap_color = MINIMAP_DIRT /turf/open/floor/plating/ground/dirtgrassborder2 name = "grass" icon_state = "grassdirt2_edge" - shoefootstep = FOOTSTEP_SAND - barefootstep = FOOTSTEP_SAND - mediumxenofootstep = FOOTSTEP_SAND smoothing_groups = list(SMOOTH_GROUP_JUNGLE_FLOOR) - minimap_color = MINIMAP_DIRT /turf/open/floor/plating/ground/dirtgrassborder2/corner icon_state = "grassdirt2_corner" @@ -179,10 +164,6 @@ /turf/open/floor/plating/ground/mars icon = 'icons/turf/bigred.dmi' icon_state = "mars_sand" - mediumxenofootstep = FOOTSTEP_SAND - barefootstep = FOOTSTEP_SAND - shoefootstep = FOOTSTEP_SAND - minimap_color = MINIMAP_MARS_DIRT /turf/open/floor/plating/ground/mars/random/cave name = "cave" @@ -282,11 +263,17 @@ name = "desert" icon = 'icons/turf/desertdam_map.dmi' icon_state = "desert0" + shoefootstep = FOOTSTEP_SAND + barefootstep = FOOTSTEP_SAND + mediumxenofootstep = FOOTSTEP_SAND /turf/open/floor/plating/ground/desertdam/grate //for spanning river name = "grate" icon = 'icons/turf/catwalks.dmi' icon_state = "catwalk-159" + shoefootstep = FOOTSTEP_CATWALK + barefootstep = FOOTSTEP_CATWALK + mediumxenofootstep = FOOTSTEP_CATWALK /turf/open/floor/plating/ground/desertdam/grate/alternate icon_state = "catwalk-255" @@ -295,9 +282,6 @@ /turf/open/floor/plating/ground/desertdam/desert name = "desert" icon_state = "desert" - mediumxenofootstep = FOOTSTEP_SAND - barefootstep = FOOTSTEP_SAND - shoefootstep = FOOTSTEP_SAND icon_variants = 8 //asphalt road @@ -369,9 +353,9 @@ /turf/open/floor/plating/ground/desertdam/cave name = "cave" icon_state = "outer_cave_floor" - shoefootstep = FOOTSTEP_SAND - barefootstep = FOOTSTEP_SAND - mediumxenofootstep = FOOTSTEP_SAND + shoefootstep = FOOTSTEP_DIRT + barefootstep = FOOTSTEP_DIRT + mediumxenofootstep = FOOTSTEP_DIRT //desert floor to outer cave floor transition /turf/open/floor/plating/ground/desertdam/cave/desert_into_outer_cave_floor @@ -409,7 +393,6 @@ mediumxenofootstep = FOOTSTEP_SAND barefootstep = FOOTSTEP_SAND shoefootstep = FOOTSTEP_SAND - minimap_color = MINIMAP_DIRT icon_variants = 3 /turf/open/floor/plating/ground/drought/alt @@ -435,9 +418,9 @@ name = "grate" icon = 'icons/turf/desertdam_map.dmi' icon_state = "shallow_grate" - mediumxenofootstep = FOOTSTEP_PLATING - barefootstep = FOOTSTEP_PLATING - shoefootstep = FOOTSTEP_PLATING + mediumxenofootstep = FOOTSTEP_CATWALK + barefootstep = FOOTSTEP_CATWALK + shoefootstep = FOOTSTEP_CATWALK ///These are entirely for decoration purposes, do not make them functional, it will cause salt. /turf/open/floor/chasm diff --git a/code/game/turfs/liquid_turfs.dm b/code/game/turfs/liquid_turfs.dm index 9bd5a65b41f..26aa497fcb0 100755 --- a/code/game/turfs/liquid_turfs.dm +++ b/code/game/turfs/liquid_turfs.dm @@ -85,6 +85,14 @@ heavyxenofootstep = FOOTSTEP_WATER minimap_color = MINIMAP_WATER +/turf/open/liquid/water/Initialize(mapload) + . = ..() + if(mob_liquid_height > 15) + shoefootstep = FOOTSTEP_SWIM + barefootstep = FOOTSTEP_SWIM + mediumxenofootstep = FOOTSTEP_SWIM + heavyxenofootstep = FOOTSTEP_SWIM + /turf/open/liquid/water/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) . = ..() if(!.) diff --git a/code/modules/hydroponics/hydro_tray.dm b/code/modules/hydroponics/hydro_tray.dm index 4478eb49771..d142cd9e782 100644 --- a/code/modules/hydroponics/hydro_tray.dm +++ b/code/modules/hydroponics/hydro_tray.dm @@ -16,6 +16,8 @@ . = ..() var/static/list/connections = list( COMSIG_OBJ_TRY_ALLOW_THROUGH = PROC_REF(can_climb_over), + COMSIG_FIND_FOOTSTEP_SOUND = TYPE_PROC_REF(/atom/movable, footstep_override), + COMSIG_TURF_CHECK_COVERED = TYPE_PROC_REF(/atom/movable, turf_cover_check), ) AddElement(/datum/element/connect_loc, connections) diff --git a/code/modules/vehicles/_hitbox.dm b/code/modules/vehicles/_hitbox.dm index a6423fa939a..37ec5e79226 100644 --- a/code/modules/vehicles/_hitbox.dm +++ b/code/modules/vehicles/_hitbox.dm @@ -36,6 +36,7 @@ COMSIG_TURF_JUMP_ENDED_HERE = PROC_REF(on_jump_landed), COMSIG_TURF_THROW_ENDED_HERE = PROC_REF(on_stop_throw), COMSIG_ATOM_EXITED = PROC_REF(on_exited), + COMSIG_FIND_FOOTSTEP_SOUND = TYPE_PROC_REF(/atom/movable, footstep_override), ) AddElement(/datum/element/connect_loc, connections) @@ -46,6 +47,9 @@ root = null return ..() +/obj/hitbox/footstep_override(atom/movable/source, list/footstep_overrides) + footstep_overrides[FOOTSTEP_HULL] = 4.5 + ///signal handler for handling PASS_WALKOVER /obj/hitbox/proc/can_cross_hitbox(datum/source, atom/mover) SIGNAL_HANDLER diff --git a/sound/effects/footstep/hull1.ogg b/sound/effects/footstep/hull1.ogg new file mode 100644 index 00000000000..615df6c5502 Binary files /dev/null and b/sound/effects/footstep/hull1.ogg differ diff --git a/sound/effects/footstep/hull2.ogg b/sound/effects/footstep/hull2.ogg new file mode 100644 index 00000000000..3aecb743f70 Binary files /dev/null and b/sound/effects/footstep/hull2.ogg differ diff --git a/sound/effects/footstep/hull3.ogg b/sound/effects/footstep/hull3.ogg new file mode 100644 index 00000000000..03339131f63 Binary files /dev/null and b/sound/effects/footstep/hull3.ogg differ diff --git a/sound/effects/footstep/hull4.ogg b/sound/effects/footstep/hull4.ogg new file mode 100644 index 00000000000..2fba89d3185 Binary files /dev/null and b/sound/effects/footstep/hull4.ogg differ diff --git a/sound/effects/footstep/hull5.ogg b/sound/effects/footstep/hull5.ogg new file mode 100644 index 00000000000..10c5912b97a Binary files /dev/null and b/sound/effects/footstep/hull5.ogg differ diff --git a/sound/effects/footstep/sand1.ogg b/sound/effects/footstep/sand1.ogg new file mode 100644 index 00000000000..63de531f22e Binary files /dev/null and b/sound/effects/footstep/sand1.ogg differ diff --git a/sound/effects/footstep/sand2.ogg b/sound/effects/footstep/sand2.ogg new file mode 100644 index 00000000000..e9d597fd94a Binary files /dev/null and b/sound/effects/footstep/sand2.ogg differ diff --git a/sound/effects/footstep/sand3.ogg b/sound/effects/footstep/sand3.ogg new file mode 100644 index 00000000000..51c92e49f3f Binary files /dev/null and b/sound/effects/footstep/sand3.ogg differ diff --git a/sound/effects/footstep/sand4.ogg b/sound/effects/footstep/sand4.ogg new file mode 100644 index 00000000000..9bc430db51f Binary files /dev/null and b/sound/effects/footstep/sand4.ogg differ diff --git a/sound/effects/footstep/swimming1.ogg b/sound/effects/footstep/swimming1.ogg new file mode 100644 index 00000000000..8ca5bff5f77 Binary files /dev/null and b/sound/effects/footstep/swimming1.ogg differ diff --git a/sound/effects/footstep/swimming2.ogg b/sound/effects/footstep/swimming2.ogg new file mode 100644 index 00000000000..a46d764099d Binary files /dev/null and b/sound/effects/footstep/swimming2.ogg differ diff --git a/sound/effects/footstep/swimming3.ogg b/sound/effects/footstep/swimming3.ogg new file mode 100644 index 00000000000..6b745e16edb Binary files /dev/null and b/sound/effects/footstep/swimming3.ogg differ diff --git a/sound/effects/footstep/waterstep1.ogg b/sound/effects/footstep/waterstep1.ogg new file mode 100644 index 00000000000..8c84285c4a4 Binary files /dev/null and b/sound/effects/footstep/waterstep1.ogg differ diff --git a/sound/effects/footstep/waterstep2.ogg b/sound/effects/footstep/waterstep2.ogg new file mode 100644 index 00000000000..df5314f3c81 Binary files /dev/null and b/sound/effects/footstep/waterstep2.ogg differ diff --git a/sound/effects/footstep/waterstep3.ogg b/sound/effects/footstep/waterstep3.ogg new file mode 100644 index 00000000000..40bf7d5be75 Binary files /dev/null and b/sound/effects/footstep/waterstep3.ogg differ