Merge pull request #3516 from Delnth/alpha

Rework the Flood firefight map "Desert Outpost"

code/modules/halo/structures/barricade.dm

@@ -157,4 +157,21 @@
 /obj/structure/destructible/railing/dark/halfright
 	name = "half-right railing"
 	desc = "Half of a metal railing, connected to the corners."
-	icon_state = "railing_half_right_dark"
+	icon_state = "railing_half_right_dark"
+
+// INDUSTRIAL RAILING //
+
+/obj/structure/destructible/railing/industrial
+	desc = "A dark, metal railing."
+	icon_state = "railing_industrial"
+	maxHealth = 1500	// High health to accommodate high damage halo weaponry to prevent decor annihilation with just one stray bullet
+	health = 1500
+
+/obj/structure/destructible/railing/industrial/mounted
+	icon_state = "railing_overlay"
+
+/obj/structure/destructible/railing/industrial/corner
+	icon_state = "railing_deco"
+	flags = ON_BORDER
+	density = 0
+	cover_rating = 0

code/modules/halo/structures/stairs_decorative.dm

@@ -52,4 +52,9 @@
 
 /obj/structure/stairs_decorative/dark/west
 	dir = WEST
-	bound_width = 64
+	bound_width = 64
+
+/obj/structure/stairs_decorative/industrial
+	name = "industrial stairs"
+	icon = 'icons/obj/stairs.dmi'
+	icon_state = "industrialstair"

maps/desert_outpost/turfs_areas.dm → maps/desert_outpost/areas.dm

@@ -13,8 +13,5 @@
 	base_turf = /turf/simulated/floor/asteroid/planet
 	requires_power = 0
 
-/area/planet/stranded_outpost
-	name = "Stranded Outpost"
+/area/planet/daynight/floor1
 	icon_state = "security"
-	base_turf = /turf/simulated/floor/asteroid/planet
-	requires_power = 0

maps/desert_outpost/desert_outpost_map.dm

@@ -0,0 +1,30 @@
+/datum/map/stranded_desert_outpost
+	name = "Outpost"
+	full_name = "Desert Outpost"
+	system_name = "Colonized System"
+
+	path = "desert_outpost"
+	station_levels = list()
+	admin_levels = list()
+	accessible_z_levels = list()
+
+	station_name  = "Desert Outpost"
+	station_short = "Outpost"
+	dock_name     = "Landing Pad"
+	boss_name     = "United Nations Space Command"
+	boss_short    = "UNSC HIGHCOM"
+	company_name  = "United Nations Space Command"
+	company_short = "UNSC"
+	overmap_size= 5
+	overmap_event_tokens = 50
+
+	use_overmap = 1
+	allowed_gamemodes = list("stranded")
+
+	area_coherency_test_exempt_areas = list(
+		/area/space,
+		/area/exoplanet,
+		/area/exoplanet/desert,
+		/area/exoplanet/grass,
+		/area/exoplanet/snow,
+	)

maps/desert_outpost/desert_outpost_overmap.dm

@@ -0,0 +1,11 @@
+/obj/effect/overmap/sector/desert_outpost
+	name = "Desert Outpost"
+	icon = 'maps/Exoplanet Research/exo_research_sector.dmi'
+	desc = "A generic desert planet."
+	icon_state = "research"
+
+	map_bounds = list(1,1,1,1)
+
+	parent_area_type = /area/planet/daynight
+
+	occupy_range = 28

maps/firefight/firefight.dm

@@ -3,26 +3,33 @@
 	//gamemode
 	#include "../_gamemodes/firefight/_all_includes.dm"
 
+	//overmap define
+	#include "../desert_outpost/desert_outpost_overmap.dm"
+//	#include "../desert_outpost/desert_outpost_map.dm"
+
 	//lobby music
 	#include "../../code/modules/halo/lobby_music/halo_music.dm"
 
 	//subtype
