From b903e7a6f5948c2fd9556671aee974d7ec488493 Mon Sep 17 00:00:00 2001 From: Readystorm546 Date: Fri, 6 Dec 2019 14:34:47 -0500 Subject: [PATCH 1/3] Clock cult stuff >More map things. >Change Airlocks correect airlock. Remove lots of randowm loot Spawners but i still leave some --- _maps/map_files/generic/City_of_Cogs.dmm | 50 ++++++++++++------------ 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/_maps/map_files/generic/City_of_Cogs.dmm b/_maps/map_files/generic/City_of_Cogs.dmm index a57c19b11e03..aa96fbe5c401 100644 --- a/_maps/map_files/generic/City_of_Cogs.dmm +++ b/_maps/map_files/generic/City_of_Cogs.dmm @@ -67,9 +67,7 @@ /turf/open/floor/clockwork/reebe, /area/reebe/city_of_cogs) "ap" = ( -/obj/machinery/door/airlock/clockwork/brass{ - name = "Ark Chamber" - }, +/obj/machinery/door/airlock/clockwork, /turf/open/floor/clockwork/reebe, /area/reebe/city_of_cogs) "aq" = ( @@ -17294,11 +17292,11 @@ aj aj aj aj -aO aj aj aj -aO +aj +aj aj aj aj @@ -17706,7 +17704,7 @@ aj aj aO aj -aO +aj aj aj aj @@ -18102,7 +18100,7 @@ aj aj aj aj -aO +aj aj aj aj @@ -18302,7 +18300,7 @@ aj aj aj aj -aO +aj aj aj aj @@ -18703,7 +18701,7 @@ aj aj aj aj -aO +aj aj aj aj @@ -18926,7 +18924,7 @@ ah aj aj aj -aO +aj aj aj aj @@ -19334,7 +19332,7 @@ aj aj aj aj -aO +aj aj aO aj @@ -19938,7 +19936,7 @@ ai ah aj aj -aO +aj aj aj aj @@ -20117,7 +20115,7 @@ aj aj aj aj -aO +aj aj ai aj @@ -20520,7 +20518,7 @@ aj aj aj aj -aO +aj aj aj ai @@ -20949,7 +20947,7 @@ ai aj aj aj -aO +aj aj aj aO @@ -21123,7 +21121,7 @@ aj aj aO aj -aO +aj aj aj aj @@ -21733,9 +21731,9 @@ aj aj aj aj -aO aj -aO +aj +aj aj aj ah @@ -21755,7 +21753,7 @@ aj aj aj aj -aO +aj aj aj aj @@ -21955,7 +21953,7 @@ ah aj aj aj -aO +aj aj aj aj @@ -22343,7 +22341,7 @@ aO aj aj aj -aO +aj aj aj aj @@ -22747,19 +22745,19 @@ aj aj aj aj -aO aj -aO aj aj aj aj aj -aO aj aj aj -aO +aj +aj +aj +aj aj aj aj @@ -23162,7 +23160,7 @@ aj aj aj aj -aO +aj aj aj aj From c6d4c7271eb37667251b318055e85fd7b00dd25d Mon Sep 17 00:00:00 2001 From: Readystorm546 Date: Fri, 6 Dec 2019 14:35:11 -0500 Subject: [PATCH 2/3] Revert "Clock cult stuff" This reverts commit b903e7a6f5948c2fd9556671aee974d7ec488493. --- _maps/map_files/generic/City_of_Cogs.dmm | 50 ++++++++++++------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/_maps/map_files/generic/City_of_Cogs.dmm b/_maps/map_files/generic/City_of_Cogs.dmm index aa96fbe5c401..a57c19b11e03 100644 --- a/_maps/map_files/generic/City_of_Cogs.dmm +++ b/_maps/map_files/generic/City_of_Cogs.dmm @@ -67,7 +67,9 @@ /turf/open/floor/clockwork/reebe, /area/reebe/city_of_cogs) "ap" = ( -/obj/machinery/door/airlock/clockwork, +/obj/machinery/door/airlock/clockwork/brass{ + name = "Ark Chamber" + }, /turf/open/floor/clockwork/reebe, /area/reebe/city_of_cogs) "aq" = ( @@ -17292,11 +17294,11 @@ aj aj aj aj +aO aj aj aj -aj -aj +aO aj aj aj @@ -17704,7 +17706,7 @@ aj aj aO aj -aj +aO aj aj aj @@ -18100,7 +18102,7 @@ aj aj aj aj -aj +aO aj aj aj @@ -18300,7 +18302,7 @@ aj aj aj aj -aj +aO aj aj aj @@ -18701,7 +18703,7 @@ aj aj aj aj -aj +aO aj aj aj @@ -18924,7 +18926,7 @@ ah aj aj aj -aj +aO aj aj aj @@ -19332,7 +19334,7 @@ aj aj aj aj -aj +aO aj aO aj @@ -19936,7 +19938,7 @@ ai ah aj aj -aj +aO aj aj aj @@ -20115,7 +20117,7 @@ aj aj aj aj -aj +aO aj ai aj @@ -20518,7 +20520,7 @@ aj aj aj aj -aj +aO aj aj ai @@ -20947,7 +20949,7 @@ ai aj aj aj -aj +aO aj aj aO @@ -21121,7 +21123,7 @@ aj aj aO aj -aj +aO aj aj aj @@ -21731,9 +21733,9 @@ aj aj aj aj +aO aj -aj -aj +aO aj aj ah @@ -21753,7 +21755,7 @@ aj aj aj aj -aj +aO aj aj aj @@ -21953,7 +21955,7 @@ ah aj aj aj -aj +aO aj aj aj @@ -22341,7 +22343,7 @@ aO aj aj aj -aj +aO aj aj aj @@ -22745,19 +22747,19 @@ aj aj aj aj +aO aj +aO aj aj aj aj aj +aO aj aj aj -aj -aj -aj -aj +aO aj aj aj @@ -23160,7 +23162,7 @@ aj aj aj aj -aj +aO aj aj aj From e5d1948389c5b79cafc3e56a8df4036b89416337 Mon Sep 17 00:00:00 2001 From: Readystorm546 Date: Fri, 6 Dec 2019 14:48:53 -0500 Subject: [PATCH 3/3] Something i forgot Space makes you float who would of thought... I forgot that you need the /area/space/nearstation) when i made this map a long time ago. --- .../BoxStation/engine_singulo_tesla.dmm | 100 +++++++++--------- 1 file changed, 48 insertions(+), 52 deletions(-) diff --git a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/engine_singulo_tesla.dmm b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/engine_singulo_tesla.dmm index e7a1e44f03e6..62d5432b4abf 100644 --- a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/engine_singulo_tesla.dmm +++ b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/engine_singulo_tesla.dmm @@ -353,10 +353,6 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) -"aN" = ( -/obj/structure/lattice, -/turf/open/space/basic, -/area/space) "aO" = ( /obj/structure/particle_accelerator/particle_emitter/left, /turf/open/floor/engine, @@ -754,11 +750,11 @@ "bS" = ( /obj/machinery/the_singularitygen/tesla, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "bT" = ( /obj/machinery/the_singularitygen, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "bU" = ( /obj/machinery/power/grounding_rod, /obj/machinery/light{ @@ -1282,7 +1278,7 @@ aM ad aa aa -aN +aQ bs bs bs @@ -1290,7 +1286,7 @@ bs bs bs bs -aN +aQ aa yi bZ @@ -1318,9 +1314,9 @@ zg kx kx yo -aN +aQ aa -aN +aQ yi ad bu @@ -1338,17 +1334,17 @@ aE zh aa aa -aN +aQ bt bM -aN +aQ bt aa bM bt -aN +aQ aa -aN +aQ cj ad bu @@ -1365,7 +1361,7 @@ ac aE zh aJ -aN +aQ aT aa aa @@ -1375,8 +1371,8 @@ aa aa aa aT -aN -aN +aQ +aQ yi ad du @@ -1393,11 +1389,11 @@ ad zh zh aJ -aN +aQ aa aa aa -aN +aQ aa aa aa @@ -1425,14 +1421,14 @@ aa aa aa aa -aN +aQ aa aa aa aa aa aa -aN +aQ yi ad bu @@ -1453,14 +1449,14 @@ aa aa aa aa -bM +aR bS -bM -aN -aN +aR +aQ +aQ aT -aN -aN +aQ +aQ yi ad bu @@ -1477,18 +1473,18 @@ aL aP bC aJ -aN +aQ aa aa bN -bM -bM -bM +aR +aR +aR aa aa aa aa -aN +aQ cj ad bu @@ -1505,13 +1501,13 @@ bB ba bg aJ -aN +aQ aT -aN -aN -bM +aQ +aQ +aR bT -bM +aR aa aa aa @@ -1533,13 +1529,13 @@ aG aG bh aJ -aN +aQ aa aa aa aa aa -aN +aQ bX aa aa @@ -1561,13 +1557,13 @@ ad zh zh aJ -aN +aQ aa aa aa bR aa -aN +aQ aa aa aa @@ -1589,7 +1585,7 @@ ac aE zh aJ -aN +aQ aT aa aa @@ -1599,8 +1595,8 @@ aT aa aa aT -aN -aN +aQ +aQ yi ad du @@ -1618,17 +1614,17 @@ aE zh aa aa -aN +aQ bJ bM aa bJ -aN +aQ bM bJ -aN +aQ aa -aN +aQ cj ad bu @@ -1654,9 +1650,9 @@ jh kx kx Bx -aN +aQ aa -aN +aQ yi ad bu @@ -1674,7 +1670,7 @@ be ad aa aa -aN +aQ bs bs bs @@ -1682,7 +1678,7 @@ bs bs bs bs -aN +aQ aa yi qG