Merge branch 'master' into tonight's-sosiest-loser

shiptest-ss13 · Nov 3, 2023 · a16edad · a16edad
2 parents e97de60 + 17c432f
commit a16edad
Show file tree

Hide file tree

Showing 29 changed files with 4,860 additions and 355 deletions.
diff --git a/_maps/RandomRuins/RockRuins/rockplanet_nomadcrash.dmm b/_maps/RandomRuins/RockRuins/rockplanet_nomadcrash.dmm
diff --git a/_maps/map_catalogue.txt b/_maps/map_catalogue.txt
@@ -294,6 +294,10 @@ Find the key for using this catalogue in "map_catalogue_key.txt"
 		Size = (x = 9)(y = 9)(z = 1)
 		Tags = "Boss Combat Challenge", "Major Loot", "Hazardous", "Inhospitable"
 
+		File Name = "_maps\RandomRuins\RockRuins\rockplanet_nomadcrash.dmm"
+		Size = (x = 58)(y = 48)(z = 1)
+		Tags = "Medium Combat Challenge", "Medium Loot", "Hazardous", "Hospitable"
+
 
 	SandRuins:
 		File Name = "_maps\RandomRuins\Ruins\whitesands_surface_assaultpodcrash.dmm"
@@ -511,6 +515,10 @@ Find the key for using this catalogue in "map_catalogue_key.txt"
 		Size = (x = 37)(y = 43)(z = 1)
 		Tags = "Medium Combat Challenge", "Medium Loot", "Liveable"
 
+		File Name = "_maps\RandomRuins\BeachRuins\beach_float_resort.dmm"
+		Size = (x = 38)(y = 52)(z = 1)
+		Tags = "No Combat", "Minor Loot", "Liveable"
+
 	Deprecated:
 		File Name = "_maps\RandomRuins\deprecated\jungle_surface_tumblr_sexyman.dmm"
 		Size = (x = 30)(y = 20)(z = 1)
@@ -569,7 +577,7 @@ Find the key for using this catalogue in "map_catalogue_key.txt"
 		Tags = "No Combat", "Medium Loot", "Shelter"
 
 
-		Waste Ruins:
+	Waste Ruins:
 		File name ="_maps\RandomRuins\wasteruins\wasteplanet_clowncrash.dmm"
 		Size = (x = 11)(y = 12)(z = 1)
 		Tags = "No Combat", "Minor Loot", "Shelter" "hospitable"

diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
@@ -134,27 +134,13 @@ SUBSYSTEM_DEF(mapping)
 	for(var/datum/planet_type/type as anything in subtypesof(/datum/planet_type))
 		planet_types[initial(type.planet)] = new type
 
-	// Still supporting bans by filename
-	// I hate this so much. I want to kill it because I don't think ANYONE uses this
-	// Couldn't you just remove it on a fork or something??? come onnnnnnnnnnnn stop EXISTING already
-	var/list/banned = generateMapList("[global.config.directory]/lavaruinblacklist.txt")
-	banned += generateMapList("[global.config.directory]/spaceruinblacklist.txt")
-	banned += generateMapList("[global.config.directory]/iceruinblacklist.txt")
-	banned += generateMapList("[global.config.directory]/sandruinblacklist.txt")
-	banned += generateMapList("[global.config.directory]/jungleruinblacklist.txt")
-	banned += generateMapList("[global.config.directory]/rockruinblacklist.txt")
-	banned += generateMapList("[global.config.directory]/wasteruinblacklist.txt")
-
 	for(var/item in sortList(subtypesof(/datum/map_template/ruin), /proc/cmp_ruincost_priority))
 		var/datum/map_template/ruin/ruin_type = item
 		// screen out the abstract subtypes
 		if(!initial(ruin_type.id))
 			continue
 		var/datum/map_template/ruin/R = new ruin_type()
 
-		if(R.mappath in banned)
-			continue
-
 		map_templates[R.name] = R
 		ruins_templates[R.name] = R
 		ruin_types_list[R.ruin_type] += list(R.name = R)

