tweak: Engi areas type shuffling. Supermatter and sub-engine areas overload-protected APCs.

code/game/area/ss13_areas.dm

@@ -1633,65 +1633,65 @@ This applies to all STANDARD station areas
 
 
 //Engineering
-/area/engine
+/area/engineering
 	ambientsounds = ENGINEERING_SOUNDS
 	sound_environment = SOUND_AREA_LARGE_ENCLOSED
 
-/area/engine/engine_smes
+/area/engineering/engine/smes
 	name = "Engineering SMES"
 	icon_state = "engine_smes"
 
-/area/engine/engineering
+/area/engineering/engine
 	name = "Engineering"
 	icon_state = "engine_smes"
 
-/area/engine/engineering/monitor
+/area/engineering/engine/monitor
 	name = "Engineering Monitoring Room"
 	icon_state = "engine_control"
 
-/area/engine/break_room
+/area/engineering/break_room
 	name = "Engineering Foyer"
 	icon_state = "engine"
 	sound_environment = SOUND_AREA_SMALL_ENCLOSED
 
-/area/engine/aienter
+/area/engineering/aienter
 	name = "AI Sattelit Access Point"
 	icon_state = "engine"
 
-/area/engine/equipmentstorage
+/area/engineering/equipmentstorage
 	name = "Engineering Equipment Storage"
 	icon_state = "storage"
 	sound_environment = SOUND_AREA_SMALL_ENCLOSED
 
-/area/engine/hardsuitstorage
+/area/engineering/hardsuitstorage
 	name = "Engineering Hardsuit Storage"
 	icon_state = "storage"
 
-/area/engine/controlroom
+/area/engineering/controlroom
 	name = "Engineering Control Room"
 	icon_state = "engine_control"
 
-/area/engine/gravitygenerator
+/area/engineering/gravitygenerator
 	name = "Gravity Generator"
 	icon_state = "engine"
 
-/area/engine/chiefs_office
+/area/engineering/chiefs_office
 	name = "Chief Engineer's Office"
 	icon_state = "engine_control"
 
-/area/engine/mechanic_workshop
+/area/engineering/mechanic_workshop
 	name = "Mechanic Workshop"
 	icon_state = "engine"
 
-/area/engine/mechanic_workshop/expedition
+/area/engineering/mechanic_workshop/expedition
 	name = "Hangar Expedition"
 	icon_state = "engine"
 
-/area/engine/mechanic_workshop/hangar
+/area/engineering/mechanic_workshop/hangar
 	name = "Hangаr Bay"
 	icon_state = "engine"
 
-/area/engine/supermatter
+/area/engineering/supermatter
 	name = "Supermatter Engine"
 	icon_state = "engine"
 	sound_environment = SOUND_AREA_SMALL_ENCLOSED

code/game/gamemodes/miniantags/bot_swarm/swarmer.dm

@@ -278,7 +278,7 @@
 			to_chat(S, "<span class='warning'>Destroying this object has the potential to cause a hull breach. Aborting.</span>")
 			S.GiveTarget(null)
 			return FALSE
-		else if(istype(A, /area/engine/supermatter))
+		else if(istype(A, /area/engineering/supermatter))
 			to_chat(S, "<span class='warning'>Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.</span>")
 			S.GiveTarget(null)
 			return FALSE
@@ -393,7 +393,7 @@
 			to_chat(S, "<span class='warning'>Destroying this object has the potential to cause a hull breach. Aborting.</span>")
 			S.GiveTarget(null)
 			return TRUE
-		else if(istype(A, /area/engine/supermatter))
+		else if(istype(A, /area/engineering/supermatter))
 			to_chat(S, "<span class='warning'>Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.</span>")
 			S.GiveTarget(null)
 			return TRUE
@@ -418,7 +418,7 @@
 			to_chat(S, "<span class='warning'>Destroying this object has the potential to cause a hull breach. Aborting.</span>")
 			S.GiveTarget(null)
 			return TRUE
-		else if(istype(A, /area/engine/supermatter))
+		else if(istype(A, /area/engineering/supermatter))
 			to_chat(S, "<span class='warning'>Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.</span>")
 			S.GiveTarget(null)
 			return TRUE
@@ -432,7 +432,7 @@
 			to_chat(S, "<span class='warning'>Destroying this object has the potential to cause a hull breach. Aborting.</span>")
 			S.GiveTarget(null)
 			return TRUE
-		else if(istype(A, /area/engine/supermatter))
+		else if(istype(A, /area/engineering/supermatter))
 			to_chat(S, "<span class='warning'>Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.</span>")
 			S.GiveTarget(null)
 			return TRUE

code/game/gamemodes/nuclear/nuclear.dm

@@ -442,7 +442,7 @@
 		else if(is_type_in_list(A, fiftythousand_penalty))
 			scoreboard.nuked_penalty = 50000
 
-		else if(istype(A, /area/engine))
+		else if(istype(A, /area/engineering))
 			scoreboard.nuked_penalty = 100000
 
 		else

code/game/gamemodes/objective.dm

