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

Update bitfields.dm

Browse Source
This commit is contained in:
LetterJay
2018-05-13 10:17:50 -05:00
committed by GitHub
parent 37f972dc6c
commit b90ca78092
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_globalvars/bitfields.dm
-7
View File
@@ -127,12 +127,6 @@ GLOBAL_LIST_INIT(bitfields, list(
"BANG_PROTECT_2" = BANG_PROTECT_2,
"HEALS_EARS_2" = HEALS_EARS_2,
"OMNITONGUE_2" = OMNITONGUE_2,
<<<<<<< HEAD
"TESLA_IGNORE_2" = TESLA_IGNORE_2,
"NO_MAT_REDEMPTION_2" = NO_MAT_REDEMPTION_2,
"LAVA_PROTECT_2" = LAVA_PROTECT_2
)
=======
"TESLA_IGNORE_2" = TESLA_IGNORE_2
),
"clothing_flags" = list(
@@ -143,5 +137,4 @@ GLOBAL_LIST_INIT(bitfields, list(
"NOSLIP" = NOSLIP,
"THICKMATERIAL" = THICKMATERIAL,
)
>>>>>>> ccf8fc5... Kills off three more flags from flags_2 (#37529)
))