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

code/_globalvars/bitfields.dm

@@ -130,7 +130,7 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"FLYING" = FLYING,
 		"VENTCRAWLING" = VENTCRAWLING,
 		"FLOATING" = FLOATING,
-		"UNSTOPPABLE" = UNSTOPPABLE
+		"PHASING" = PHASING
 		),
 	"resistance_flags" = list(
 		"LAVA_PROOF" = LAVA_PROOF,

code/_globalvars/lists/flavor_misc.dm

@@ -292,6 +292,8 @@ GLOBAL_LIST_INIT(station_names, world.file2list("strings/station_names.txt" + ""
 
 GLOBAL_LIST_INIT(station_suffixes, world.file2list("strings/station_suffixes.txt"))
 
+GLOBAL_LIST_INIT(server_taglines, world.file2list("[global.config.directory]/server_taglines.txt"))
+
 GLOBAL_LIST_INIT(greek_letters, world.file2list("strings/greek_letters.txt"))
 
 GLOBAL_LIST_INIT(phonetic_alphabet, world.file2list("strings/phonetic_alphabet.txt"))

code/_globalvars/logging.dm

@@ -33,8 +33,8 @@ GLOBAL_VAR(query_debug_log)
 GLOBAL_PROTECT(query_debug_log)
 GLOBAL_VAR(world_job_debug_log)
 GLOBAL_PROTECT(world_job_debug_log)
-// GLOBAL_VAR(world_mecha_log)
-// GLOBAL_PROTECT(world_mecha_log)
+GLOBAL_VAR(world_mecha_log)
+GLOBAL_PROTECT(world_mecha_log)
 GLOBAL_VAR(world_virus_log)
 GLOBAL_PROTECT(world_virus_log)
 GLOBAL_VAR(world_asset_log)

code/_globalvars/traits.dm

@@ -126,7 +126,8 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_EMPATH" = TRAIT_EMPATH,
 		"TRAIT_FRIENDLY" = TRAIT_FRIENDLY,
 		"TRAIT_IWASBATONED" = TRAIT_IWASBATONED,
-		"TRAIT_SPACEWALK" = TRAIT_SPACEWALK
+		"TRAIT_SPACEWALK" = TRAIT_SPACEWALK,
+		"TRAIT_SALT_SENSITIVE" = TRAIT_SALT_SENSITIVE
 	),
 	/obj/item/bodypart = list(
 		"TRAIT_PARALYSIS" = TRAIT_PARALYSIS