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

fix and small refactor of Areas in lower deck on almayer part2 #5373

Merged
merged 12 commits into from
Jan 25, 2024
Merged

fix and small refactor of Areas in lower deck on almayer part2 #5373

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bdce829
make maintenance area a parent to hull.
Jan 3, 2024
dddb510
reduce staroard lenght before placing.
Jan 3, 2024
de36b09
change some stuff around
Jan 3, 2024
7be4dcd
fixe some name being wrong.
Jan 3, 2024
019bad2
added some missing apc to all areas that missed one.
Jan 3, 2024
0b52eb4
Update code/game/area/almayer.dm
Huffie56 Jan 4, 2024
826087f
fix some stuff drathek pointed out
Jan 4, 2024
eccb3a1
add the cryo cells area because it's isolated.
Jan 4, 2024
cef41a2
added new cryo maintenance to almayer and an apc for it.
Jan 4, 2024
872f3a1
Merge remote-tracking branch 'upstream/master' into area_change_part2
Jan 19, 2024
1db4bf9
Update code/game/area/almayer.dm
Huffie56 Jan 22, 2024
0332aee
Merge remote-tracking branch 'upstream/master' into area_change_part2
Jan 23, 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
67 changes: 48 additions & 19 deletions code/game/area/almayer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
//ALMAYER AREAS--------------------------------------//
// Fore = West | Aft = East //
// Port = South | Starboard = North //
// Bow = Western|Stern = Eastern //(those are the front and back small sections)
/area/almayer
icon = 'icons/turf/area_almayer.dmi'
//ambience = list('sound/ambience/shipambience.ogg')
// ambience = list('sound/ambience/shipambience.ogg')
icon_state = "almayer"
ceiling = CEILING_METAL
powernet_name = "almayer"
sound_environment = SOUND_ENVIRONMENT_ROOM
soundscape_interval = 30
//soundscape_playlist = list('sound/effects/xylophone1.ogg', 'sound/effects/xylophone2.ogg', 'sound/effects/xylophone3.ogg')
// soundscape_playlist = list('sound/effects/xylophone1.ogg', 'sound/effects/xylophone2.ogg', 'sound/effects/xylophone3.ogg')
ambience_exterior = AMBIENCE_ALMAYER
ceiling_muffle = FALSE

Expand Down Expand Up @@ -414,59 +415,87 @@
icon_state = "stairs_upperdeck"
fake_zlevel = 1 // upperdeck

// hull areas.
// maintenance areas

/area/almayer/maint

//lower maintenance areas

/area/almayer/maint/lower
name = "\improper Lower Deck Maintenance"
icon_state = "lowerhull"//tempory until i get a proper one.
fake_zlevel = 2 // lowerdeck

/area/almayer/maint/lower/constr
name = "\improper Lower Deck Constr Site"
Huffie56 marked this conversation as resolved.
Show resolved Hide resolved

/area/almayer/maint/lower/s_bow
name = "\improper Lower Deck Starboard-Bow Maintenance"

/area/almayer/maint/lower/cryo_cells
name = "\improper Lower Deck Cryo Cells Maintenance"

// hull areas

/area/almayer/maint/hull

// lower deck hull areas

/area/almayer/hull/lower_hull
/area/almayer/maint/hull/lower
Huffie56 marked this conversation as resolved.
Show resolved Hide resolved
name = "\improper Lower Deck Hull"
icon_state = "lowerhull"
fake_zlevel = 2 // lowerdeck

/area/almayer/hull/lower_hull/stern
/area/almayer/maint/hull/lower/stern
name = "\improper Lower Deck Stern Hull"

/area/almayer/hull/lower_hull/l_f_s
/area/almayer/maint/hull/lower/p_bow
name = "\improper Lower Deck Port-Bow Hull"

/area/almayer/maint/hull/lower/s_bow
name = "\improper Lower Deck Starboard-Bow Hull"

/area/almayer/maint/hull/lower/l_f_s
name = "\improper Lower Deck Starboard-Fore Hull"

/area/almayer/hull/lower_hull/l_m_s
/area/almayer/maint/hull/lower/l_m_s
name = "\improper Lower Deck Starboard-Midship Hull"

/area/almayer/hull/lower_hull/l_a_s
name = "\improper Lower Deck Starboard Hull"
/area/almayer/maint/hull/lower/l_a_s
name = "\improper Lower Deck Starboard-Aft Hull"

/area/almayer/hull/lower_hull/l_f_p
/area/almayer/maint/hull/lower/l_f_p
name = "\improper Lower Deck Port-Fore Hull"

/area/almayer/hull/lower_hull/l_m_p
/area/almayer/maint/hull/lower/l_m_p
name = "\improper Lower Deck Port-Midship Hull"

/area/almayer/hull/lower_hull/l_a_p
/area/almayer/maint/hull/lower/l_a_p
name = "\improper Lower Deck Port-Aft Hull"

// upper deck hull areas

/area/almayer/hull/upper_hull
/area/almayer/maint/hull/upper
name = "\improper Upper Deck Hull"
icon_state = "upperhull"
fake_zlevel = 1 // upperdeck

/area/almayer/hull/upper_hull/u_f_s
/area/almayer/maint/hull/upper/u_f_s
name = "\improper Upper Deck Fore-Starboard Hull"

/area/almayer/hull/upper_hull/u_m_s
/area/almayer/maint/hull/upper/u_m_s
name = "\improper Upper Deck Starboard-Midship Hull"

/area/almayer/hull/upper_hull/u_a_s
/area/almayer/maint/hull/upper/u_a_s
name = "\improper Upper Deck Starboard-Aft Hull"

/area/almayer/hull/upper_hull/u_f_p
/area/almayer/maint/hull/upper/u_f_p
name = "\improper Upper Deck Port-Fore Hull"

/area/almayer/hull/upper_hull/u_m_p
/area/almayer/maint/hull/upper/u_m_p
name = "\improper Upper Deck Port-Midship Hull"

/area/almayer/hull/upper_hull/u_a_p
/area/almayer/maint/hull/upper/u_a_p
name = "\improper Upper Deck Port-Aft Hull"

/area/almayer/living/cryo_cells
Expand Down
Loading