From b903e7a6f5948c2fd9556671aee974d7ec488493 Mon Sep 17 00:00:00 2001 From: Readystorm546 Date: Fri, 6 Dec 2019 14:34:47 -0500 Subject: [PATCH 1/4] 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/4] 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 4787ac41091ebb037319e90117a57fb95f9cd55f Mon Sep 17 00:00:00 2001 From: Readystorm546 Date: Fri, 6 Dec 2019 14:36:25 -0500 Subject: [PATCH 3/4] Clock Cult Woot >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 260bc40c96188c21539bc662813a18b8a55ee9fd Mon Sep 17 00:00:00 2001 From: Readystorm546 Date: Mon, 9 Dec 2019 23:17:35 -0500 Subject: [PATCH 4/4] Theos be like Okay boomer --- _maps/map_files/generic/City_of_Cogs.dmm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/_maps/map_files/generic/City_of_Cogs.dmm b/_maps/map_files/generic/City_of_Cogs.dmm index aa96fbe5c401..0ca01f56db51 100644 --- a/_maps/map_files/generic/City_of_Cogs.dmm +++ b/_maps/map_files/generic/City_of_Cogs.dmm @@ -66,10 +66,6 @@ /obj/machinery/telecomms/relay/preset/reebe, /turf/open/floor/clockwork/reebe, /area/reebe/city_of_cogs) -"ap" = ( -/obj/machinery/door/airlock/clockwork, -/turf/open/floor/clockwork/reebe, -/area/reebe/city_of_cogs) "aq" = ( /obj/machinery/computer/camera_advanced/ratvar, /turf/open/floor/clockwork/reebe, @@ -19520,7 +19516,7 @@ aB az ah ai -ap +ag ai an au @@ -20324,7 +20320,7 @@ aj aj aj aj -ap +ag aH aj aj @@ -20332,7 +20328,7 @@ ak aj aj aH -ap +ag aj aj aj @@ -21136,7 +21132,7 @@ aj aC ah ai -ap +ag ai ah ay