Merge pull request #4889 from Citadel-Station-13/upstream-merge-34319

[MIRROR] Fails travis on common mapping mistakes

code/game/area/Space_Station_13_areas.dm

@@ -67,12 +67,25 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	valid_territory = FALSE
 	ambientsounds = MINING
 
+/area/asteroid/nearstation
+	dynamic_lighting = DYNAMIC_LIGHTING_FORCED
+	ambientsounds = RUINS
+	always_unpowered = FALSE
+	requires_power = TRUE
+	blob_allowed = TRUE
+
+/area/asteroid/nearstation/bomb_site
+	name = "Bomb Testing Asteroid"
+
 /area/asteroid/cave
 	name = "Asteroid - Underground"
 	icon_state = "cave"
 	requires_power = FALSE
 	outdoors = TRUE
 
+/area/asteroid/cave/space
+	name = "Asteroid - Space"
+
 /area/asteroid/artifactroom
 	name = "Asteroid - Artifact"
 	icon_state = "cave"
@@ -661,6 +674,9 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Chapel Asteroid"
 	icon_state = "explored"
 
+/area/chapel/asteroid/monastery
+	name = "Monastery Asteroid"
+
 /area/chapel/dock
 	name = "Chapel Dock"
 	icon_state = "construction"

code/game/area/areas/ruins/space.dm

@@ -72,6 +72,24 @@
 	name = "Hotel Guest Room"
 	icon_state = "Sleep"
 
+/area/ruin/space/has_grav/hotel/guestroom/room_1
+	name = "Hotel Guest Room 1"
+
+/area/ruin/space/has_grav/hotel/guestroom/room_2
+	name = "Hotel Guest Room 2"
+
+/area/ruin/space/has_grav/hotel/guestroom/room_3
+	name = "Hotel Guest Room 3"
+
+/area/ruin/space/has_grav/hotel/guestroom/room_4
+	name = "Hotel Guest Room 4"
+
+/area/ruin/space/has_grav/hotel/guestroom/room_5
+	name = "Hotel Guest Room 5"
+
+/area/ruin/space/has_grav/hotel/guestroom/room_6
+	name = "Hotel Guest Room 6"
+
 /area/ruin/space/has_grav/hotel/security
 	name = "Hotel Security Post"
 	icon_state = "security"

code/game/area/areas/ruins/templates.dm

@@ -0,0 +1,12 @@
+//Template ruin areas
+
+/area/ruin/powered/shuttle
+	name = "Shuttle"
+
+/area/ruin/powered/shuttle/medium_1
+
+/area/ruin/powered/shuttle/medium_2
+
+/area/ruin/powered/shuttle/medium_3
+
+/area/ruin/powered/shuttle/medium_4

code/game/area/areas/shuttles.dm

@@ -101,6 +101,14 @@
 	name = "Luxurious Emergency Shuttle"
 	noteleport = TRUE
 
+/area/shuttle/escape/arena
+	name = "The Arena"
+	noteleport = TRUE
+
+/area/shuttle/escape/meteor
+	name = "\proper a meteor with engines strapped to it"
+	luminosity = NONE
+
 /area/shuttle/transport
 	name = "Transport Shuttle"
 	blob_allowed = FALSE

code/modules/admin/verbs/debug.dm

@@ -514,7 +514,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
 	var/list/areas_with_LS = list()
 	var/list/areas_with_intercom = list()
 	var/list/areas_with_camera = list()
-	var/list/station_areas_blacklist = typecacheof(list(/area/holodeck/rec_center, /area/shuttle, /area/engine/supermatter, /area/science/test_area, /area/space, /area/solar, /area/mine, /area/ruin))
+	var/list/station_areas_blacklist = typecacheof(list(/area/holodeck/rec_center, /area/shuttle, /area/engine/supermatter, /area/science/test_area, /area/space, /area/solar, /area/mine, /area/ruin, /area/asteroid))
 
 	if(SSticker.current_state == GAME_STATE_STARTUP)
 		to_chat(usr, "Game still loading, please hold!")