Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281

2019-10-28 16:41:50 +01:00
parent 4aa1d55abb 935af3c21f
commit f54449bc7c
86 changed files with 1495 additions and 2318 deletions
@@ -142,6 +142,8 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"THICKMATERIAL" = THICKMATERIAL,
 		"VOICEBOX_TOGGLABLE" = VOICEBOX_TOGGLABLE,
 		"VOICEBOX_DISABLED" = VOICEBOX_DISABLED,
+		"SNUG_FIT" = SNUG_FIT,
+		"ANTI_TINFOIL_MANEUVER" = ANTI_TINFOIL_MANEUVER,
 		),
 	"tesla_flags" = list(
 		"TESLA_MOB_DAMAGE" = TESLA_MOB_DAMAGE,