[MIRROR] MAP: Some exoplanet ruins

code/game/turfs/simulated/wall_types.dm

@@ -133,7 +133,7 @@
 /turf/simulated/wall/silvergold/New(newloc)
 	..(newloc,MATERIAL_SILVER,MATERIAL_GOLD)
 
-/turf/simulated/wall/sandstonediamond/New(newloc)
+/turf/simulated/wall/sandstone/diamond/New(newloc)
 	..(newloc,MATERIAL_SANDSTONE,MATERIAL_DIAMOND)
 
 /turf/simulated/wall/crystal/New(newloc)

code/modules/mechs/premade/_premade.dm

@@ -151,7 +151,7 @@
 /mob/living/exosuit/premade/random/normal
 
 /mob/living/exosuit/premade/random/boring/Initialize(mapload, obj/structure/heavy_vehicle_frame/source_frame)
-	..(mapload, source_frame, using_boring_colours = TRUE)
+	return..(mapload, source_frame, using_boring_colours = TRUE)
 
 /mob/living/exosuit/premade/random/extra/Initialize(mapload, obj/structure/heavy_vehicle_frame/source_frame)
-	..(mapload, source_frame, super_random = TRUE)
+	return..(mapload, source_frame, super_random = TRUE)

code/modules/projectiles/guns/energy/nuclear.dm

@@ -23,7 +23,7 @@
 	w_class = ITEM_SIZE_NORMAL
 	slot_flags = SLOT_BELT|SLOT_HOLSTER
 	icon = 'icons/obj/guns/skrell_pistol.dmi'
-	icon_state = "skrell_pistol_stun_100"
+	icon_state = "skrell_pistol_stun100"
 	max_shots = 10
 	fire_delay = 6
 	one_hand_penalty = 1

maps/_maps.dm

@@ -24,11 +24,13 @@ GLOBAL_DATUM_INIT(using_map, /datum/map, new using_map_DATUM)
 #include "away\away_sites.dm"
 #include "away_sites_testing\away_sites_testing_define.dm"
 #include "random_ruins\exoplanet_ruins\exoplanet_ruins.dm"
+#include "random_ruins\exoplanet_ruins\excavation_site\excavation_site.dm"
 #include "random_ruins\exoplanet_ruins\transshipment\transshipment.dm"
 #include "random_ruins\exoplanet_ruins\crashed_pod\crashed_pod.dm"
 #include "random_ruins\exoplanet_ruins\datacapsule\datacapsule.dm"
 #include "random_ruins\exoplanet_ruins\deserted_lab\deserted_lab.dm"
 #include "random_ruins\exoplanet_ruins\drill_site\drill_site.dm"
+#include "random_ruins\exoplanet_ruins\droppod\droppod.dm"
 #include "random_ruins\exoplanet_ruins\fountain\fountain_ruin.dm"
 #include "random_ruins\exoplanet_ruins\hut\hut.dm"
 #include "random_ruins\exoplanet_ruins\hydrobase\hydrobase.dm"
@@ -47,4 +49,6 @@ GLOBAL_DATUM_INIT(using_map, /datum/map, new using_map_DATUM)
 #include "random_ruins\exoplanet_ruins\tar_anomaly\tar_anomaly.dm"
 #include "random_ruins\exoplanet_ruins\trash_heap\trash_heap.dm"
 #include "random_ruins\exoplanet_ruins\crashed_probe\crashed_probe.dm"
+#include "random_ruins\exoplanet_ruins\crashed_shuttle\crashed_shuttle.dm"
+#include "random_ruins\exoplanet_ruins\skrell_biodome\skrell_biodome.dm"
 #include "random_ruins\space_ruins\space_ruins.dm"

maps/random_ruins/exoplanet_ruins/crashed_shuttle/crashed_shuttle.dm