@@ -1404,7 +1404,7 @@ GLOBAL_LIST_EMPTY(admin_objective_list)
 	///Where we should KABOOM
 	var/area/detonation_location
 	var/list/area_blacklist = list(
-		/area/engine/engineering, /area/engine/supermatter,
+		/area/engineering/engine, /area/engineering/supermatter,
 		/area/toxins/test_area, /area/turret_protected/ai)
 	needs_target = FALSE
 

code/modules/antagonists/space_ninja/drain_act/apc.dm

@@ -7,7 +7,7 @@
 	var/drain_total = 0
 	add_game_logs("draining energy from [src] [COORD(src)]", ninja)
 	var/area/area = get_area(src)
-	if(area && (istype(area, /area/engine/engineering) || istype(area, /area/engine/supermatter)))
+	if(area && (istype(area, /area/engineering/engine) || istype(area, /area/engineering/supermatter)))
 		//На русском чтобы даже полному идиоту было ясно, почему им не даётся сосать ток из этого АПЦ
 		to_chat(ninja, span_danger("Внимание: Высасывание энергии из АПЦ в этой зоне потенциально может привести к неконтролируемым разрушениям. Процесс отменён."))
 		return INVALID_DRAIN

code/modules/events/apc_overload.dm

@@ -28,9 +28,11 @@
 	return TRUE
 
 /proc/apc_overload_failure(announce=TRUE)
-	var/list/skipped_areas_apc = list(
-		/area/engine/engineering,
-		/area/turret_protected/ai)
+	var/static/list/skipped_areas_apc = typecacheof(list(
+		/area/engineering/engine,
+		/area/engineering/supermatter,
+		/area/turret_protected/ai,
+	))
 
 	if(announce)
 		GLOB.event_announcement.Announce("Зафиксирована перегрузка энергосети станции [station_name()]. Инженерному отделу надлежит проверить все терминалы ЛКП под напольным покрытием.", "ВНИМАНИЕ: КРИТИЧЕСКИЙ СБОЙ СИСТЕМЫ ПИТАНИЯ.", new_sound = 'sound/AI/attention.ogg')
@@ -41,7 +43,7 @@
 		var/obj/machinery/power/apc/C = thing
 		// skip any APCs that are too critical to break
 		var/area/current_area = get_area(C)
-		if((current_area.type in skipped_areas_apc) || !is_station_level(C.z))
+		if(is_type_in_typecache(current_area, skipped_areas_apc) || !is_station_level(C.z))
 			continue
 		// if we are going to break this one
 		if(prob(APC_BREAK_PROBABILITY))

code/modules/events/apc_short.dm

@@ -27,9 +27,11 @@
 	return TRUE
 
 /proc/power_failure(announce=TRUE)
-	var/list/skipped_areas_apc = list(
-		/area/engine/engineering,
-		/area/turret_protected/ai)
+	var/static/list/skipped_areas_apc = typecacheof(list(
+		/area/engineering/engine,
+		/area/engineering/supermatter,
+		/area/turret_protected/ai,
+	))
 
 	if(announce)
 		GLOB.event_announcement.Announce("Зафиксирована перегрузка энергосети станции [station_name()]. Инженерному отделу надлежит проверить все замкнувшие ЛКП.", "ВНИМАНИЕ: СБОЙ СИСТЕМЫ ПИТАНИЯ.", new_sound = 'sound/AI/attention.ogg')
@@ -40,7 +42,7 @@
 		var/obj/machinery/power/apc/C = thing
 		// skip any APCs that are too critical to disable
 		var/area/current_area = get_area(C)
-		if((current_area.type in skipped_areas_apc) || !is_station_level(C.z))
+		if(is_type_in_typecache(current_area, skipped_areas_apc) || !is_station_level(C.z))
 			continue
 		// if we are going to break this one
 		if(prob(APC_BREAK_PROBABILITY))

code/modules/events/event_procs.dm

@@ -25,7 +25,7 @@
 		var/list/safe_areas = typecacheof(list(
 			/area/turret_protected/ai,
 			/area/turret_protected/ai_upload,
-			/area/engine,
+			/area/engineering,
 			/area/holodeck,
 			/area/shuttle,
 			/area/maintenance,
@@ -36,11 +36,11 @@
 
 		//These are needed because /area/station/engineering has to be removed from the list, but we still want these areas to get fucked up.
 		var/list/allowed_areas = list(
-			/area/engine/break_room,
-			/area/engine/equipmentstorage,
-			/area/engine/chiefs_office,
-			/area/engine/controlroom,
-			/area/engine/mechanic_workshop
+			/area/engineering/break_room,
+			/area/engineering/equipmentstorage,
+			/area/engineering/chiefs_office,
+			/area/engineering/controlroom,
+			/area/engineering/mechanic_workshop
 		)
 
 		var/list/remove_these_areas = safe_areas - allowed_areas

code/modules/power/singularity/investigate.dm

@@ -1,4 +1,4 @@
-/area/engine/engineering/poweralert(state, obj/source)
+/area/engineering/engine/poweralert(state, obj/source)
 	if(state != poweralm)
 		source.investigate_log("has a power alarm!", INVESTIGATE_ENGINE)
 	..()