Skip to content

Commit

Permalink
Areas almayer qol (#5254)
Browse files Browse the repository at this point in the history 
# About the pull request
added some more areas to almayer
reworked lower engi areas position giving them parent for being lower
etc...
remove an extra light

<!-- 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
More areas allow to make it easier to navigate the ship and make the
localisation system more efficient...
better parent avoid repeating lines of code and make it easier to
maintain/change it in the future.
# 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: removed an extra light in bravo cryo room(to do just saw it)
maptweak: added more areas (stern_point_defense, Lower Deck Stern Hull,
Upper Deck port Hallway Upper Deck starboard Hallway)
/:cl:

---------

Co-authored-by: Julien <[email protected]>
  • Loading branch information
@Huffie56
Huffie56 and Julien authored Dec 24, 2023
1 parent 88b034f commit 60a087b
Show file tree
Hide file tree
Showing 4 changed files with 1,439 additions and 1,040 deletions.
8 changes: 4 additions & 4 deletions code/controllers/subsystem/hijack.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
149 changes: 78 additions & 71 deletions code/game/area/almayer.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,40 @@
icon_state = "selfdestruct"
fake_zlevel = 1 // upperdeck

// engineering

/area/almayer/engineering
minimap_color = MINIMAP_AREA_ENGI

// lower deck

/area/almayer/engineering/lower
name = "\improper Lower Deck Engineering"
icon_state = "lowerengineering"
fake_zlevel = 2 // lowerdeck

/area/almayer/engineering/lower/engine_monitoring//this is not used so could be remove?
name = "\improper Lower Deck Engine Reactor Monitoring"
icon_state = "lowermonitoring"

/area/almayer/engineering/lower/workshop
name = "\improper Lower Deck Engineering Workshop"
icon_state = "workshop"

/area/almayer/engineering/lower/workshop/hangar
name = "\improper Ordnance workshop"

/area/almayer/engineering/lower/engine_core
name = "\improper Engine Reactor Core Room"
icon_state = "coreroom"
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
name = "\improper Upper Deck Engineering"
icon_state = "upperengineering"
Expand All @@ -151,34 +182,6 @@
icon_state = "ceroom"
fake_zlevel = 1 // upperdeck

/area/almayer/engineering/lower_engine_monitoring
name = "\improper Lower Deck Engine Reactor Monitoring"
icon_state = "lowermonitoring"
fake_zlevel = 2 // lowerdeck

/area/almayer/engineering/lower_engineering
name = "\improper Lower Deck Engineering"
icon_state = "lowerengineering"
fake_zlevel = 2 // lowerdeck

/area/almayer/engineering/engineering_workshop
name = "\improper Lower Deck Engineering Workshop"
icon_state = "workshop"
fake_zlevel = 2 // lowerdeck

/area/almayer/engineering/engineering_workshop/hangar
name = "\improper Ordnance workshop"

/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

/area/almayer/engineering/starboard_atmos
name = "\improper Upper Deck Starboard Atmospherics"
icon_state = "starboardatmos"
Expand Down Expand Up @@ -238,58 +241,52 @@
icon_state = "portpd"
fake_zlevel = 2 // lowerdeck

/area/almayer/shipboard/stern_point_defense
name = "\improper Lower Deck Stern Point Defense"
icon_state = "portpd"
fake_zlevel = 2 // lowerdeck

// brig

/area/almayer/shipboard/brig
name = "\improper Brig"
icon_state = "brig"
fake_zlevel = 1 //upperdeck

/area/almayer/shipboard/brig/lobby
name = "\improper Brig Lobby"
icon_state = "brig"

/area/almayer/shipboard/brig/armory
name = "\improper Brig Armory"
icon_state = "brig"

/area/almayer/shipboard/brig/main_office
name = "\improper Brig Main Office"
icon_state = "brig"

/area/almayer/shipboard/brig/perma
name = "\improper Brig Perma Cells"
icon_state = "brig"

/area/almayer/shipboard/brig/cryo
name = "\improper Brig Cryo Pods"
icon_state = "brig"

/area/almayer/shipboard/brig/surgery
name = "\improper Brig Surgery"
icon_state = "brig"

/area/almayer/shipboard/brig/general_equipment
name = "\improper Brig General Equipment"
icon_state = "brig"

/area/almayer/shipboard/brig/evidence_storage
name = "\improper Brig Evidence Storage"
icon_state = "brig"

/area/almayer/shipboard/brig/execution
name = "\improper Brig Execution Room"
icon_state = "brig"

/area/almayer/shipboard/brig/cic_hallway
name = "\improper Brig CiC Hallway"
icon_state = "brig"

/area/almayer/shipboard/brig/dress
name = "\improper CIC Dress Uniform Room"
icon_state = "brig"

/area/almayer/shipboard/brig/processing
name = "\improper Brig Processing and Holding"
icon_state = "brig"

/area/almayer/shipboard/brig/cells
name = "\improper Brig Cells"
Expand Down Expand Up @@ -393,6 +390,19 @@
icon_state = "starboard"
fake_zlevel = 2 // lowerdeck

//new hallways areas

/area/almayer/hallways/upper
fake_zlevel = 1 // upperdeck

/area/almayer/hallways/upper/port
name = "\improper Upper Deck Port Hallway"
icon_state = "port"

/area/almayer/hallways/upper/starboard
name = "\improper Upper Deck Starboard Hallway"
icon_state = "starboard"

/area/almayer/stair_clone
name = "\improper Lower Deck Stairs"
icon_state = "stairs_lowerdeck"
Expand All @@ -404,63 +414,60 @@
icon_state = "stairs_upperdeck"
fake_zlevel = 1 // upperdeck

// hull areas.

// lower deck hull areas

/area/almayer/hull/lower_hull
name = "\improper Lower Deck Hull"
icon_state = "lowerhull"
fake_zlevel = 2 // lowerdeck

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

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

/area/almayer/hull/lower_hull/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/hull/lower_hull/l_f_p
name = "\improper Lower Deck Port-Fore Hull"

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

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

// upper deck hull areas

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

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

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

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

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

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

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

/area/almayer/hull/lower_hull/l_f_s
name = "\improper Lower Deck Starboard-Fore Hull"
icon_state = "upperhull"

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

/area/almayer/hull/lower_hull/l_a_s
name = "\improper Lower Deck Starboard Hull"
icon_state = "upperhull"

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

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

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

/area/almayer/living/cryo_cells
name = "\improper Lower Deck Cryo Cells"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/shuttle/dropship_hijack.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,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)
Expand Down
Loading

0 comments on commit 60a087b

Please sign in to comment.