shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update flags.dm

Browse Source
This commit is contained in:
LetterJay
2018-05-13 10:17:28 -05:00
committed by GitHub
parent f373b2c9e6
commit e1fef511cf
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/flags.dm
-9
View File
@@ -54,15 +54,6 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
// TESLA_IGNORE grants immunity from being targeted by tesla-style electricity
#define TESLA_IGNORE_2 (1<<9)
<<<<<<< HEAD
// Stops you from putting things like an RCD or other items into an ORM or protolathe for materials.
#define NO_MAT_REDEMPTION_2 (1<<10)
// LAVA_PROTECT used on the flags_2 variable for both SUIT and HEAD items, and stops lava damage. Must be present in both to stop lava damage.
#define LAVA_PROTECT_2 (1<<11)
=======
>>>>>>> ccf8fc5... Kills off three more flags from flags_2 (#37529)
//turf-only flags
#define NOJAUNT_1 (1<<0)
#define UNUSED_TRANSIT_TURF_1 (1<<1)