Merge pull request #5292 from MistakeNot4892/port/cynosure_changes

Assorted changes from Cynosure branch.

Author: out-of-phaze

code/__defines/definition_helpers.dm

@@ -1,4 +1,46 @@
 /**Define a poster's decl and its mapper type */
 #define DEFINE_POSTER(TYPENAME, ICONSTATE, NAME, DESC)\
 /decl/poster_design/##TYPENAME{name = NAME; desc = DESC; icon_state = ICONSTATE;};\
-/obj/structure/sign/poster/##TYPENAME{poster_design = /decl/poster_design/##TYPENAME; name = NAME; icon_state = ICONSTATE;};
+/obj/structure/sign/poster/##TYPENAME{poster_design = /decl/poster_design/##TYPENAME; name = NAME; icon_state = ICONSTATE;};
+
+#define DEFINE_STACK_SUBTYPES(MAT_ID, MAT_NAME, MAT_TYPE, STACK_TYPE, REINF_TYPE) \
+/obj/item/stack/material/##STACK_TYPE/mapped/##MAT_ID {                    \
+	name = "1 " + MAT_NAME;                                                \
+	material = /decl/material/MAT_TYPE;                                    \
+	reinf_material = REINF_TYPE;                                           \
+	amount = 1;                                                            \
+	is_spawnable_type = TRUE;                                              \
+	color = parent_type::paint_color || /decl/material/MAT_TYPE::color;    \
+}                                                                          \
+/obj/item/stack/material/##STACK_TYPE/mapped/##MAT_ID/five {               \
+	name = "5 " + MAT_NAME;                                                \
+	amount = 5;                                                            \
+}                                                                          \
+/obj/item/stack/material/##STACK_TYPE/mapped/##MAT_ID/ten {                \
+	name = "10 " + MAT_NAME;                                               \
+	amount = 10;                                                           \
+}                                                                          \
+/obj/item/stack/material/##STACK_TYPE/mapped/##MAT_ID/fifteen {            \
+	name = "15 " + MAT_NAME;                                               \
+	amount = 15;                                                           \
+}                                                                          \
+/obj/item/stack/material/##STACK_TYPE/mapped/##MAT_ID/twenty {             \
+	name = "20 " + MAT_NAME;                                               \
+	amount = 20;                                                           \
+}                                                                          \
+/obj/item/stack/material/##STACK_TYPE/mapped/##MAT_ID/twentyfive {         \
+	name = "25 " + MAT_NAME;                                               \
+	amount = 25;                                                           \
+}                                                                          \
+/obj/item/stack/material/##STACK_TYPE/mapped/##MAT_ID/thirty {             \
+	name = "30 " + MAT_NAME;                                               \
+	amount = 30;                                                           \
+}                                                                          \
+/obj/item/stack/material/##STACK_TYPE/mapped/##MAT_ID/forty {              \
+	name = "40 " + MAT_NAME;                                               \
+	amount = 40;                                                           \
+}                                                                          \
+/obj/item/stack/material/##STACK_TYPE/mapped/##MAT_ID/fifty {              \
+	name = "50 " + MAT_NAME;                                               \
+	amount = 50;                                                           \
+}

code/__defines/misc.dm

@@ -100,6 +100,7 @@
 #define AREA_FLAG_SECURITY                BITFLAG(11) // Area is security for the purposes of newscaster init.
 #define AREA_FLAG_HIDE_FROM_HOLOMAP       BITFLAG(12) // if we shouldn't be drawn on station holomaps
 #define AREA_FLAG_ALLOW_LEVEL_PERSISTENCE BITFLAG(13) // Whether or not this area should pass changed turfs to SSpersistence.
+#define AREA_FLAG_CONSTRUCTED             BITFLAG(13) // Set base flooring above this area to plating.
 
 //Map template flags
 #define TEMPLATE_FLAG_ALLOW_DUPLICATES    BITFLAG(0)  // Lets multiple copies of the template to be spawned

code/_helpers/visual_filters.dm

@@ -63,16 +63,19 @@
 	if (!filter_data || !filter_data[filter_name])
 		return
 
-	var/list/monkeypatched_params = params.Copy()
-	monkeypatched_params.Insert(1, null)
 	var/index = filter_data.Find(filter_name)
+	if(index <= 0)
+		return
 
 	// First, animate ourselves.