@@ -0,0 +1,53 @@
+/datum/map_template/ruin/exoplanet/crashed_shuttle
+	name = "Crushed shuttle"
+	id = "crashed_shuttle"
+	description = "Crushed corporate shuttle."
+	suffixes = list("crashed_shuttle/crashed_shuttle.dmm")
+	spawn_cost = 0.5
+	shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/graysontug)
+	apc_test_exempt_areas = list(/area/map_template/crashed_shuttle/crash = NO_SCRUBBER|NO_VENT|NO_APC)
+	ruin_tags = RUIN_HUMAN|RUIN_WRECK
+	template_flags = TEMPLATE_FLAG_CLEAR_CONTENTS | TEMPLATE_FLAG_NO_RUINS
+
+	skip_main_unit_tests = "Ruin has shuttle landmark."
+
+/area/map_template/crashed_shuttle/graysontug
+	name = "\improper GM Tug"
+	icon_state = "shuttlegrn"
+
+/area/map_template/crashed_shuttle/crash
+	name = "\improper Crash zone"
+	icon_state = "shuttle2"
+	area_flags = AREA_FLAG_EXTERNAL
+
+/datum/shuttle/autodock/overmap/graysontug
+	name = "GM Tug"
+	dock_target = "graysontug_shuttle"
+	current_location = "nav_graysontug_start"
+	range = 1
+	shuttle_area = /area/map_template/crashed_shuttle/graysontug
+	fuel_consumption = 4
+	defer_initialisation = TRUE
+	flags = SHUTTLE_FLAGS_PROCESS
+	skill_needed = SKILL_MIN
+	ceiling_type = /turf/simulated/floor/shuttle_ceiling
+
+/obj/machinery/computer/shuttle_control/explore/graysontug
+	name = "GM Tug Shuttle control console"
+	shuttle_tag = "GM Tug"
+
+/obj/overmap/visitable/ship/landable/graysontug
+	name = "GM Tug"
+	desc = "Grayson Manufactories Tug. Space truckin commonly seen across Frontier."
+	shuttle = "GM Tug"
+	fore_dir = NORTH
+	color = "#e6f7ff"
+	vessel_mass = 2500
+	vessel_size = SHIP_SIZE_TINY
+
+/obj/shuttle_landmark/graysontug/start
+	name = "Crash Zone"
+	landmark_tag = "nav_graysontug_start"
+	base_area = /area/map_template/crashed_shuttle/crash
+	base_turf = /turf/simulated/floor/exoplanet/barren
+	movable_flags = MOVABLE_FLAG_EFFECTMOVE

maps/random_ruins/exoplanet_ruins/droppod/contents_1.dmm

