From 3ffa2b0eafec975a136aa752f9a97062015ff74e Mon Sep 17 00:00:00 2001 From: dragomagol <66640614+dragomagol@users.noreply.github.com> Date: Tue, 5 Jan 2021 14:51:36 -0800 Subject: [PATCH] Small mapping fixes to each station (#55857) * small fixes to each station * kilo arcades * fixes goonplaque * bellissimo * gulag coats * merge conflicts Co-authored-by: Erin --- .../map_files/Deltastation/DeltaStation2.dmm | 6 +-- .../map_files/IceBoxStation/IceBoxStation.dmm | 41 ++++--------------- .../IcemoonUnderground_Above.dmm | 2 + _maps/map_files/KiloStation/KiloStation.dmm | 9 ++-- _maps/map_files/MetaStation/MetaStation.dmm | 7 +--- 5 files changed, 18 insertions(+), 47 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index f58e6daf505..4893e8c0934 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -35894,10 +35894,6 @@ /area/security/execution/transfer) "bwc" = ( /obj/item/kirbyplants/random, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, /obj/structure/reagent_dispensers/peppertank{ pixel_y = -32 }, @@ -114178,7 +114174,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/turf/closed/wall/r_wall, +/turf/open/floor/plasteel, /area/engine/engineering) "vVy" = ( /obj/effect/spawner/structure/window/reinforced, diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 95be4fdd9a5..f1057e677c2 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -13256,19 +13256,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/dorms) -"aDL" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, -/turf/open/floor/plasteel/freezer, -/area/crew_quarters/toilet) "aDM" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ @@ -29093,18 +29080,6 @@ /obj/item/stock_parts/cell/high/plus, /turf/open/floor/plasteel, /area/science/robotics/lab) -"bpW" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "robotics2"; - name = "robotics lab shutters" - }, -/obj/effect/spawner/structure/window, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "robotics2"; - name = "robotics lab shutters" - }, -/turf/open/floor/plating, -/area/science/robotics/lab) "bpX" = ( /turf/open/floor/plasteel/white/side, /area/science/research) @@ -43590,14 +43565,14 @@ /obj/effect/turf_decal/tile/brown{ dir = 8 }, -/obj/structure/chair/sofa/left{ - dir = 1 - }, /obj/machinery/airalarm{ dir = 1; pixel_y = -22 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/chair/sofa/right{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/medical/break_room) "ckO" = ( @@ -57104,13 +57079,13 @@ /obj/effect/turf_decal/tile/brown{ dir = 8 }, -/obj/structure/chair/sofa/right{ - dir = 1 - }, /obj/structure/sign/departments/restroom{ pixel_y = -32 }, /obj/machinery/light/small, +/obj/structure/chair/sofa/left{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/medical/break_room) "yiW" = ( @@ -89108,7 +89083,7 @@ awr aAd aAh aCm -aDL +aGk aFf aGk aHU @@ -102757,7 +102732,7 @@ bfV bfV bfV box -bpW +buj brs box box diff --git a/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm b/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm index 3473aa29ed1..7c159813df9 100644 --- a/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm +++ b/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm @@ -3847,6 +3847,7 @@ /obj/item/clothing/glasses/meson, /obj/item/mining_scanner, /obj/effect/decal/cleanable/dirt, +/obj/item/clothing/suit/hooded/wintercoat, /turf/open/floor/plasteel, /area/mine/laborcamp) "yD" = ( @@ -4228,6 +4229,7 @@ /obj/item/clothing/glasses/meson, /obj/item/mining_scanner, /obj/effect/decal/cleanable/dirt, +/obj/item/clothing/suit/hooded/wintercoat, /turf/open/floor/plasteel, /area/mine/laborcamp) "Dt" = ( diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index df2090686d7..4eb0176e007 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -55641,7 +55641,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/machinery/computer/arcade, +/obj/effect/spawner/randomarcade{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/crew_quarters/fitness/recreation) "bJX" = ( @@ -70097,7 +70099,6 @@ /area/ai_monitored/turret_protected/aisat/atmos) "chP" = ( /obj/structure/reagent_dispensers/watertank, -/obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/delivery, /obj/machinery/light, /obj/effect/turf_decal/stripes/corner{ @@ -74574,10 +74575,12 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/machinery/computer/arcade, /obj/machinery/newscaster{ pixel_x = -30 }, +/obj/effect/spawner/randomarcade{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/crew_quarters/fitness/recreation) "cpP" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index e233f5712f9..f258095d06a 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -22746,9 +22746,6 @@ c_tag = "Engineering - Entrance"; dir = 4 }, -/obj/machinery/light/small{ - dir = 8 - }, /turf/open/floor/plasteel, /area/engine/engineering) "bbz" = ( @@ -32916,9 +32913,7 @@ /area/bridge) "bBG" = ( /obj/structure/cable, -/turf/open/floor/goonplaque{ - desc = "\"This is a plaque in honour of our comrades on the G4407 Stations. Hopefully TG4407 model can live up to your fame and fortune.\" Scratched in beneath that is a crude image of sentient postcards in a realm of darkness. The station model number is MSv42A-160516" - }, +/turf/open/floor/goonplaque, /area/hallway/primary/port) "bBH" = ( /obj/effect/spawner/structure/window/reinforced,