Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Seperating every port and starboard hallway areas into three areas each (fore midship aft) #5699

Merged
merged 10 commits into from
Feb 22, 2024
Merged

Seperating every port and starboard hallway areas into three areas each (fore midship aft) #5699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1909f86
regroup living area together.
Feb 11, 2024
71bb67d
changing vehiclehangar area.
Feb 11, 2024
2560bc7
removed a bunch on non used area in almayer.dm
Feb 11, 2024
6efbe2d
add new halways for lower deck and reorganize stuff.
Feb 11, 2024
b79aa54
added six new hallway area to replace the two in lower deck.
Feb 11, 2024
6ba5d62
delete the two old area that handled lower halways...
Feb 11, 2024
9f66f76
finishing up refactor for lower halway.
Feb 11, 2024
79784d9
Merge remote-tracking branch 'upstream/master' into almayer.dm
Feb 19, 2024
abcd70b
random area and fix naming
Feb 20, 2024
29e060e
small fix in names.
Feb 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
144 changes: 54 additions & 90 deletions code/game/area/almayer.dm
View file
Open in desktop
Huffie56 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions code/modules/shuttle/dropship_hijack.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/shuttle/shuttles/ert.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
Loading
Loading