@@ -0,0 +1,49 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/structure/closet/crate/medical,
+/obj/random/medical,
+/obj/random/medical,
+/obj/random/medical/lite,
+/obj/random/medical/lite,
+/obj/random/medical/lite,
+/obj/random/medical/lite,
+/obj/random/firstaid,
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/turf/template_noop,
+/area/template_noop)
+"d" = (
+/obj/structure/closet/crate/secure/weapon,
+/obj/item/crowbar/red,
+/obj/item/inducer,
+/obj/random/powercell,
+/obj/random/powercell,
+/turf/template_noop,
+/area/template_noop)
+"e" = (
+/obj/structure/closet/crate/secure/weapon,
+/obj/random/energy,
+/obj/random/energy,
+/turf/template_noop,
+/area/template_noop)
+"g" = (
+/obj/structure/closet/crate/freezer/rations,
+/turf/template_noop,
+/area/template_noop)
+
+(1,1,1) = {"
+d
+b
+a
+"}
+(2,1,1) = {"
+b
+b
+b
+"}
+(3,1,1) = {"
+e
+b
+g
+"}

maps/random_ruins/exoplanet_ruins/droppod/contents_2.dmm

@@ -0,0 +1,24 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"c" = (
+/mob/living/exosuit/premade/random/boring,
+/turf/template_noop,
+/area/template_noop)
+"h" = (
+/turf/template_noop,
+/area/template_noop)
+
+(1,1,1) = {"
+h
+h
+h
+"}
+(2,1,1) = {"
+h
+c
+h
+"}
+(3,1,1) = {"
+h
+h
+h
+"}

maps/random_ruins/exoplanet_ruins/droppod/contents_3.dmm

@@ -0,0 +1,24 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"e" = (
+/mob/living/simple_animal/hostile/fleet_heavy,
+/turf/template_noop,
+/area/template_noop)
+"f" = (
+/turf/template_noop,
+/area/template_noop)
+
+(1,1,1) = {"
+f
+f
+f
+"}
+(2,1,1) = {"
+f
+e
+f
+"}
+(3,1,1) = {"
+f
+f
+f
+"}

maps/random_ruins/exoplanet_ruins/droppod/droppod.dm

@@ -0,0 +1,39 @@
+/datum/map_template/ruin/exoplanet/droppod
+	name = "droppod"
+	id = "droppod"
+	description = "A damaged capsule with some strange contents."
+	suffixes = list("droppod/droppod.dmm")
+	spawn_cost = 0.5
+	template_flags = TEMPLATE_FLAG_CLEAR_CONTENTS | TEMPLATE_FLAG_NO_RUINS
+	ruin_tags = RUIN_HUMAN|RUIN_WRECK
+
+	apc_test_exempt_areas = list(
+		/area/map_template/droppod = NO_SCRUBBER|NO_VENT|NO_APC
+	)
+
+
+
+/area/map_template/droppod
+	name = "\improper Droppod"
+	icon_state = "blue"
+	turfs_airless = TRUE
+
+
+/obj/landmark/map_load_mark/droppod
+	name = "random droppod contents"
+	templates = list(/datum/map_template/droppod_contents, /datum/map_template/droppod_contents/type2, /datum/map_template/droppod_contents/type3)
+
+/datum/map_template/droppod_contents
+	name = "random droppod contents #1 (shipping)"
+	id = "droppod_1"
+	mappaths = list("maps/random_ruins/exoplanet_ruins/droppod/contents_1.dmm")
+
+/datum/map_template/droppod_contents/type2
+	name = "random droppod contents #2 (exosuit)"
+	id = "droppod_2"
+	mappaths = list("maps/random_ruins/exoplanet_ruins/droppod/contents_2.dmm")
+
+/datum/map_template/droppod_contents/type3
+	name = "random droppod contents #2 (robots)"
+	id = "droppod_3"
+	mappaths = list("maps/random_ruins/exoplanet_ruins/droppod/contents_3.dmm")

maps/random_ruins/exoplanet_ruins/droppod/droppod.dmm

@@ -0,0 +1,145 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/obj/structure/droppod_door{
+	dir = 8
+	},
+/turf/simulated/floor/reinforced,
+/area/map_template/droppod)
+"c" = (
+/obj/landmark/scorcher,
+/turf/template_noop,
+/area/template_noop)
+"d" = (
+/turf/simulated/wall/r_titanium,
+/area/map_template/droppod)
+"f" = (
+/obj/structure/droppod_door,
+/turf/simulated/floor/reinforced,
+/area/map_template/droppod)
+"g" = (
+/turf/simulated/floor/reinforced,
+/area/map_template/droppod)
+"j" = (
+/obj/structure/droppod_door{
+	dir = 4
+	},
+/turf/simulated/floor/reinforced,
+/area/map_template/droppod)
+"q" = (
+/obj/structure/droppod_door{
+	dir = 1
+	},
+/turf/simulated/floor/reinforced,
+/area/map_template/droppod)
+"u" = (
+/obj/landmark/map_load_mark/droppod,
+/turf/simulated/floor/reinforced,
+/area/map_template/droppod)
+"O" = (
+/obj/landmark/scorcher,
+/obj/landmark/scorcher,
+/turf/template_noop,
+/area/template_noop)
+
+(1,1,1) = {"
+a
+a
+c
+c
+c
+c
+c
+a
+a
+"}
+(2,1,1) = {"
+a
+c
+c
+d
+c
+d
+c
+c
+a
+"}
+(3,1,1) = {"
+c
+c
+d
+d
+j
+d
+d
+c
+c
+"}
+(4,1,1) = {"
+c
+d
+d
+g
+g
+g
+d
+d
+c
+"}
+(5,1,1) = {"
+c
+c
+q
+g
+u
+g
+f
+c
+c
+"}
+(6,1,1) = {"
+c
+d
+d
+g
+g
+g
+d
+d
+c
+"}
+(7,1,1) = {"
+c
+c
+d
+d
+b
+d
+d
+c
+c
+"}
+(8,1,1) = {"
+a
+c
+c
+d
+c
+d
+c
+O
+a
+"}
+(9,1,1) = {"
+a
+a
+c
+c
+c
+c
+c
+a
+a
+"}

maps/random_ruins/exoplanet_ruins/excavation_site/excavation_site.dm

@@ -0,0 +1,8 @@
+/datum/map_template/ruin/exoplanet/excavation_site
+	name = "excavation site"
+	id = "excavation_site"
+	description = "Abandoned archaeological site."
+	suffixes = list("excavation_site/excavation_site.dmm")
+	spawn_cost = 0.5
+	template_flags = TEMPLATE_FLAG_CLEAR_CONTENTS|TEMPLATE_FLAG_NO_RUINS
+	ruin_tags = RUIN_HUMAN