diff --git a/code/datums/ruins/beachplanet.dm b/code/datums/ruins/beachplanet.dm
@@ -1,4 +1,4 @@
-// Hey! Listen! Update \config\beachruinblacklist.txt with your new ruins!
+// Hey! Listen! Update _maps\map_catalogue.txt with your new ruins!
 
 /datum/map_template/ruin/beachplanet
 	prefix = "_maps/RandomRuins/BeachRuins/"

diff --git a/code/datums/ruins/icemoon.dm b/code/datums/ruins/icemoon.dm
@@ -1,4 +1,4 @@
-// Hey! Listen! Update \config\iceruinblacklist.txt with your new ruins!
+// Hey! Listen! Update _maps\map_catalogue.txt with your new ruins!
 
 /datum/map_template/ruin/icemoon
 	prefix = "_maps/RandomRuins/IceRuins/"

diff --git a/code/datums/ruins/jungle.dm b/code/datums/ruins/jungle.dm
@@ -1,4 +1,4 @@
-// Hey! Listen! Update \config\jungleruinblacklist.txt with your new ruins!
+// Hey! Listen! Update _maps\map_catalogue.txt with your new ruins!
 
 /datum/map_template/ruin/jungle
 	prefix = "_maps/RandomRuins/JungleRuins/"

diff --git a/code/datums/ruins/lavaland.dm b/code/datums/ruins/lavaland.dm
@@ -1,4 +1,4 @@
-// Hey! Listen! Update \config\lavaruinblacklist.txt with your new ruins!
+// Hey! Listen! Update _maps\map_catalogue.txt with your new ruins!
 
 /datum/map_template/ruin/lavaland
 	prefix = "_maps/RandomRuins/LavaRuins/"

diff --git a/code/datums/ruins/rockplanet.dm b/code/datums/ruins/rockplanet.dm
@@ -1,4 +1,4 @@
-// Hey! Listen! Update \config\rockruinblacklist.txt with your new ruins!
+// Hey! Listen! Update _maps\map_catalogue.txt with your new ruins!
 
 /datum/map_template/ruin/rockplanet
 	prefix = "_maps/RandomRuins/RockRuins/"
@@ -93,3 +93,9 @@
 	description = "Nanotrasen's gotta lay off some personnel, and this facility hasn't been worth the effort so far"
 	id = "rockplanet_budgetcuts"
 	suffix = "rockplanet_budgetcuts.dmm"
+
+/datum/map_template/ruin/rockplanet/nomadcrash
+	name = "Nomad Crash"
+	description = "A Crashed Arrow & Axe Interceptor. A long forgotten Crew. They tried their best to survive..."
+	id = "rockplanet_nomadcrash"
+	suffix = "rockplanet_nomadcrash.dmm"
diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm
@@ -1,4 +1,4 @@
-// Hey! Listen! Update \config\spaceruinblacklist.txt with your new ruins!
+// Hey! Listen! Update _maps\map_catalogue.txt with your new ruins!
 
 /datum/map_template/ruin/space
 	prefix = "_maps/RandomRuins/SpaceRuins/"

diff --git a/code/datums/ruins/wasteplanet.dm b/code/datums/ruins/wasteplanet.dm
@@ -1,4 +1,4 @@
-// Hey! Listen! Update \config\wasteruinblacklist.txt with your new ruins!
+// Hey! Listen! Update _maps\map_catalogue.txt with your new ruins!
 
 /datum/map_template/ruin/wasteplanet
 	prefix = "_maps/RandomRuins/WasteRuins/"

diff --git a/code/datums/ruins/whitesands.dm b/code/datums/ruins/whitesands.dm
@@ -1,4 +1,4 @@
-// Hey! Listen! Update \config\sandruinblacklist.txt with your new ruins!
+// Hey! Listen! Update _maps\map_catalogue.txt with your new ruins!
 
 /datum/map_template/ruin/whitesands
 	prefix = "_maps/RandomRuins/SandRuins/"

diff --git a/code/game/area/areas/ruins/rockplanet.dm b/code/game/area/areas/ruins/rockplanet.dm
@@ -1,7 +1,17 @@
 /**********************Rock Planet Areas**************************/
 
