Merge branch 'master' into SpaceRuins

code/datums/ruins/lavaland.dm

@@ -224,6 +224,13 @@
 	allow_duplicates = FALSE
 	cost = 5
 
+/datum/map_template/ruin/lavaland/dark_wizards
+	name = "Dark Wizard Altar"
+	id = "dark_wizards"
+	description = "A ruin with dark wizards. What secret do they guard?"
+	suffix = "lavaland_surface_wizard.dmm"
+	cost = 5
+
 /datum/map_template/ruin/lavaland/puzzle
 	name = "Ancient Puzzle"
 	id = "puzzle"

code/datums/ruins/space.dm

@@ -311,6 +311,12 @@
 	name = "Space Hermit"
 	description = "A late awakening cryo pod in a crashed escape pod wakes up to find what befell of his fellow survivors. Contains all the necessary resources to actually make it out alive. Good luck."
 
+/datum/map_template/ruin/space/clericden
+	id = "clericden"
+	suffix = "clericden.dmm"
+	name = "Cleric's Den"
+	description = "Once part of a larger monastery, this holy order of long dead clerics practiced far less non-violence than they preached. Appears to have been untouched by looters, however. Odd."
+
 /datum/map_template/ruin/space/advancedlab
 	id = "advancedlab"
 	suffix = "advancedlab.dmm"