Skip to content

Commit

Permalink
Brig Area Update/Refactor (#5723)
Browse files Browse the repository at this point in the history
# About the pull request

Updates Brig Areas to be more concise with new design

Also alters dropship hijack crash 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

People in X area of brig, hiding/dead/dying etc. are much easier to
find. Also Mapper OCD

Dropship doors landing in space = bad

# 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: LTNTS
add: brig areas: warden office, MP bunks, starboard hallway,
interrogation room, evidence storage
spellcheck: changes brig surgery to brig medical
code: removed some brig areas from hijack, added other brig areas
/:cl:
  • Loading branch information
ItsVyzo committed Feb 27, 2024
1 parent 484b755 commit 6533f9c
Show file tree
Hide file tree
Showing 3 changed files with 28,209 additions and 28,085 deletions.
22 changes: 18 additions & 4 deletions code/game/area/almayer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -241,17 +241,23 @@
/area/almayer/shipboard/brig/armory
name = "\improper Brig Armory"

/area/almayer/shipboard/brig/main_office
name = "\improper Brig Main Office"
/area/almayer/shipboard/brig/mp_bunks
name = "\improper Brig MP Bunks"

/area/almayer/shipboard/brig/starboard_hallway
name = "\improper Brig Starboard Hallway"

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

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

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

/area/almayer/shipboard/brig/interrogation
name = "\improper Brig Interrogation Room"

/area/almayer/shipboard/brig/general_equipment
name = "\improper Brig General Equipment"
Expand All @@ -262,11 +268,15 @@
/area/almayer/shipboard/brig/execution
name = "\improper Brig Execution Room"

/area/almayer/shipboard/brig/execution_storage
name = "\improper Brig Execution Storage"

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

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

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

Expand All @@ -278,6 +288,10 @@
name = "\improper Brig Chief MP Office"
icon_state = "chiefmpoffice"

/area/almayer/shipboard/brig/warden_office
name = "\improper Brig Warden Office"
icon_state = "chiefmpoffice"

/area/almayer/shipboard/sea_office
name = "\improper Lower Deck Senior Enlisted Advisor Office"
icon_state = "chiefmpoffice"
Expand Down
7 changes: 4 additions & 3 deletions code/modules/shuttle/dropship_hijack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -176,13 +176,14 @@
turfs += get_area_turfs(/area/almayer/shipboard/brig/cic_hallway)
turfs += get_area_turfs(/area/almayer/shipboard/brig/cryo)
turfs += get_area_turfs(/area/almayer/shipboard/brig/evidence_storage)
turfs += get_area_turfs(/area/almayer/shipboard/brig/execution)
turfs += get_area_turfs(/area/almayer/shipboard/brig/general_equipment)
turfs += get_area_turfs(/area/almayer/shipboard/brig/lobby)
turfs += get_area_turfs(/area/almayer/shipboard/brig/main_office)
turfs += get_area_turfs(/area/almayer/shipboard/brig/starboard_hallway)
turfs += get_area_turfs(/area/almayer/shipboard/brig/perma)
turfs += get_area_turfs(/area/almayer/shipboard/brig/processing)
turfs += get_area_turfs(/area/almayer/shipboard/brig/surgery)
turfs += get_area_turfs(/area/almayer/shipboard/brig/medical)
turfs += get_area_turfs(/area/almayer/shipboard/brig/mp_bunks)
turfs += get_area_turfs(/area/almayer/shipboard/brig/chief_mp_office)
turfs += get_area_turfs(/area/almayer/command/cichallway)
turfs += get_area_turfs(/area/almayer/command/cic)
if("Upper deck Midship")
Expand Down
Loading

0 comments on commit 6533f9c

Please sign in to comment.