Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951)

* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad

code/__HELPERS/areas.dm

@@ -15,6 +15,8 @@
 		var/turf/sourceT = found_turfs[1]
 		if(break_if_found[sourceT.type])
 			return FALSE
+		if (is_type_in_typecache(sourceT.loc, GLOB.typecache_shuttle_area))
+			return FALSE
 		found_turfs.Cut(1, 2)
 		var/dir_flags = checked_turfs[sourceT]
 		for(var/dir in GLOB.alldirs)
@@ -37,7 +39,7 @@
 	var/static/blacklisted_areas = typecacheof(/area/space)
 	var/list/turfs = detect_room(get_turf(creator), blacklisted_turfs)
 	if(!turfs)
-		to_chat(creator, "<span class='warning'>The new area must be completely airtight.</span>")
+		to_chat(creator, "<span class='warning'>The new area must be completely airtight and not a part of a shuttle.</span>")
 		return
 	if(turfs.len > BP_MAX_ROOM_SIZE)
 		to_chat(creator, "<span class='warning'>The room you're in is too big. It is [((turfs.len / BP_MAX_ROOM_SIZE)-1)*100]% larger than allowed.</span>")
@@ -45,7 +47,7 @@
 	var/list/areas = list("New Area" = /area)
 	for(var/i in 1 to turfs.len)
 		var/area/place = get_area(turfs[i])
-		if(blacklisted_areas[place.type])
+		if(blacklisted_areas[place.type] || GLOB.typecache_shuttle_area[place.type])
 			continue
 		if(!place.requires_power || place.noteleport || place.hidden)
 			continue // No expanding powerless rooms etc
@@ -91,4 +93,4 @@
 	to_chat(creator, "<span class='notice'>You have created a new area, named [newA.name]. It is now weather proof, and constructing an APC will allow it to be powered.</span>")
 	return TRUE
 
-#undef BP_MAX_ROOM_SIZE
+#undef BP_MAX_ROOM_SIZE

code/__HELPERS/time.dm

@@ -144,7 +144,7 @@ GLOBAL_VAR_INIT(rollovercheck_last_timeofday, 0)
 			else if(day && (!minute || !second))
 				hour = " and 1 hour"
 			else
-				day = "[truncate ? "hour" : "1 hour"]"
+				hour = "[truncate ? "hour" : "1 hour"]"
 	else
 		hour = null