Seperating every port and starboard hallway areas into three areas ea…

…ch (fore midship aft) (#5699)

# About the pull request
1-Main idea is to split each Hallway area port and starboard into three
areas.(fore midship aft)
2-Clean up the map to remove emergency shutter that are not acting as a
frontier between areas.
3-removed unused areas.
4-rebuild structure of hallway area to have /lower and /upper areas.

<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game
1-Mainly good to allow better use of health monitor.
2-trying to standardize how emergency shutter are placed on the almayer
3-4 are refactor with no impact on player.
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
maptweak: split each Hallway area port and starboard into three
areas.(fore midship aft)
maptweak: change the area around north and south west staircase to
remove emergency shutters.
maptweak: change the area west of squad preparation room to remove
emergency shutter.
maptweak: change the area west of lower engi to make emergency shutter
be at the frontier of the area.
/:cl:

---------

Co-authored-by: Julien <[email protected]>

code/game/area/almayer.dm

@@ -2,6 +2,7 @@
 // Fore = West  | Aft = East //
 // Port = South | Starboard = North //
 // Bow = Western|Stern = Eastern //(those are the front and back small sections)
+// Naming convention is to start by port or starboard then put eitheir (bow,fore,midship,aft,stern)
 /area/almayer
 	icon = 'icons/turf/area_almayer.dmi'
 	// ambience = list('sound/ambience/shipambience.ogg')
@@ -29,26 +30,6 @@
 	if(hijack_evacuation_area)
 		SShijack.progress_areas[src] = power_equip
 
-/area/shuttle/almayer/elevator_maintenance/upperdeck
-	name = "\improper Upper Deck Maintenance Elevator"
-	icon_state = "shuttle"
-	fake_zlevel = 1
-
-/area/shuttle/almayer/elevator_maintenance/lowerdeck
-	name = "\improper Lower Deck Maintenance Elevator"
-	icon_state = "shuttle"
-	fake_zlevel = 2
-
-/area/shuttle/almayer/elevator_hangar/lowerdeck
-	name = "\improper Hangar Elevator"
-	icon_state = "shuttle"
-	fake_zlevel = 2 // lowerdeck
-
-/area/shuttle/almayer/elevator_hangar/underdeck
-	name = "\improper Hangar Elevator"
-	icon_state = "shuttle"
-	fake_zlevel = 3
-
 /obj/structure/machinery/computer/shuttle_control/almayer/hangar
 	name = "Elevator Console"
 	icon = 'icons/obj/structures/machinery/computer.dmi'
@@ -312,90 +293,69 @@
 	icon_state = "firingrange"
 	fake_zlevel = 2 // lowerdeck
 
-/area/almayer/shipboard/sensors
-	name = "\improper Sensor Room"
-	icon_state = "sensor"
-
 /area/almayer/hallways/hangar
 	name = "\improper Hangar"
 	icon_state = "hangar"
 	fake_zlevel = 2 // lowerdeck
 	soundscape_playlist = SCAPE_PL_HANGAR
 	soundscape_interval = 50
 
-/area/almayer/hallways/vehiclehangar
-	name = "\improper Lower Deck Vehicle Storage"
-	icon_state = "exoarmor"
-	fake_zlevel = 2
-
-/area/almayer/living
-	minimap_color = MINIMAP_AREA_COLONY
-
-/area/almayer/living/tankerbunks
-	name = "\improper Lower Deck Vehicle Crew Bunks"
-	icon_state = "livingspace"
-	fake_zlevel = 2
-
-/area/almayer/living/auxiliary_officer_office
-	name = "\improper Lower Deck Auxiliary Support Officer office"
-	icon_state = "livingspace"
-	fake_zlevel = 2
-
-/area/almayer/squads/tankdeliveries
-	name = "\improper Lower Deck Vehicle ASRS"
-	icon_state = "req"
-	fake_zlevel = 2
+/area/almayer/hallways/lower
+	fake_zlevel = 2 // lowerdeck
 
-/area/almayer/hallways/exoarmor
-	name = "\improper Lower Deck Vehicle Armor Storage"
+/area/almayer/hallways/lower/vehiclehangar
+	name = "\improper Lower Deck Vehicle Storage"
 	icon_state = "exoarmor"
-	fake_zlevel = 2 // lowerdeck
 
-/area/almayer/hallways/repair_bay
+/area/almayer/hallways/lower/repair_bay
 	name = "\improper Lower Deck Deployment Workshop"
 	icon_state = "dropshiprepair"
-	fake_zlevel = 2 // lowerdeck
 
-/area/almayer/hallways/mission_planner
-	name = "\improper Lower Deck Dropship Central Computer Room"
-	icon_state = "missionplanner"
-	fake_zlevel = 2 // lowerdeck
-
-/area/almayer/hallways/starboard_umbilical
+/area/almayer/hallways/lower/starboard_umbilical
 	name = "\improper Lower Deck Starboard Umbilical Hallway"
 	icon_state = "starboardumbilical"
-	fake_zlevel = 2 // lowerdeck
 
-/area/almayer/hallways/port_umbilical
+/area/almayer/hallways/lower/port_umbilical
 	name = "\improper Lower Deck Port Umbilical Hallway"
 	icon_state = "portumbilical"
-	fake_zlevel = 2 // lowerdeck
 
-/area/almayer/hallways/aft_hallway
-	name = "\improper Upper Deck Aft Hallway"
-	icon_state = "aft"
-	fake_zlevel = 1 // upperdeck
+//port
+/area/almayer/hallways/lower/port_fore_hallway
+	name = "\improper Lower Deck Port-Fore Hallway"
+	icon_state = "port"
 
-/area/almayer/hallways/stern_hallway
-	name = "\improper Upper Deck Stern Hallway"
-	icon_state = "stern"
-	fake_zlevel = 1 // upperdeck
+/area/almayer/hallways/lower/port_midship_hallway
+	name = "\improper Lower Deck Port-Midship Hallway"
+	icon_state = "port"
 
-/area/almayer/hallways/port_hallway
-	name = "\improper Lower Deck Port Hallway"
+/area/almayer/hallways/lower/port_aft_hallway
+	name = "\improper Lower Deck Port-Aft Hallway"
 	icon_state = "port"
-	fake_zlevel = 2 // lowerdeck
 
-/area/almayer/hallways/starboard_hallway
-	name = "\improper Lower Deck Starboard Hallway"
+//starboard
+/area/almayer/hallways/lower/starboard_fore_hallway
+	name = "\improper Lower Deck Starboard-Fore Hallway"
 	icon_state = "starboard"
-	fake_zlevel = 2 // lowerdeck
 
-//new hallways areas
+/area/almayer/hallways/lower/starboard_midship_hallway
+	name = "\improper Lower Deck Starboard-Midship Hallway"
+	icon_state = "starboard"
+
+/area/almayer/hallways/lower/starboard_aft_hallway
+	name = "\improper Lower Deck Starboard-Aft Hallway"
+	icon_state = "starboard"
 
 /area/almayer/hallways/upper
 	fake_zlevel = 1 // upperdeck
 
+/area/almayer/hallways/upper/aft_hallway
+	name = "\improper Upper Deck Aft Hallway"
+	icon_state = "aft"
+
+/area/almayer/hallways/upper/stern_hallway
+	name = "\improper Upper Deck Stern Hallway"
+	icon_state = "stern"
+
 /area/almayer/hallways/upper/port
 	name = "\improper Upper Deck Port Hallway"
 	icon_state = "port"
@@ -404,6 +364,7 @@
 	name = "\improper Upper Deck Starboard Hallway"
 	icon_state = "starboard"
 
+//area that are used for transition between decks.
 /area/almayer/stair_clone
 	name = "\improper Lower Deck Stairs"
 	icon_state = "stairs_lowerdeck"
@@ -514,7 +475,7 @@
 	name = "\improper Upper Deck Starboard-Stern Hull"
 
 /area/almayer/maint/hull/upper/u_f_s
-	name = "\improper Upper Deck Fore-Starboard Hull"
+	name = "\improper Upper Deck Starboard-Fore Hull"
 
 /area/almayer/maint/hull/upper/u_m_s
 	name = "\improper Upper Deck Starboard-Midship Hull"
@@ -531,6 +492,19 @@
 /area/almayer/maint/hull/upper/u_a_p
 	name = "\improper Upper Deck Port-Aft Hull"
 
+/area/almayer/living
+	minimap_color = MINIMAP_AREA_COLONY
+
+/area/almayer/living/tankerbunks
+	name = "\improper Lower Deck Vehicle Crew Bunks"
+	icon_state = "livingspace"
+	fake_zlevel = 2
+
+/area/almayer/living/auxiliary_officer_office
+	name = "\improper Lower Deck Auxiliary Support Officer office"
+	icon_state = "livingspace"
+	fake_zlevel = 2
+
 /area/almayer/living/cryo_cells
 	name = "\improper Lower Deck Cryo Cells"
 	icon_state = "cryo"
@@ -704,11 +678,6 @@
 	icon_state = "science"
 	fake_zlevel = 1 // upperdeck
 
-/area/almayer/medical/testlab
-	name = "\improper Medical Research workshop"
-	icon_state = "science"
-	fake_zlevel = 1 // upperdeck
-
 /area/almayer/medical/containment
 	name = "\improper Medical Research containment"
 	icon_state = "science"
@@ -808,27 +777,22 @@
 	hijack_evacuation_type = EVACUATION_TYPE_ADDITIVE
 
 /area/almayer/lifeboat_pumps/north1
-	name = "Starboard Fore Lifeboat Fuel Pump"
+	name = "Starboard-Fore Lifeboat Fuel Pump"
 
 /area/almayer/lifeboat_pumps/north2
-	name = "Starboard Aft Lifeboat Fuel Pump"
+	name = "Starboard-Aft Lifeboat Fuel Pump"
 
 /area/almayer/lifeboat_pumps/south1
-	name = "Port Fore Lifeboat Fuel Pump"
+	name = "Port-Fore Lifeboat Fuel Pump"
 
 /area/almayer/lifeboat_pumps/south2
-	name = "Port Aft Lifeboat Fuel Pump"
+	name = "Port-Aft Lifeboat Fuel Pump"
 
 /area/almayer/command/lifeboat
 	name = "\improper Lifeboat Docking Port"
 	icon_state = "selfdestruct"
 	fake_zlevel = 1 // upperdeck
 
-/area/almayer/ert_port
-	name = "\improper ERT Docking Port"
-	icon_state = "lifeboat"
-	flags_area = AREA_NOTUNNEL
-
 /area/space/almayer/lifeboat_dock
 	name = "\improper Port Lifeboat Docking"
 	icon_state = "lifeboat"

code/modules/shuttle/dropship_hijack.dm

@@ -191,14 +191,13 @@
 			turfs += get_area_turfs(/area/almayer/medical/containment)
 			turfs += get_area_turfs(/area/almayer/medical/containment/cell)
 			turfs += get_area_turfs(/area/almayer/medical/medical_science)
-			turfs += get_area_turfs(/area/almayer/medical/testlab)
 			turfs += get_area_turfs(/area/almayer/medical/hydroponics)
 		if("Upper deck Aftship")
 			turfs += get_area_turfs(/area/almayer/engineering/upper_engineering)
 			turfs += get_area_turfs(/area/almayer/engineering/laundry)
 		if("Lower deck Foreship")
 			turfs += get_area_turfs(/area/almayer/hallways/hangar)
-			turfs += get_area_turfs(/area/almayer/hallways/vehiclehangar)
+			turfs += get_area_turfs(/area/almayer/hallways/lower/vehiclehangar)
 		if("Lower deck Midship")
 			turfs += get_area_turfs(/area/almayer/medical/chemistry)
 			turfs += get_area_turfs(/area/almayer/medical/lower_medical_lobby)

code/modules/shuttle/shuttles/ert.dm

@@ -254,7 +254,7 @@
 	width  = 17
 	height = 29
 	airlock_id = "s_umbilical"
-	airlock_area = /area/almayer/hallways/port_umbilical
+	airlock_area = /area/almayer/hallways/lower/port_umbilical
 
 /obj/docking_port/stationary/emergency_response/external/hangar_starboard
 	name = "Almayer hanger starboard external airlock"
@@ -263,7 +263,7 @@
 	width  = 17
 	height = 29
 	airlock_id = "n_umbilical"
-	airlock_area = /area/almayer/hallways/starboard_umbilical
+	airlock_area = /area/almayer/hallways/lower/starboard_umbilical
 
 // These are docking ports not on the almayer
 /obj/docking_port/stationary/emergency_response/idle_port1