+//	#include "../_gamemodes/firefight/subtypes/stranded.dm"
 	#include "../_gamemodes/firefight/subtypes/jobs_colonist.dm"
 	#include "../_gamemodes/firefight/subtypes/jobs_unsc.dm"
 
 	//map def
 	#include "map.dm"
 
 	//map turfs
-	#include "../desert_outpost/turfs_areas.dm"
+	#include "../desert_outpost/areas.dm"
 
 	//map
-	#include "../desert_outpost/desert_outpost.dmm"
+//	#include "../desert_outpost/desert_outpost_old.dmm"
+	#include "../desert_outpost/desert_outpost2.dmm"
+	#include "../desert_outpost/desert_outpost1.dmm"
 
-	#define using_map_DATUM /datum/map/firefight_desert_outpost
+	#define using_map_DATUM /datum/map/stranded_desert_outpost
 
 #elif !defined(MAP_OVERRIDE)
 
-	#warn A map has already been included, ignoring Firefight: Desert Outpost
+	#warn A map has already been included, ignoring Stranded: Desert Outpost
 
 #endif

maps/firefight/map.dm

@@ -1,14 +1,21 @@
-
-/datum/map/firefight_desert_outpost
+/datum/map/stranded_desert_outpost
 	name = "Firefight: Desert Outpost"
 	full_name = "Firefight gamemode on Desert Outpost map"
-	path = "firefight_desert_outpost"
-	allowed_gamemodes = list("firefight")
+
 	lobby_icon = 'code/modules/halo/splashworks/title3.jpg'
 	id_hud_icons = 'maps/firefight/hud_icons.dmi'
-	boss_name = "UNSC"
-	company_name = "UNSC"
 
+	path = "firefight_desert_outpost"
+	station_levels = list()
+	admin_levels = list()
+	accessible_z_levels = list()
+
+	boss_name     = "United Nations Space Command"
+	company_name  = "United Nations Space Command"
+	overmap_size= 5
+	overmap_event_tokens = 0
+
+	use_overmap = 1
 	allowed_gamemodes = list("firefight")
 	allowed_jobs = list(\
 		/datum/job/unsc/marine/firefight,\

maps/stranded/map.dm

@@ -1,14 +1,21 @@
-
 /datum/map/stranded_desert_outpost
 	name = "Stranded: Desert Outpost"
 	full_name = "Stranded gamemode on Desert Outpost map"
-	path = "stranded_desert_outpost"
-	allowed_gamemodes = list("stranded")
+
 	lobby_icon = 'code/modules/halo/splashworks/title4.jpg'
 	id_hud_icons = 'maps/firefight/hud_icons.dmi'
-	boss_name = "UNSC"
-	company_name = "UNSC"
 
+	path = "stranded_desert_outpost"
+	station_levels = list()
+	admin_levels = list()
+	accessible_z_levels = list()
+
+	boss_name     = "United Nations Space Command"
+	company_name  = "United Nations Space Command"
+	overmap_size= 5
+	overmap_event_tokens = 0
+
+	use_overmap = 1
 	allowed_gamemodes = list("stranded")
 	allowed_jobs = list(\
 		/datum/job/unsc/marine/firefight,\

maps/stranded/stranded.dm

@@ -3,6 +3,10 @@
 	//gamemode
 	#include "../_gamemodes/firefight/_all_includes.dm"
 
+	//overmap define
+	#include "../desert_outpost/desert_outpost_overmap.dm"
+	#include "../desert_outpost/desert_outpost_map.dm"
+
 	//lobby music
 	#include "../../code/modules/halo/lobby_music/halo_music.dm"
 
@@ -15,10 +19,12 @@
 	#include "map.dm"
 
 	//map turfs
-	#include "../desert_outpost/turfs_areas.dm"
+	#include "../desert_outpost/areas.dm"
 
 	//map
-	#include "../desert_outpost/desert_outpost.dmm"
+//	#include "../desert_outpost/desert_outpost_old.dmm"
+	#include "../desert_outpost/desert_outpost2.dmm"
+	#include "../desert_outpost/desert_outpost1.dmm"
 
 	#define using_map_DATUM /datum/map/stranded_desert_outpost