From 23c9e567d46b740f24e0f17bd2b86f31f889f166 Mon Sep 17 00:00:00 2001 From: HuKuTaPan4 Date: Sun, 13 Oct 2024 12:21:54 +0300 Subject: [PATCH] Revert "fix(maps): old instruments placement" This reverts commit 18b1fce298f74de3efb225a7bdb0da91ee532fed. --- maps/exodus/exodus-1.dmm | 4 ++-- maps/polaris/polar-3.dmm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/maps/exodus/exodus-1.dmm b/maps/exodus/exodus-1.dmm index 22ea4a1741b..52f28514710 100644 --- a/maps/exodus/exodus-1.dmm +++ b/maps/exodus/exodus-1.dmm @@ -1365,7 +1365,7 @@ "aAm" = (/obj/effect/floor_decal/corner/grey/diagonal,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/maintenance/ghetto_strangeplace) "aAn" = (/obj/structure/table/woodentable,/obj/item/reagent_containers/vessel/bottle/whiskey,/obj/item/reagent_containers/vessel/bottle/whiskey,/obj/effect/floor_decal/corner/grey/diagonal,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/maintenance/ghetto_strangeplace) "aAo" = (/obj/structure/table/woodentable,/obj/item/airalarm_electronics,/obj/effect/floor_decal/corner/grey/diagonal,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/maintenance/ghetto_strangeplace) -"aAp" = (/obj/structure/table/woodentable,/obj/item/contraband/poster,/obj/item/contraband/poster,/obj/item/contraband/poster,/obj/effect/floor_decal/corner/grey/diagonal,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/item/device/synthesized_instrument/recorder,/turf/simulated/floor/tiled/dark,/area/maintenance/ghetto_strangeplace) +"aAp" = (/obj/structure/table/woodentable,/obj/item/contraband/poster,/obj/item/contraband/poster,/obj/item/contraband/poster,/obj/effect/floor_decal/corner/grey/diagonal,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/item/instrument/recorder,/turf/simulated/floor/tiled/dark,/area/maintenance/ghetto_strangeplace) "aAq" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{icon_state = "2-8"; d2 = 8; d1 = 2},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/rough,/area/maintenance/ghetto_main_south) "aAr" = (/obj/effect/floor_decal/oldflood,/obj/structure/bed/chair{dir = 1},/turf/simulated/floor/tiled/dark,/area/crew_quarters/underdorm/boxing) "aAs" = (/obj/effect/floor_decal/oldflood,/obj/effect/decal/cleanable/dirt,/obj/structure/sign/poster{pixel_y = -32},/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/disposal,/obj/machinery/light/small{dir = 4},/turf/simulated/floor/tiled/dark,/area/crew_quarters/underdorm/boxing) @@ -2266,7 +2266,7 @@ "aSa" = (/turf/simulated/floor/plating,/area/maintenance/underground/security_lobby) "aSb" = (/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/rough,/area/maintenance/underground/research_misc) "aSc" = (/obj/structure/bed/chair/wood/wings,/obj/structure/cable{icon_state = "1-2"; d2 = 2; d1 = 1},/obj/random/action_figure{layer = 1},/turf/simulated/floor/plating,/area/maintenance/underground/board_games_club) -"aSd" = (/obj/structure/table/gamblingtable,/obj/random/coin,/obj/item/device/synthesized_instrument/accordion,/turf/simulated/floor/trim/wood,/area/maintenance/underground/board_games_club) +"aSd" = (/obj/structure/table/gamblingtable,/obj/random/coin,/obj/item/instrument/accordion,/turf/simulated/floor/trim/wood,/area/maintenance/underground/board_games_club) "aSe" = (/obj/effect/floor_decal/rust,/obj/structure/cable{icon_state = "2-8"},/turf/simulated/floor/tiled/dark/rough,/area/maintenance/underground/security_storage) "aSf" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green,/obj/machinery/alarm{dir = 1; pixel_y = -24},/turf/simulated/floor/trim/wood{icon_state = "wood_broken0"},/area/maintenance/underground/security_dorms) "aSg" = (/obj/effect/decal/cleanable/dirt,/obj/item/device/radio/intercom{dir = 8; pixel_x = 22},/turf/simulated/floor/tiled/dark/rough,/area/maintenance/underground/security_storage) diff --git a/maps/polaris/polar-3.dmm b/maps/polaris/polar-3.dmm index b6a99f79cc5..ad55512c6f0 100644 --- a/maps/polaris/polar-3.dmm +++ b/maps/polaris/polar-3.dmm @@ -3624,7 +3624,7 @@ "bsm" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/rough,/area/polarplanet/engineering/atmos) "bsn" = (/obj/machinery/atmospherics/binary/pump{name = "N2 to Connector"; dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/rough,/area/polarplanet/engineering/atmos) "bso" = (/obj/machinery/status_display,/turf/simulated/wall,/area/polarplanet/crew_quarters/bar) -"bsp" = (/obj/structure/synthesized_instrument/synthesizer/piano,/turf/simulated/floor/trim/carpet/gpurple,/area/polarplanet/crew_quarters/bar) +"bsp" = (/obj/structure/device/piano{dir = 4; icon_state = "piano"; tag = "icon-piano (EAST)"},/turf/simulated/floor/trim/carpet/gpurple,/area/polarplanet/crew_quarters/bar) "bsq" = (/obj/structure/bed/chair{pixel_y = 8},/obj/machinery/alarm{dir = 1; pixel_y = -25},/turf/simulated/floor/trim/carpet/gpurple,/area/polarplanet/crew_quarters/bar) "bsr" = (/obj/machinery/light/small/hl,/turf/simulated/floor/trim/carpet/gpurple,/area/polarplanet/crew_quarters/bar) "bss" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/circuitboard/robotics{pixel_x = -2; pixel_y = 2},/obj/item/circuitboard/mecha_control{pixel_x = 1; pixel_y = -1},/turf/simulated/floor/tiled/rough,/area/polarplanet/storage/tech) @@ -4971,7 +4971,7 @@ "bSo" = (/obj/effect/floor_decal/corner/brown/diagonal{dir = 8},/obj/effect/floor_decal/corner/old/teal/diagonal,/obj/effect/decal/cleanable/dirt,/obj/structure/flora/pottedplant/overgrownbush,/turf/simulated/floor/tiled/brown,/area/polarplanet/crew_quarters/mess) "bSp" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/corner/green{dir = 10},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/rough,/area/polarplanet/hallway/primary/starboard) "bSq" = (/obj/structure/closet/crate/bin{desc = "A large bin. For trash."; name = "Trash bin"},/obj/random/trash,/obj/effect/decal/cleanable/cobweb{dir = 8},/obj/machinery/light/small/hl{dir = 4},/turf/simulated/floor/trim/wood,/area/polarplanet/crew_quarters/bar) -"bSr" = (/obj/effect/floor_decal/corner/brown/diagonal{dir = 8},/obj/effect/floor_decal/corner/old/teal/diagonal,/obj/structure/synthesized_instrument/synthesizer/piano,/turf/simulated/floor/tiled/brown,/area/polarplanet/crew_quarters/mess) +"bSr" = (/obj/effect/floor_decal/corner/brown/diagonal{dir = 8},/obj/effect/floor_decal/corner/old/teal/diagonal,/obj/structure/device/piano{dir = 4; icon_state = "piano"; name = "space piano"; tag = "icon-piano (EAST)"},/turf/simulated/floor/tiled/brown,/area/polarplanet/crew_quarters/mess) "bSs" = (/obj/effect/floor_decal/corner/brown/diagonal{dir = 8},/obj/effect/floor_decal/corner/old/teal/diagonal,/obj/item/stool/padded,/turf/simulated/floor/tiled/brown,/area/polarplanet/crew_quarters/mess) "bSt" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/corner/green/three_quarters{dir = 4},/turf/simulated/floor/tiled/rough,/area/polarplanet/hallway/primary/starboard) "bSu" = (/obj/structure/window_frame/rglass,/obj/machinery/door/blast/shutters/open{density = 0; dir = 2; icon_state = "shutter0"; id = "cafe1"; name = "Privacy Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/polarplanet/crew_quarters/mess)