From f9ccca9c8fb76d61780686dad8f5b6ddbff16985 Mon Sep 17 00:00:00 2001 From: r4d6 Date: Sat, 1 Feb 2020 00:08:01 -0500 Subject: [PATCH 1/4] Anti-Shitter mining update --- .../Mining_Station_Public_01.dmm | 41 ++++++++++++------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm b/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm index 75c0434771..a1bb761076 100644 --- a/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm +++ b/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm @@ -716,14 +716,13 @@ /turf/open/floor/plasteel, /area/mine/laborcamp/security) "mN" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ icon_state = "4-8" }, /obj/structure/cable{ icon_state = "0-4" }, -/turf/open/floor/plating, +/turf/closed/wall/r_wall, /area/mine/production) "nm" = ( /obj/effect/turf_decal/tile/red{ @@ -1301,6 +1300,16 @@ /obj/effect/turf_decal/tile/brown{ dir = 4 }, +/obj/item/gun/energy/kinetic_accelerator, +/obj/item/gun/energy/kinetic_accelerator, +/obj/item/gun/energy/kinetic_accelerator, +/obj/item/gun/energy/kinetic_accelerator, +/obj/item/gun/energy/kinetic_accelerator, +/obj/item/gun/energy/kinetic_accelerator, +/obj/item/gun/energy/kinetic_accelerator, +/obj/item/gun/energy/kinetic_accelerator, +/obj/item/gun/energy/kinetic_accelerator, +/obj/item/gun/energy/kinetic_accelerator, /turf/open/floor/plasteel, /area/mine/production) "wj" = ( @@ -1569,11 +1578,10 @@ /turf/open/floor/plasteel, /area/mine/living_quarters) "Bc" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ icon_state = "0-8" }, -/turf/open/floor/plating, +/turf/closed/wall/r_wall, /area/mine/production) "Be" = ( /obj/machinery/light/small{ @@ -2111,6 +2119,9 @@ }, /turf/open/floor/plasteel, /area/mine/living_quarters) +"JI" = ( +/turf/closed/wall/r_wall, +/area/mine/production) "JJ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -2296,11 +2307,10 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "Lc" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ icon_state = "0-4" }, -/turf/open/floor/plating, +/turf/closed/wall/r_wall, /area/mine/production) "Le" = ( /obj/structure/closet/crate/internals, @@ -2381,6 +2391,10 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/machinery/door/airlock/highsecurity{ + name = "Miner's Side, Shitters not allowed"; + req_access_txt = "48" + }, /turf/open/floor/plasteel, /area/mine/production) "Mj" = ( @@ -3008,14 +3022,13 @@ /turf/open/floor/plasteel, /area/mine/production) "Vo" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ icon_state = "4-8" }, /obj/structure/cable{ icon_state = "0-8" }, -/turf/open/floor/plating, +/turf/closed/wall/r_wall, /area/mine/production) "Vs" = ( /obj/effect/turf_decal/tile/purple, @@ -6887,10 +6900,10 @@ vJ JW bg VP -Cd -Cd +JI +JI Bc -Cd +JI Bc es XN @@ -6944,7 +6957,7 @@ Ex xv bg mI -Cd +JI OI sz gk @@ -7000,8 +7013,8 @@ CV al lj bg -Cd -Cd +JI +JI mw es es From 32f3eec0505b06048aac009289956d805f10740c Mon Sep 17 00:00:00 2001 From: r4d6 Date: Tue, 4 Feb 2020 19:03:45 -0500 Subject: [PATCH 2/4] Real --- .../Mining_Station_Public_01.dmm | 82 ++++++++----------- 1 file changed, 35 insertions(+), 47 deletions(-) diff --git a/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm b/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm index a1bb761076..cca3d7e3d5 100644 --- a/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm +++ b/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm @@ -722,7 +722,8 @@ /obj/structure/cable{ icon_state = "0-4" }, -/turf/closed/wall/r_wall, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/mine/production) "nm" = ( /obj/effect/turf_decal/tile/red{ @@ -1300,16 +1301,6 @@ /obj/effect/turf_decal/tile/brown{ dir = 4 }, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/gun/energy/kinetic_accelerator, /turf/open/floor/plasteel, /area/mine/production) "wj" = ( @@ -1581,7 +1572,8 @@ /obj/structure/cable{ icon_state = "0-8" }, -/turf/closed/wall/r_wall, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/mine/production) "Be" = ( /obj/machinery/light/small{ @@ -2119,9 +2111,6 @@ }, /turf/open/floor/plasteel, /area/mine/living_quarters) -"JI" = ( -/turf/closed/wall/r_wall, -/area/mine/production) "JJ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -2310,7 +2299,8 @@ /obj/structure/cable{ icon_state = "0-4" }, -/turf/closed/wall/r_wall, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/mine/production) "Le" = ( /obj/structure/closet/crate/internals, @@ -2380,7 +2370,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/door/airlock/mining/glass{ name = "Processing Area"; - req_access_txt = "48" + req_access_txt = "48"; + security_level = 6 }, /obj/structure/cable{ icon_state = "1-2" @@ -2391,10 +2382,6 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/door/airlock/highsecurity{ - name = "Miner's Side, Shitters not allowed"; - req_access_txt = "48" - }, /turf/open/floor/plasteel, /area/mine/production) "Mj" = ( @@ -3028,7 +3015,8 @@ /obj/structure/cable{ icon_state = "0-8" }, -/turf/closed/wall/r_wall, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/mine/production) "Vs" = ( /obj/effect/turf_decal/tile/purple, @@ -5471,7 +5459,7 @@ JY JY jJ jJ -JY +VT VT VT wz @@ -5527,8 +5515,8 @@ JY JY JY JY -JY -JY +VT +VT VT VT wz @@ -5582,9 +5570,9 @@ JY JY JY JY -JY -JY -JY +VT +VT +VT VT VT VT @@ -5638,8 +5626,8 @@ JY JY JY JY -JY -JY +VT +VT VT VT VT @@ -5694,8 +5682,8 @@ JY JY JY JY -JY -Lm +VT +VT VT VT VT @@ -5750,8 +5738,8 @@ JY JY JY JY -JY -Lm +VT +VT VT VT VT @@ -5806,8 +5794,8 @@ JY JY JY JY -JY -JY +VT +VT VT VT VT @@ -5861,9 +5849,9 @@ JY Lm VT VT -JY -JY -JY +VT +VT +VT VT VT VT @@ -5919,8 +5907,8 @@ VT VT VT VT -Lm -Lm +VT +VT VT VT Lm @@ -6900,10 +6888,10 @@ vJ JW bg VP -JI -JI +Cd +Cd Bc -JI +Cd Bc es XN @@ -6957,7 +6945,7 @@ Ex xv bg mI -JI +Cd OI sz gk @@ -7013,8 +7001,8 @@ CV al lj bg -JI -JI +Cd +Cd mw es es From 60163330f759989903ed51742c677334781bce43 Mon Sep 17 00:00:00 2001 From: r4d6 Date: Tue, 4 Feb 2020 19:07:01 -0500 Subject: [PATCH 3/4] closets --- .../Mining_Station/Mining_Station_Public_01.dmm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm b/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm index cca3d7e3d5..215b6bc734 100644 --- a/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm +++ b/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm @@ -327,6 +327,7 @@ /obj/effect/turf_decal/tile/brown{ dir = 4 }, +/obj/structure/closet/secure_closet/miner, /turf/open/floor/plasteel, /area/mine/production) "fU" = ( @@ -812,6 +813,13 @@ }, /turf/open/floor/plating, /area/mine/production) +"ou" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/structure/closet/secure_closet/miner, +/turf/open/floor/plasteel, +/area/mine/production) "ow" = ( /obj/machinery/door/airlock/medical/glass{ name = "Infirmary" @@ -1165,6 +1173,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/structure/closet/secure_closet/miner, /turf/open/floor/plasteel, /area/mine/production) "tK" = ( @@ -6601,7 +6610,7 @@ Cd Ed tJ II -Jo +ou Ed Cd Cd From f42ef66846b565267e5f60640de619a1b9be303f Mon Sep 17 00:00:00 2001 From: r4d6 Date: Tue, 4 Feb 2020 19:25:10 -0500 Subject: [PATCH 4/4] Move the lockers and the beacon --- .../Mining_Station_Public_01.dmm | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm b/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm index 215b6bc734..a317684f03 100644 --- a/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm +++ b/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm @@ -814,9 +814,12 @@ /turf/open/floor/plating, /area/mine/production) "ou" = ( -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/brown{ dir = 1 }, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, /obj/structure/closet/secure_closet/miner, /turf/open/floor/plasteel, /area/mine/production) @@ -1168,14 +1171,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/mine/living_quarters) -"tJ" = ( -/obj/item/beacon, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/structure/closet/secure_closet/miner, -/turf/open/floor/plasteel, -/area/mine/production) "tK" = ( /obj/structure/closet/crate, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, @@ -2235,6 +2230,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/item/beacon, /turf/open/floor/plasteel, /area/mine/production) "KO" = ( @@ -2530,6 +2526,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/structure/closet/secure_closet/miner, /turf/open/floor/plasteel, /area/mine/production) "Nk" = ( @@ -6608,9 +6605,9 @@ VT VT Cd Ed -tJ +Wf II -ou +Jo Ed Cd Cd @@ -6671,7 +6668,7 @@ wX Wf YM GN -II +ou Nf mN Aj