-	monkeypatched_params[1] = filters[index]
+	var/list/monkeypatched_params = params.Copy()
+	monkeypatched_params.Insert(1, filters[index])
 	animate(arglist(monkeypatched_params))
 
 	// If we're being copied by Z-Mimic, update mimics too.
 	if (bound_overlay)
 		for (var/atom/movable/AM as anything in get_above_oo())
+			if(index > length(AM.filters))
+				continue // presumably there is a z-mimic flush pending - TODO check if this would fuck with the wrong filter on the shadower
 			monkeypatched_params[1] = AM.filters[index]
 			animate(arglist(monkeypatched_params))

code/controllers/evacuation/evacuation.dm

@@ -117,7 +117,7 @@
 			if(istype(A) && (A.area_flags & AREA_FLAG_HALLWAY))
 				A.readyreset()
 		emergency_evacuation = 0
-	else if(global.using_map.emergency_shuttle_recall_message)
+	else if(global.using_map.shuttle_recall_message)
 		priority_announcement.Announce(global.using_map.shuttle_recall_message)
 
 	return 1

code/controllers/evacuation/evacuation_lifepods.dm

@@ -17,7 +17,9 @@
 	if(waiting_to_leave())
 		return
 	state = EVAC_IN_TRANSIT
-	priority_announcement.Announce(replacetext(replacetext(global.using_map.emergency_shuttle_leaving_dock, "%dock_name%", "[global.using_map.dock_name]"),  "%ETA%", "[round(get_eta()/60,1)] minute\s"))
+	var/msg = global.using_map.emergency_shuttle_leaving_dock
+	if(msg)
+		priority_announcement.Announce(replacetext(replacetext(msg, "%dock_name%", "[global.using_map.dock_name]"),  "%ETA%", "[round(get_eta()/60,1)] minute\s"))
 	return 1
 
 /datum/evacuation_controller/lifepods/available_evac_options()

code/controllers/subsystems/mapping.dm

@@ -176,6 +176,10 @@ SUBSYSTEM_DEF(mapping)
 	// With levels set up and serde complete (and levels flagged) we can do any remaining level generation.
 	global.using_map.finalize_map_generation()
 
+	// Do this dead last as all gen has to run before it makes sense.
+	for(var/datum/level_data/level in levels_by_z)
+		level.build_area_ceilings()
+
 	. = ..()
 
 /datum/controller/subsystem/mapping/proc/setup_data_for_levels(min_z = 1, max_z = world.maxz)

code/controllers/subsystems/processing/nano.dm

@@ -50,7 +50,7 @@ PROCESSING_SUBSYSTEM_DEF(nano)
   */
 /datum/controller/subsystem/processing/nano/proc/update_uis(datum/src_object)
 	. = 0
-	if (!src_object.open_uis)
+	if (!src_object?.open_uis)
 		return
 
 	for (var/ui_key in src_object.open_uis)

code/controllers/subsystems/shuttle.dm

@@ -42,7 +42,7 @@ SUBSYSTEM_DEF(shuttle)
 	while (working_shuttles.len)
 		var/datum/shuttle/shuttle = working_shuttles[working_shuttles.len]
 		working_shuttles.len--
-		if(shuttle.process_state && (shuttle.Process(wait, times_fired, src) == PROCESS_KILL))
+		if((shuttle.always_process || shuttle.process_state) && (shuttle.Process(wait, times_fired, src) == PROCESS_KILL) && !shuttle.always_process)
 			process_shuttles -= shuttle
 
 		if (MC_TICK_CHECK)

code/game/area/area_abstract.dm

@@ -1,6 +1,7 @@
 /area/hallway
 	name = "hallway"
 	holomap_color = HOLOMAP_AREACOLOR_HALLWAYS
+	area_start_lit = TRUE
 
 /area/maintenance
 	area_flags = AREA_FLAG_RAD_SHIELDED

code/game/area/areas.dm

@@ -13,6 +13,9 @@ var/global/list/areas = list()
 	luminosity =    0
 	mouse_opacity = MOUSE_OPACITY_UNCLICKABLE
 
+	// If true, this area will force light switches on during init.
+	var/area_start_lit = null
+
 	// If true, will allow natural walls in this area to have xenoarchaeology finds in them.
 	var/allow_xenoarchaeology_finds = TRUE