From 47ee865e3915ecb650e4bb794b76ff69eee4c38d Mon Sep 17 00:00:00 2001
From: Zevotech <zevo2437@gmail.com>
Date: Tue, 3 Oct 2023 15:54:57 -0400
Subject: [PATCH] removes rockplanet clock

---
 .../RockRuins/rockplanet_clock.dmm            | 628 ------------------
 _maps/map_catalogue.txt                       |   4 -
 code/datums/ruins/rockplanet.dm               |   6 -
 config/rockruinblacklist.txt                  |   1 -
 4 files changed, 639 deletions(-)
 delete mode 100644 _maps/RandomRuins/RockRuins/rockplanet_clock.dmm

diff --git a/_maps/RandomRuins/RockRuins/rockplanet_clock.dmm b/_maps/RandomRuins/RockRuins/rockplanet_clock.dmm
deleted file mode 100644
index 3a8da9995006..000000000000
--- a/_maps/RandomRuins/RockRuins/rockplanet_clock.dmm
+++ /dev/null
@@ -1,628 +0,0 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"br" = (
-/obj/structure/table/bronze,
-/obj/item/toy/clockwork_watch,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"bw" = (
-/obj/structure/girder/bronze,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"by" = (
-/obj/structure/fluff/clockwork/clockgolem_remains,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"cn" = (
-/obj/item/clothing/shoes/sandal/magic,
-/obj/structure/table/bronze,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"ct" = (
-/obj/structure/fluff/clockwork/alloy_shards/medium_gearbit,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"fy" = (
-/obj/item/golem_shell/servant,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"fK" = (
-/obj/machinery/computer/monitor{
-	dir = 4
-	},
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"gA" = (
-/obj/machinery/computer/message_monitor{
-	dir = 8
-	},
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"hb" = (
-/mob/living/simple_animal/hostile/jungle/mook,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"hm" = (
-/obj/effect/decal/cleanable/blood/old,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"hn" = (
-/obj/effect/decal/cleanable/garbage,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"hU" = (
-/obj/machinery/computer/teleporter,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"iX" = (
-/obj/structure/girder/bronze,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"iY" = (
-/obj/machinery/door/airlock/bronze/seethru,
-/obj/structure/trap/chill,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"jG" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/mob/living/simple_animal/hostile/jungle/mook,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"jK" = (
-/obj/effect/decal/cleanable/robot_debris/limb,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"kd" = (
-/obj/structure/fluff/clockwork/alloy_shards/medium_gearbit,
-/obj/structure/chair/comfy/shuttle/bronze{
-	dir = 4
-	},
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"ks" = (
-/obj/structure/girder/bronze,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"lm" = (
-/obj/structure/fluff/clockwork/alloy_shards,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"mG" = (
-/obj/structure/chair/comfy/shuttle/bronze,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"nM" = (
-/obj/machinery/door/airlock/bronze,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"oj" = (
-/obj/structure/fluff/clockwork/alloy_shards,
-/turf/open/floor/plating/asteroid/rockplanet/lit,
-/area/overmap_encounter/planetoid/rockplanet/explored)
-"oW" = (
-/mob/living/simple_animal/hostile/jungle/mook,
-/turf/open/floor/plating/asteroid/rockplanet/lit,
-/area/overmap_encounter/planetoid/rockplanet/explored)
-"pi" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/trap/fire,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"pt" = (
-/obj/item/gun/magic/wand/nothing,
-/obj/structure/table/bronze,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"pV" = (
-/obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"rM" = (
-/obj/structure/table/bronze,
-/obj/item/stack/tile/bronze/thirty,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"sS" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/trap/stun,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"tg" = (
-/obj/structure/fluff/clockwork/alloy_shards,
-/obj/machinery/quantumpad,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"tI" = (
-/obj/effect/decal/cleanable/greenglow,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"uk" = (
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"ur" = (
-/obj/machinery/quantumpad,
-/obj/structure/trap/damage,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"uM" = (
-/obj/item/clothing/under/color/black,
-/obj/structure/table/bronze,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"uS" = (
-/obj/structure/fluff/clockwork/clockgolem_remains,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"wq" = (
-/obj/machinery/power/smes,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"wv" = (
-/obj/effect/decal/cleanable/robot_debris,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"xb" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/closed/wall/mineral/bronze,
-/area/ruin/powered)
-"xt" = (
-/obj/structure/fluff/clockwork/alloy_shards/medium_gearbit,
-/obj/structure/closet/crate/grave/loot,
-/turf/open/floor/plating/asteroid/rockplanet/lit,
-/area/overmap_encounter/planetoid/rockplanet/explored)
-"xV" = (
-/obj/structure/chair/comfy/shuttle/bronze{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"zj" = (
-/obj/effect/decal/cleanable/robot_debris/old,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"zz" = (
-/obj/structure/chair/comfy/shuttle/bronze,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"Bh" = (
-/obj/machinery/door/airlock/bronze/seethru,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"BX" = (
-/obj/structure/lattice,
-/turf/open/floor/plating/asteroid/rockplanet/lit,
-/area/overmap_encounter/planetoid/rockplanet/explored)
-"Ci" = (
-/obj/structure/table/bronze,
-/obj/item/clothing/suit/bronze,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"DL" = (
-/obj/structure/table/bronze,
-/obj/item/stack/sheet/glass/fifty,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"EB" = (
-/obj/structure/closet/crate/grave/loot,
-/turf/open/floor/plating/asteroid/rockplanet/lit,
-/area/overmap_encounter/planetoid/rockplanet/explored)
-"FE" = (
-/obj/structure/table/bronze,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"Gk" = (
-/obj/structure/fluff/clockwork/alloy_shards/medium_gearbit,
-/turf/open/floor/plating/asteroid/rockplanet/lit,
-/area/overmap_encounter/planetoid/rockplanet/explored)
-"GD" = (
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/plating/asteroid/rockplanet/lit,
-/area/overmap_encounter/planetoid/rockplanet/explored)
-"GT" = (
-/obj/item/toy/plush/plushvar,
-/turf/open/floor/plating/asteroid/rockplanet/lit,
-/area/overmap_encounter/planetoid/rockplanet/explored)
-"HK" = (
-/obj/effect/mine/stun,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"Id" = (
-/obj/effect/decal/cleanable/blood/old,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/remains/human,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"Iu" = (
-/obj/structure/fluff/clockwork/clockgolem_remains,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/trap/stun,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"Ji" = (
-/obj/item/flashlight/lantern,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"Jl" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/remains/human,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"Ju" = (
-/obj/effect/decal/cleanable/robot_debris/old,
-/mob/living/simple_animal/hostile/jungle/mook,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"Nr" = (
-/turf/open/floor/plating/asteroid/rockplanet/lit,
-/area/overmap_encounter/planetoid/rockplanet/explored)
-"NP" = (
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"Oa" = (
-/obj/structure/fluff/clockwork/alloy_shards/medium_gearbit,
-/obj/effect/mine/stun,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"Os" = (
-/obj/effect/decal/cleanable/blood/old,
-/obj/structure/trap/chill,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"OB" = (
-/turf/template_noop,
-/area/template_noop)
-"OC" = (
-/obj/structure/table/bronze,
-/obj/item/clothing/head/bronze,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"PA" = (
-/obj/structure/fluff/clockwork/blind_eye,
-/obj/structure/table/bronze,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"Qs" = (
-/turf/closed/wall/mineral/bronze,
-/area/ruin/powered)
-"Rt" = (
-/obj/structure/chair/comfy/shuttle/bronze{
-	dir = 4
-	},
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"TL" = (
-/obj/structure/statue/bronze/marx,
-/turf/open/floor/plating/asteroid/rockplanet/lit,
-/area/overmap_encounter/planetoid/rockplanet/explored)
-"TV" = (
-/obj/item/reagent_containers/food/drinks/trophy/bronze_cup,
-/obj/structure/table/bronze,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"VV" = (
-/obj/structure/girder/bronze,
-/obj/effect/decal/cleanable/cobweb,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"Wm" = (
-/obj/effect/mine/stun,
-/turf/open/floor/plating/asteroid/rockplanet/lit,
-/area/overmap_encounter/planetoid/rockplanet/explored)
-"Wx" = (
-/obj/effect/decal/cleanable/greenglow,
-/obj/effect/decal/cleanable/robot_debris/limb,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"WK" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"WT" = (
-/obj/structure/table/bronze,
-/obj/item/clothing/shoes/bronze,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"Xi" = (
-/obj/structure/table/bronze,
-/obj/item/nullrod/spear,
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"XY" = (
-/obj/structure/window/bronze/fulltile,
-/obj/structure/grille,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"Ye" = (
-/obj/structure/fluff/clockwork/alloy_shards,
-/obj/structure/lattice,
-/turf/open/floor/plating/asteroid/rockplanet/lit,
-/area/overmap_encounter/planetoid/rockplanet/explored)
-"Ys" = (
-/obj/machinery/door/airlock/bronze,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"YQ" = (
-/obj/item/book/granter/spell/smoke,
-/obj/structure/table/bronze,
-/turf/open/floor/bronze,
-/area/ruin/powered)
-"Zs" = (
-/obj/structure/lattice,
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/plating/asteroid/rockplanet/lit,
-/area/overmap_encounter/planetoid/rockplanet/explored)
-"ZY" = (
-/obj/structure/chair/comfy/shuttle/bronze{
-	dir = 8
-	},
-/turf/open/floor/bronze,
-/area/ruin/powered)
-
-(1,1,1) = {"
-Qs
-Ys
-Ys
-Qs
-Qs
-Qs
-Qs
-Qs
-Qs
-Qs
-Qs
-Qs
-OB
-OB
-OB
-"}
-(2,1,1) = {"
-Qs
-hm
-NP
-hn
-bw
-Qs
-VV
-pV
-NP
-NP
-cn
-XY
-OB
-OB
-OB
-"}
-(3,1,1) = {"
-Qs
-kd
-Iu
-wv
-NP
-Bh
-HK
-WK
-hm
-NP
-uM
-XY
-xt
-Wm
-OB
-"}
-(4,1,1) = {"
-XY
-gA
-Ji
-lm
-hb
-Bh
-WK
-tI
-lm
-by
-NP
-Qs
-oW
-GD
-OB
-"}
-(5,1,1) = {"
-Qs
-fK
-uk
-NP
-TV
-Qs
-DL
-Jl
-Ji
-sS
-NP
-Ys
-BX
-oj
-OB
-"}
-(6,1,1) = {"
-Qs
-ZY
-NP
-NP
-PA
-Qs
-rM
-NP
-NP
-zj
-NP
-Ys
-BX
-Gk
-Nr
-"}
-(7,1,1) = {"
-Qs
-ks
-WK
-WK
-bw
-Qs
-ks
-br
-Xi
-FE
-bw
-Qs
-EB
-Nr
-Nr
-"}
-(8,1,1) = {"
-Qs
-Qs
-Bh
-iY
-xb
-Qs
-Qs
-xb
-Qs
-Qs
-Qs
-Qs
-Nr
-GT
-TL
-"}
-(9,1,1) = {"
-Qs
-VV
-NP
-NP
-iX
-Qs
-VV
-xV
-Rt
-NP
-bw
-Qs
-Zs
-oW
-Nr
-"}
-(10,1,1) = {"
-Qs
-hU
-NP
-Oa
-wq
-Qs
-mG
-Ci
-WT
-NP
-pi
-nM
-BX
-Nr
-Nr
-"}
-(11,1,1) = {"
-Qs
-tg
-Id
-Ji
-NP
-Qs
-zz
-OC
-fy
-uk
-WK
-nM
-Wm
-Nr
-Nr
-"}
-(12,1,1) = {"
-XY
-ur
-uS
-NP
-NP
-Bh
-WK
-NP
-Wx
-ct
-WK
-xb
-oW
-GD
-OB
-"}
-(13,1,1) = {"
-Qs
-NP
-NP
-jK
-jG
-Bh
-WK
-Os
-NP
-Ju
-YQ
-XY
-EB
-OB
-OB
-"}
-(14,1,1) = {"
-Qs
-NP
-NP
-NP
-bw
-Qs
-ks
-Ji
-by
-by
-pt
-XY
-Ye
-BX
-OB
-"}
-(15,1,1) = {"
-Qs
-Ys
-Ys
-Qs
-Qs
-Qs
-Qs
-Qs
-Qs
-Qs
-Qs
-Qs
-OB
-OB
-OB
-"}
diff --git a/_maps/map_catalogue.txt b/_maps/map_catalogue.txt
index d66d9f858a20..b7c669111550 100644
--- a/_maps/map_catalogue.txt
+++ b/_maps/map_catalogue.txt
@@ -238,10 +238,6 @@ Find the key for using this catalogue in "map_catalogue_key.txt"
 		Size = (x = 15)(y = 23)(z = 1)
 		Tags = "No Combat", "Medium Loot", "Shelter"
 
-		File Name = "_maps\RandomRuins\RockRuins\rockplanet_clock.dmm"
-		Size = (x = 15)(y = 15)(z = 1)
-		Tags = "Medium Combat Challenge", "Medium Loot", "Necropolis Loot", "Shelter"
-
 		File Name = "_maps\RandomRuins\RockRuins\rockplanet_crash_cult.dmm"
 		Size = (x = 26)(y = 18)(z = 1)
 		Tags = "Medium Combat Challenge", "Medium Loot", "Inhospitable"
diff --git a/code/datums/ruins/rockplanet.dm b/code/datums/ruins/rockplanet.dm
index 38cb0d4949d2..cb924b3fe2be 100644
--- a/code/datums/ruins/rockplanet.dm
+++ b/code/datums/ruins/rockplanet.dm
@@ -12,12 +12,6 @@
 	description = "something dangerous"
 	suffix = "rockplanet_heirophant.dmm"
 
-/datum/map_template/ruin/rockplanet/clock
-	name = "Clockcult base"
-	id = "clockcultrock"
-	description = "the last remnants of a clockcult base on rockplanet."
-	suffix = "rockplanet_clock.dmm"
-
 /datum/map_template/ruin/rockplanet/cult
 	name = "Cult base"
 	id = "rockcult"
diff --git a/config/rockruinblacklist.txt b/config/rockruinblacklist.txt
index e38e248cd109..f3ea46327382 100644
--- a/config/rockruinblacklist.txt
+++ b/config/rockruinblacklist.txt
@@ -5,7 +5,6 @@
 
 #_maps/RandomRuins/RockRuins/rockplanet_boxsci.dmm
 #_maps/RandomRuins/RockRuins/rockplanet_chaosmarine.dmm
-#_maps/RandomRuins/RockRuins/rockplanet_clock.dmm
 #_maps/RandomRuins/RockRuins/rockplanet_clowncrash.dmm
 #_maps/RandomRuins/RockRuins/rockplanet_crash_cult.dmm
 #_maps/RandomRuins/RockRuins/rockplanet_crash_kitchen.dmm