cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-24 21:57:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-12681

Browse Source
This commit is contained in:
Razgriz
2022-04-10 13:31:34 -07:00
committed by GitHub
parent 12243e2fa5 67f194f44a
commit 2fa245fe7a
71 changed files with 1387 additions and 63481 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maps/groundbase/groundbase_areas.dm
+11
View File
@@ -365,6 +365,17 @@
/area/groundbase/civilian/gameroom
name = "Gamatorium"
sound_env = SMALL_SOFTFLOOR
<<<<<<< HEAD
=======
/area/groundbase/civilian/mensrestroom
name = "Men's Restroom"
sound_env = SOUND_ENVIRONMENT_BATHROOM
lightswitch = 1
/area/groundbase/civilian/womensrestroom
name = "Women's Restroom"
sound_env = SOUND_ENVIRONMENT_BATHROOM
lightswitch = 1
>>>>>>> d8515387bc... Merge pull request #12695 from Very-Soft/gbtweaks
/area/groundbase/exploration
name = "Exploration"