Skip to content

Commit

Permalink
fix and small refactor of Areas in lower deck on almayer part2 (#5373)
Browse files Browse the repository at this point in the history
# About the pull request
properly made some comment to doc standard with ///
create a new area type /area/almayer/mnt
it will be a parent to hull area.
changed hull/lower_hull to hull/lower (same for upper)
added two maintenance areas /area/almayer/mnt/lower/constr and
/area/almayer/mnt/lower/s_bow
added a bunch of missing apc because of all the recent change in hull
areas...
map tweak hull areas where a lot to bright so i moved a bunch of light
(hope it doesn't break the freeze....)

<!-- 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-making hull area match well separated area will help a lot people to
use the system to locate dead people etc....
2-making hulls areas darker will add a more fitting vibe to it.
3-seperate hull and maint area is in preparation to the future also
allow to know hull area area with access to exterior hull
and know maint aren't 
4-adding more apc will allow them have area being unpowered...
# 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:
fix: corrected the name of an area from "Lower Deck Starboard Hull" to
"Lower Deck Starboard-Aft Hull".
fix: added apc's to area that where missing one.
maptweak: added some areas to almayers (constr site, Starboard-Bow
Maintenance, Bow Hull(port and starboard),cryo maintenance.
/:cl:

---------

Co-authored-by: Julien <[email protected]>
Co-authored-by: Drathek <[email protected]>
Co-authored-by: Nanu308 <[email protected]>
  • Loading branch information
4 people committed Jan 25, 2024
1 parent a56a633 commit 86d6ca6
Show file tree
Hide file tree
Showing 2 changed files with 15,692 additions and 15,458 deletions.
67 changes: 48 additions & 19 deletions code/game/area/almayer.dm
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 Construction Site"

/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
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

0 comments on commit 86d6ca6

Please sign in to comment.