-/area/mine/rockplanet
+//syndicate
+/area/ruin/rockplanet/syndicate
 	name = "Abandoned Syndicate Mining Facility"
+	icon_state = "green"
 
-/area/mine/rockplanet_nanotrasen
+//budgetcuts
+/area/ruin/rockplanet/nanotrasen
 	name = "Abandoned Mining Facility"
+	icon_state = "green"
+
+//nomad
+/area/ruin/rockplanet/nomad
+	name = "Abandoned Crash Site"
+	always_unpowered = FALSE
+	icon_state = "red"
diff --git a/code/game/objects/effects/decals/turfdecal/flooring_decals.dm b/code/game/objects/effects/decals/turfdecal/flooring_decals.dm
@@ -1092,3 +1092,17 @@ TURF_DECAL_COLOR_HELPER(transparent/inteqbrown, "#4b2a18", 140)
 
 /obj/effect/turf_decal/hardline_big/seven
 	icon_state = "hardline_big-7"
+
+//ARROW & AXE DOCKYARDS
+
+/obj/effect/turf_decal/arrowaxe_small
+	name = "small arrow & axe logo"
+
+/obj/effect/turf_decal/arrowaxe_small/left
+	icon_state = "arrowaxe-left"
+
+/obj/effect/turf_decal/arrowaxe_small/center
+	icon_state = "arrowaxe-center"
+
+/obj/effect/turf_decal/arrowaxe_small/right
+	icon_state = "arrowaxe-right"
diff --git a/code/game/turfs/open/floor/plating/rockplanet.dm b/code/game/turfs/open/floor/plating/rockplanet.dm
@@ -33,6 +33,9 @@
 	icon_state = "wet_soft0"
 	base_icon_state = "wet_soft"
 
+/turf/open/floor/plating/asteroid/rockplanet/wet/atmos
+	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+
 /turf/open/floor/plating/asteroid/rockplanet/wet/lit
 	light_range = 2
 	light_power = 0.6
@@ -46,3 +49,37 @@
 	light_range = 2
 	light_power = 0.6
 	light_color = COLOR_VERY_LIGHT_GRAY
+
+/turf/open/floor/plating/asteroid/rockplanet/grass
+	name = "dry grass"
+	desc = "A patch of dry grass."
+	icon_state = "grass0"
+
+/turf/open/floor/plating/asteroid/rockplanet/mud
+	name = "mud"
+	icon_state = "greenerdirt"
+
+/turf/open/floor/plating/asteroid/rockplanet/pond
+	name = "pond"
+	icon_state = "riverwater"
+
+/turf/open/floor/plating/asteroid/rockplanet/plating
+	name = "exterior plating"
+	icon_state = "plating"
+
+/turf/open/floor/plating/asteroid/rockplanet/plating/scorched
+	name = "exterior plating"
+	icon_state = "panelscorched"
+
+/turf/open/floor/plating/asteroid/rockplanet/stairs
+	name = "exterior stairs"
+	icon_state = "stairs"
+
+/turf/open/floor/plating/asteroid/rockplanet/hull_plating
+	name = "exterior hull plating"
+	icon_state = "regular_hull"
+
+/turf/open/floor/plating/asteroid/rockplanet/plasteel
+	name = "exterior floor"
+	icon_state = "tiled_gray"
+	icon = 'icons/turf/floors/tiles.dmi'
diff --git a/config/atmos_mix.txt b/config/atmos_mix.txt
diff --git a/config/awaymissionconfig.txt b/config/awaymissionconfig.txt
diff --git a/config/external_rsc_urls.txt b/config/external_rsc_urls.txt
diff --git a/config/iceruinblacklist.txt b/config/iceruinblacklist.txt
diff --git a/config/jobs.txt b/config/jobs.txt
diff --git a/config/jungleruinblacklist.txt b/config/jungleruinblacklist.txt
diff --git a/config/lavaruinblacklist.txt b/config/lavaruinblacklist.txt