cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-12-12 05:12:47 -05:00
committed by GitHub
parent c2969a05c0
commit c0f080cd3a
1 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
maps/stellardelight/stellar_delight_defines.dm
View File

@@ -4,20 +4,6 @@
#define Z_LEVEL_SHIP_HIGH 3
#define Z_LEVEL_CENTCOM 4
#define Z_LEVEL_MISC 5
<<<<<<< HEAD
<<<<<<< HEAD
#define Z_LEVEL_BEACH 6
#define Z_LEVEL_BEACH_CAVE 7
#define Z_LEVEL_AEROSTAT 8
#define Z_LEVEL_AEROSTAT_SURFACE 9
#define Z_LEVEL_DEBRISFIELD 10
#define Z_LEVEL_FUELDEPOT 11
#define Z_LEVEL_OVERMAP 12
#define Z_LEVEL_OFFMAP1 13
#define Z_LEVEL_GATEWAY 14
=======
=======
>>>>>>> b8bd9f130c... Merge pull request #11834 from Very-Soft/QOLwow
#define Z_LEVEL_SPACE_ROCKS 6
#define Z_LEVEL_BEACH 7
#define Z_LEVEL_BEACH_CAVE 8
@@ -28,11 +14,7 @@
#define Z_LEVEL_OVERMAP 13
#define Z_LEVEL_OFFMAP1 14
#define Z_LEVEL_GATEWAY 15
<<<<<<< HEAD
#define Z_LEVEL_OM_ADVENTURE 16
>>>>>>> 60011ecd0b... Merge pull request #11928 from Very-Soft/whalesandcrystals
=======
>>>>>>> b8bd9f130c... Merge pull request #11834 from Very-Soft/QOLwow
//Camera networks
#define NETWORK_HALLS "Halls"