clean up the files change

cmss13-devs · Dec 19, 2023 · 081f6e4 · 081f6e4
1 parent 117788c
commit 081f6e4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 23 deletions.
diff --git a/code/controllers/subsystem/hijack.dm b/code/controllers/subsystem/hijack.dm
@@ -325,22 +325,22 @@ SUBSYSTEM_DEF(hijack)
 
 /datum/controller/subsystem/hijack/proc/heat_engine_room()
 	engine_room_heated = TRUE
-	var/area/engine_room = GLOB.areas_by_type[/area/almayer/engineering/engine_core]
+	var/area/engine_room = GLOB.areas_by_type[/area/almayer/engineering/lower/engine_core]
 	engine_room.firealert()
 	engine_room.temperature = T90C
 	for(var/mob/current_mob as anything in GLOB.mob_list)
 		var/area/mob_area = get_area(current_mob)
-		if(istype(mob_area, /area/almayer/engineering/engine_core))
+		if(istype(mob_area, /area/almayer/engineering/lower/engine_core))
 			to_chat(current_mob, SPAN_BOLDWARNING("You feel the heat of the room increase as the fusion engines whirr louder."))
 
 /datum/controller/subsystem/hijack/proc/superheat_engine_room()
 	engine_room_superheated = TRUE
-	var/area/engine_room = GLOB.areas_by_type[/area/almayer/engineering/engine_core]
+	var/area/engine_room = GLOB.areas_by_type[/area/almayer/engineering/lower/engine_core]
 	engine_room.firealert()
 	engine_room.temperature = T120C //slowly deals burn at this temp
 	for(var/mob/current_mob as anything in GLOB.mob_list)
 		var/area/mob_area = get_area(current_mob)
-		if(istype(mob_area, /area/almayer/engineering/engine_core))
+		if(istype(mob_area, /area/almayer/engineering/lower/engine_core))
 			to_chat(current_mob, SPAN_BOLDWARNING("The room feels incredibly hot, you can't take much more of this!"))
 
 /datum/controller/subsystem/hijack/proc/announce_sd_halfway()

diff --git a/code/game/area/almayer.dm b/code/game/area/almayer.dm
@@ -149,17 +149,9 @@
 	name = "\improper Lower Deck Engineering Workshop"
 	icon_state = "workshop"
 
-/area/almayer/engineering/engineering_workshop
-	name = "\improper Lower Deck Engineering Workshop"
-	icon_state = "workshop"
-	fake_zlevel = 2 // lowerdeck
-
 /area/almayer/engineering/lower/workshop/hangar
 	name = "\improper Ordnance workshop"
 
-/area/almayer/engineering/engineering_workshop/hangar
-	name = "\improper Ordnance workshop"
-
 /area/almayer/engineering/lower/engine_core
 	name = "\improper Engine Reactor Core Room"
 	icon_state = "coreroom"
@@ -169,16 +161,6 @@
 	hijack_evacuation_weight = 0.2
 	hijack_evacuation_type = EVACUATION_TYPE_ADDITIVE
 
-/area/almayer/engineering/engine_core
-	name = "\improper Engine Reactor Core Room"
-	icon_state = "coreroom"
-	fake_zlevel = 2 // lowerdeck
-	soundscape_playlist = SCAPE_PL_ENG
-	soundscape_interval = 15
-	hijack_evacuation_area = TRUE
-	hijack_evacuation_weight = 0.2
-	hijack_evacuation_type = EVACUATION_TYPE_ADDITIVE
-
 // upper deck
 
 /area/almayer/engineering/upper_engineering

diff --git a/code/modules/shuttle/dropship_hijack.dm b/code/modules/shuttle/dropship_hijack.dm
@@ -210,7 +210,7 @@
 			turfs += get_area_turfs(/area/almayer/squads/req)
 		if("Lower deck Aftship")
 			turfs += get_area_turfs(/area/almayer/living/cryo_cells)
-			turfs += get_area_turfs(/area/almayer/engineering/engineering_workshop)
+			turfs += get_area_turfs(/area/almayer/engineering/lower/workshop)
 		else
 			CRASH("Crash site [ship_section] unknown.")
 	return pick(turfs)