From 3df5f2282788df3083e34a259b88060ccb5d2262 Mon Sep 17 00:00:00 2001 From: Mewchild Date: Thu, 24 May 2018 12:36:15 -0500 Subject: [PATCH] Minor mining and Research Tweaks --- maps/tether/tether-01-surface1.dmm | 15 +++-- maps/tether/tether-02-surface2.dmm | 97 ++++++++++----------------- maps/tether/tether-03-surface3.dmm | 103 ++++++++++------------------- 3 files changed, 81 insertions(+), 134 deletions(-) diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index dd6c96bb59c..4a3f7e1e069 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -2082,13 +2082,13 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/mining_eva) "aeC" = ( -/obj/structure/closet/crate, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, +/obj/structure/closet/secure_closet/personal, /turf/simulated/floor/tiled/steel_dirty, /area/tether/surfacebase/mining_main/ore) "aeD" = ( @@ -2666,6 +2666,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/structure/closet/secure_closet/personal, /turf/simulated/floor/tiled/steel_dirty, /area/tether/surfacebase/mining_main/ore) "agf" = ( @@ -6393,6 +6394,7 @@ pixel_y = 0; req_access = list(31) }, +/obj/structure/closet/crate, /turf/simulated/floor/tiled/steel_dirty, /area/tether/surfacebase/mining_main/ore) "apI" = ( @@ -6455,6 +6457,7 @@ pixel_y = -28 }, /obj/structure/cable/green, +/obj/structure/closet/crate, /turf/simulated/floor/tiled/steel_dirty, /area/tether/surfacebase/mining_main/ore) "apM" = ( @@ -28081,6 +28084,10 @@ /obj/structure/stairs/north, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) +"rTC" = ( +/obj/structure/closet/secure_closet/personal, +/turf/simulated/floor/tiled/steel_dirty, +/area/tether/surfacebase/mining_main/ore) "slR" = ( /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{ scrub_id = "atrium" @@ -39798,8 +39805,8 @@ acx adS aer aeC -afe -afe +rTC +rTC age aer aah @@ -40368,7 +40375,7 @@ ajQ akA alN any -aeF +afe aer aah agM diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 6149a55198e..ee1a9de9a93 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -3077,8 +3077,7 @@ /obj/structure/extinguisher_cabinet{ dir = 8; icon_state = "extinguisher_closed"; - pixel_x = 30; - + pixel_x = 30 }, /turf/simulated/open, /area/tether/surfacebase/north_staires_two) @@ -3178,26 +3177,22 @@ /obj/structure/sign/directions/medical{ dir = 1; icon_state = "direction_med"; - pixel_y = 8; - + pixel_y = 8 }, /obj/structure/sign/directions/science{ dir = 1; icon_state = "direction_sci"; - pixel_y = 3; - + pixel_y = 3 }, /obj/structure/sign/directions/security{ dir = 1; icon_state = "direction_sec"; - pixel_y = -4; - + pixel_y = -4 }, /obj/structure/sign/directions/engineering{ dir = 4; icon_state = "direction_eng"; - pixel_y = -10; - + pixel_y = -10 }, /turf/simulated/wall, /area/tether/surfacebase/north_staires_two) @@ -4395,8 +4390,7 @@ /obj/structure/extinguisher_cabinet{ dir = 8; icon_state = "extinguisher_closed"; - pixel_x = 30; - + pixel_x = 30 }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/atrium_two) @@ -5265,8 +5259,7 @@ /obj/structure/extinguisher_cabinet{ dir = 4; icon_state = "extinguisher_closed"; - pixel_x = -30; - + pixel_x = -30 }, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) @@ -7577,8 +7570,7 @@ /obj/structure/extinguisher_cabinet{ dir = 4; icon_state = "extinguisher_closed"; - pixel_x = -30; - + pixel_x = -30 }, /turf/simulated/floor/tiled, /area/rnd/lockers) @@ -8686,8 +8678,7 @@ "rF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10; - icon_state = "intact"; - + icon_state = "intact" }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) @@ -9527,6 +9518,7 @@ icon_state = "tube1"; dir = 4 }, +/obj/structure/closet/secure_closet/personal, /turf/simulated/floor/tiled, /area/rnd/research) "te" = ( @@ -9569,8 +9561,7 @@ "ti" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10; - icon_state = "intact"; - + icon_state = "intact" }, /obj/effect/floor_decal/steeldecal/steel_decals_central4, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -9980,6 +9971,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 4 }, +/obj/structure/closet/secure_closet/personal, /turf/simulated/floor/tiled, /area/rnd/research) "tS" = ( @@ -10201,8 +10193,7 @@ /obj/structure/extinguisher_cabinet{ dir = 8; icon_state = "extinguisher_closed"; - pixel_x = 30; - + pixel_x = 30 }, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) @@ -10378,6 +10369,7 @@ pixel_x = 30; pixel_y = 0 }, +/obj/structure/closet/secure_closet/personal, /turf/simulated/floor/tiled, /area/rnd/research) "uC" = ( @@ -10590,8 +10582,7 @@ "uO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 5; - icon_state = "intact"; - + icon_state = "intact" }, /obj/structure/cable/cyan{ d1 = 1; @@ -10884,8 +10875,7 @@ /obj/machinery/computer/guestpass{ dir = 1; icon_state = "guest"; - pixel_y = -28; - + pixel_y = -28 }, /turf/simulated/floor/tiled, /area/rnd/research) @@ -10940,6 +10930,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 6 }, +/obj/structure/closet/secure_closet/personal, /turf/simulated/floor/tiled, /area/rnd/research) "vr" = ( @@ -11182,8 +11173,7 @@ "vB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 5; - icon_state = "intact"; - + icon_state = "intact" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -11233,8 +11223,7 @@ "vD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10; - icon_state = "intact"; - + icon_state = "intact" }, /obj/structure/cable/cyan{ d1 = 1; @@ -12227,16 +12216,14 @@ "xq" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8; - icon_state = "map"; - + icon_state = "map" }, /turf/simulated/floor/tiled/techfloor, /area/server) "xr" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9; - icon_state = "intact"; - + icon_state = "intact" }, /obj/effect/floor_decal/techfloor{ dir = 4 @@ -12374,8 +12361,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 5; - icon_state = "intact"; - + icon_state = "intact" }, /turf/simulated/floor/tiled, /area/engineering/atmos/hallway) @@ -13878,8 +13864,7 @@ /obj/structure/extinguisher_cabinet{ dir = 8; icon_state = "extinguisher_closed"; - pixel_x = 30; - + pixel_x = 30 }, /turf/simulated/floor/tiled/steel_dirty, /area/rnd/research_storage) @@ -14123,8 +14108,7 @@ "AW" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 5; - icon_state = "intact"; - + icon_state = "intact" }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) @@ -14138,14 +14122,12 @@ "AY" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 9; - icon_state = "intact"; - + icon_state = "intact" }, /obj/structure/extinguisher_cabinet{ dir = 8; icon_state = "extinguisher_closed"; - pixel_x = 30; - + pixel_x = 30 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) @@ -14250,8 +14232,7 @@ "Bl" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 9; - icon_state = "intact"; - + icon_state = "intact" }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) @@ -14440,8 +14421,7 @@ "BL" = ( /obj/machinery/atmospherics/valve/digital/open{ dir = 4; - icon_state = "map_valve1"; - + icon_state = "map_valve1" }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) @@ -14599,8 +14579,7 @@ "Cg" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 9; - icon_state = "intact"; - + icon_state = "intact" }, /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -15058,8 +15037,7 @@ /obj/structure/extinguisher_cabinet{ dir = 8; icon_state = "extinguisher_closed"; - pixel_x = 30; - + pixel_x = 30 }, /obj/effect/floor_decal/techfloor{ dir = 6 @@ -15961,8 +15939,7 @@ "EZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5; - icon_state = "intact"; - + icon_state = "intact" }, /turf/simulated/floor/tiled, /area/tcommsat/computer) @@ -15984,8 +15961,7 @@ "Fc" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10; - icon_state = "intact"; - + icon_state = "intact" }, /turf/simulated/floor/tiled, /area/tcommsat/computer) @@ -16658,8 +16634,7 @@ "Gh" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5; - icon_state = "intact"; - + icon_state = "intact" }, /obj/machinery/airlock_sensor/airlock_exterior{ frequency = 1381; @@ -17661,8 +17636,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 1; icon_state = "borderfloor"; - pixel_y = 0; - + pixel_y = 0 }, /obj/effect/floor_decal/corner/lime/border{ dir = 1 @@ -18018,8 +17992,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 1; icon_state = "borderfloor"; - pixel_y = 0; - + pixel_y = 0 }, /obj/effect/floor_decal/corner/lime/border{ dir = 1 diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 8234b785b42..63112df1ff3 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -767,8 +767,7 @@ /obj/structure/extinguisher_cabinet{ dir = 8; icon_state = "extinguisher_closed"; - pixel_x = 30; - + pixel_x = 30 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/common) @@ -1599,8 +1598,7 @@ dir = 4; icon_state = "secintercom"; pixel_x = 24; - pixel_y = 0; - + pixel_y = 0 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/common) @@ -3702,8 +3700,7 @@ /obj/structure/extinguisher_cabinet{ dir = 8; icon_state = "extinguisher_closed"; - pixel_x = 30; - + pixel_x = 30 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) @@ -4275,8 +4272,7 @@ /obj/structure/extinguisher_cabinet{ dir = 8; icon_state = "extinguisher_closed"; - pixel_x = 30; - + pixel_x = 30 }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -6437,8 +6433,7 @@ /obj/structure/sign/directions/engineering{ dir = 10; icon_state = "direction_eng"; - pixel_y = -10; - + pixel_y = -10 }, /turf/simulated/wall, /area/tether/surfacebase/north_stairs_three) @@ -6450,14 +6445,12 @@ /obj/structure/sign/directions/science{ dir = 2; icon_state = "direction_sci"; - pixel_y = 3; - + pixel_y = 3 }, /obj/structure/sign/directions/security{ dir = 1; icon_state = "direction_sec"; - pixel_y = -4; - + pixel_y = -4 }, /turf/simulated/wall, /area/tether/surfacebase/north_stairs_three) @@ -6813,8 +6806,7 @@ /obj/structure/extinguisher_cabinet{ dir = 4; icon_state = "extinguisher_closed"; - pixel_x = -30; - + pixel_x = -30 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_three) @@ -9549,8 +9541,7 @@ /obj/structure/extinguisher_cabinet{ dir = 4; icon_state = "extinguisher_closed"; - pixel_x = -30; - + pixel_x = -30 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -9628,26 +9619,22 @@ /obj/structure/sign/directions/medical{ dir = 1; icon_state = "direction_med"; - pixel_y = 8; - + pixel_y = 8 }, /obj/structure/sign/directions/science{ dir = 2; icon_state = "direction_sci"; - pixel_y = 3; - + pixel_y = 3 }, /obj/structure/sign/directions/security{ dir = 1; icon_state = "direction_sec"; - pixel_y = -4; - + pixel_y = -4 }, /obj/structure/sign/directions/engineering{ dir = 1; icon_state = "direction_eng"; - pixel_y = -10; - + pixel_y = -10 }, /turf/simulated/wall, /area/tether/surfacebase/atrium_three) @@ -10477,8 +10464,7 @@ /obj/structure/extinguisher_cabinet{ dir = 4; icon_state = "extinguisher_closed"; - pixel_x = -30; - + pixel_x = -30 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -12704,8 +12690,7 @@ /obj/machinery/computer/guestpass{ dir = 1; icon_state = "guest"; - pixel_y = -28; - + pixel_y = -28 }, /obj/structure/cable{ icon_state = "4-8" @@ -13134,8 +13119,7 @@ /obj/structure/extinguisher_cabinet{ dir = 4; icon_state = "extinguisher_closed"; - pixel_x = -30; - + pixel_x = -30 }, /turf/simulated/floor/wood, /area/crew_quarters/bar) @@ -14421,8 +14405,7 @@ /obj/structure/extinguisher_cabinet{ dir = 4; icon_state = "extinguisher_closed"; - pixel_x = -30; - + pixel_x = -30 }, /turf/simulated/floor/tiled, /area/hydroponics) @@ -14484,8 +14467,7 @@ /obj/structure/extinguisher_cabinet{ dir = 8; icon_state = "extinguisher_closed"; - pixel_x = 30; - + pixel_x = 30 }, /turf/simulated/floor/wood, /area/crew_quarters/bar) @@ -14499,8 +14481,7 @@ /obj/structure/extinguisher_cabinet{ dir = 4; icon_state = "extinguisher_closed"; - pixel_x = -30; - + pixel_x = -30 }, /turf/simulated/floor/tiled, /area/rnd/research) @@ -15511,8 +15492,7 @@ /obj/structure/extinguisher_cabinet{ dir = 8; icon_state = "extinguisher_closed"; - pixel_x = 30; - + pixel_x = 30 }, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -16395,8 +16375,7 @@ /obj/machinery/computer/guestpass{ dir = 1; icon_state = "guest"; - pixel_y = -28; - + pixel_y = -28 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 @@ -16935,8 +16914,7 @@ /obj/structure/extinguisher_cabinet{ dir = 8; icon_state = "extinguisher_closed"; - pixel_x = 30; - + pixel_x = 30 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, @@ -17194,8 +17172,7 @@ /obj/structure/extinguisher_cabinet{ dir = 4; icon_state = "extinguisher_closed"; - pixel_x = -30; - + pixel_x = -30 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -17518,8 +17495,7 @@ /obj/structure/sign/directions/medical{ dir = 1; icon_state = "direction_med"; - pixel_y = 8; - + pixel_y = 8 }, /obj/structure/sign/directions/science{ dir = 8; @@ -17528,14 +17504,12 @@ /obj/structure/sign/directions/security{ dir = 1; icon_state = "direction_sec"; - pixel_y = -4; - + pixel_y = -4 }, /obj/structure/sign/directions/engineering{ dir = 1; icon_state = "direction_eng"; - pixel_y = -10; - + pixel_y = -10 }, /turf/simulated/wall, /area/maintenance/engineering/pumpstation) @@ -19113,8 +19087,7 @@ /obj/machinery/computer/guestpass{ dir = 1; icon_state = "guest"; - pixel_y = -28; - + pixel_y = -28 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -19950,8 +19923,7 @@ /obj/structure/extinguisher_cabinet{ dir = 8; icon_state = "extinguisher_closed"; - pixel_x = 30; - + pixel_x = 30 }, /turf/simulated/floor/tiled/steel_grid, /area/assembly/robotics) @@ -20104,6 +20076,7 @@ }, /obj/structure/closet/secure_closet/RD, /obj/item/clothing/glasses/omnihud/rnd, +/obj/item/device/aicard, /turf/simulated/floor/tiled, /area/rnd/rdoffice) "Iz" = ( @@ -20699,8 +20672,7 @@ /obj/structure/extinguisher_cabinet{ dir = 8; icon_state = "extinguisher_closed"; - pixel_x = 30; - + pixel_x = 30 }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -20727,8 +20699,7 @@ /obj/structure/extinguisher_cabinet{ dir = 4; icon_state = "extinguisher_closed"; - pixel_x = -30; - + pixel_x = -30 }, /turf/simulated/floor/reinforced, /area/tether/surfacebase/shuttle_pad) @@ -21026,8 +20997,7 @@ /obj/structure/extinguisher_cabinet{ dir = 8; icon_state = "extinguisher_closed"; - pixel_x = 30; - + pixel_x = 30 }, /turf/simulated/floor/reinforced, /area/tether/surfacebase/shuttle_pad) @@ -21252,8 +21222,7 @@ /obj/structure/extinguisher_cabinet{ dir = 4; icon_state = "extinguisher_closed"; - pixel_x = -30; - + pixel_x = -30 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -21297,8 +21266,7 @@ /obj/structure/extinguisher_cabinet{ dir = 4; icon_state = "extinguisher_closed"; - pixel_x = -30; - + pixel_x = -30 }, /turf/simulated/floor/reinforced, /area/tether/surfacebase/shuttle_pad) @@ -21394,8 +21362,7 @@ /obj/structure/extinguisher_cabinet{ dir = 8; icon_state = "extinguisher_closed"; - pixel_x = 30; - + pixel_x = 30 }, /obj/machinery/door/window/brigdoor/northleft{ name = "Bar";