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

Brig Area Update/Refactor #5723

Merged
merged 12 commits into from
Feb 27, 2024
Merged

Brig Area Update/Refactor #5723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
754064e
brig area update
ItsVyzo Feb 14, 2024
9c56847
ssss
ItsVyzo Feb 14, 2024
46e2d39
lintersss
ItsVyzo Feb 14, 2024
0e79826
uh linters?
ItsVyzo Feb 14, 2024
c165a59
raaaa
ItsVyzo Feb 14, 2024
cce2d2c
kgjhskgj
ItsVyzo Feb 14, 2024
50f7537
apcs added
ItsVyzo Feb 20, 2024
36a7ad5
Merge remote-tracking branch 'cmss13-devs/master' into brigareaupdate
ItsVyzo Feb 24, 2024
ae8f046
Merge branch 'master' into brigareaupdate
ItsVyzo Feb 24, 2024
0a64b13
semiotics
ItsVyzo Feb 25, 2024
53bdf3d
Merge branch 'brigareaupdate' of https://github.com/ItsVyzo/cmss13 in…
ItsVyzo Feb 25, 2024
9c0c7a2
Merge remote-tracking branch 'cmss13-devs/master' into brigareaupdate
ItsVyzo Feb 26, 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
22 changes: 18 additions & 4 deletions code/game/area/almayer.dm
View file
Open in desktop
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
View file
Open in desktop
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
Loading