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

Merge remote-tracking branch 'origin/master' into perlin-genny

Browse Source
This commit is contained in:
LetterN
2021-03-31 08:19:31 +08:00
parent e3fb2d5491 8bee5004ba
commit f976a89157
91 changed files with 1114 additions and 1071 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_globalvars/bitfields.dm
+7
View File
@@ -259,6 +259,13 @@ GLOBAL_LIST_INIT(bitfields, list(
),
"shield_flags" = list(
"SHIELD_TRANSPARENT" = SHIELD_TRANSPARENT,
"SHIELD_ENERGY_WEAK" = SHIELD_ENERGY_WEAK,
"SHIELD_KINETIC_WEAK" = SHIELD_KINETIC_WEAK,
"SHIELD_KINETIC_STRONG" = SHIELD_KINETIC_STRONG,
"SHIELD_ENERGY_STRONG" = SHIELD_ENERGY_STRONG,
"SHIELD_DISABLER_DISRUPTED" = SHIELD_DISABLER_DISRUPTED,
"SHIELD_NO_RANGED" = SHIELD_NO_RANGED,
"SHIELD_NO_MELEE" = SHIELD_NO_MELEE,
"SHIELD_CAN_BASH" = SHIELD_CAN_BASH,
"SHIELD_BASH_WALL_KNOCKDOWN" = SHIELD_BASH_WALL_KNOCKDOWN,
"SHIELD_BASH_ALWAYS_KNOCKDOWN" = SHIELD_BASH_ALWAYS_KNOCKDOWN,