Skip to content

Commit

Permalink
Merge pull request #338 from Michab02/Security-Rework
Browse files Browse the repository at this point in the history
Security Rework + Map edits
  • Loading branch information
Very-Soft authored May 26, 2024
2 parents 63986cc + 176a5fc commit cbf6883
Show file tree
Hide file tree
Showing 5 changed files with 4,672 additions and 3,368 deletions.
15 changes: 9 additions & 6 deletions maps/groundbase/groundbase_areas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -213,12 +213,6 @@
lightswitch = 1
/area/groundbase/security/processing
name = "Security Processing"
/area/groundbase/security/halls
name = "Security South Hallway"
lightswitch = 1
/area/groundbase/security/halle
name = "Security East Hallway"
lightswitch = 1
/area/groundbase/security/hall2
name = "Security Second Floor Hallway"
lightswitch = 1
Expand All @@ -242,10 +236,18 @@
name = "Internal Affairs East Office"
/area/groundbase/security/detective
name = "Detective's Office"
/area/groundbase/security/showers
name = "Security Showers"
/area/groundbase/security/breakroom
name = "Security Break Room"
lightswitch = 1
/area/groundbase/security/hos
name = "Head of Security's Office"
/area/prison/cell_block/gb
name = "Brig"
/area/prison/cell_block/gb/abandonedbrig
name = "Derelict GenPop"
lightswitch = 0

/area/groundbase/medical
name = "Medical"
Expand Down Expand Up @@ -628,4 +630,5 @@
excluded |= /area/groundbase/hotspring/water
excluded |= /area/groundbase/medical/geneticslab
excluded |= /area/groundbase/engineering/pumpingstation
excluded |= /area/prison/cell_block/gb/abandonedbrig
..()
3 changes: 2 additions & 1 deletion maps/groundbase/groundbase_defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,8 @@
/area/groundbase/hotspring,
/area/groundbase/hotspring/water,
/area/groundbase/medical/geneticslab,
/area/groundbase/engineering/pumpingstation
/area/groundbase/engineering/pumpingstation,
/area/prison/cell_block/gb/abandonedbrig
)

unit_test_exempt_from_atmos = list()
Expand Down
Loading

0 comments on commit cbf6883

Please sign in to comment.