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

code/_globalvars/bitfields.dm

@@ -160,6 +160,7 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"HOLOGRAM_1" = HOLOGRAM_1,
 		"SHOCKED_1" = SHOCKED_1,
 		"INITIALIZED_1" = INITIALIZED_1,
+		"NO_SCREENTIPS_1" = NO_SCREENTIPS_1,
 		"ADMIN_SPAWNED_1" = ADMIN_SPAWNED_1,
 		"BLOCK_FACE_ATOM_1" = BLOCK_FACE_ATOM_1,
 		"PREVENT_CONTENTS_EXPLOSION_1" = PREVENT_CONTENTS_EXPLOSION_1

code/_globalvars/lists/flavor_misc.dm

@@ -216,7 +216,13 @@ GLOBAL_LIST_INIT(jumpsuitlist, list(PREF_SUIT, PREF_SKIRT))
 #define UPLINK_PDA		"PDA"
 #define UPLINK_RADIO	"Radio"
 #define UPLINK_PEN		"Pen" //like a real spy!
-GLOBAL_LIST_INIT(uplink_spawn_loc_list, list(UPLINK_PDA, UPLINK_RADIO, UPLINK_PEN))
+#define UPLINK_IMPLANT "Implant"
+#define UPLINK_IMPLANT_WITH_PRICE "[UPLINK_IMPLANT] (-[UPLINK_IMPLANT_TELECRYSTAL_COST] TC)"
+// What we show to the user
+GLOBAL_LIST_INIT(uplink_spawn_loc_list, list(UPLINK_PDA, UPLINK_RADIO, UPLINK_PEN, UPLINK_IMPLANT_WITH_PRICE))
+// What is actually saved; if the uplink implant price changes, it won't affect save files then
+GLOBAL_LIST_INIT(uplink_spawn_loc_list_save, list(UPLINK_PDA, UPLINK_RADIO, UPLINK_PEN, UPLINK_IMPLANT))
+
 
 //List of cached alpha masked icons.
 GLOBAL_LIST_EMPTY(alpha_masked_worn_icons)

code/_globalvars/lists/mobs.dm

@@ -52,6 +52,8 @@ GLOBAL_LIST_EMPTY(current_observers_list)
 
 //Dynamic Port
 GLOBAL_LIST_EMPTY(new_player_list) //all /mob/dead/new_player, in theory all should have clients and those that don't are in the process of spawning and get deleted when done.
+//Family Port
+GLOBAL_LIST_EMPTY(pre_setup_antags) //minds that have been picked as antag by the gamemode. removed as antag datums are set.
 
 /proc/update_config_movespeed_type_lookup(update_mobs = TRUE)
 	// NOTE: This is entirely based on the fact that byond typesof/subtypesof gets longer/deeper paths before shallower ones.

code/_globalvars/lists/objects.dm

@@ -16,10 +16,11 @@ GLOBAL_LIST_EMPTY(singularities)				    //list of all singularities on the stati
 GLOBAL_LIST_EMPTY(grounding_rods)					//list of all grounding rods on the station
 
 GLOBAL_LIST(chemical_reactions_list)				//list of all /datum/chemical_reaction datums. Used during chemical reactions
+GLOBAL_LIST(drink_reactions_list)				//list of all /datum/chemical_reaction datums where the output is of type /datum/reagent/consumable for bartender PDA
+GLOBAL_LIST(normalized_chemical_reactions_list)			//list of all /datum/chemical_reaction datums with actual sane indexing for chemistry PDA
 GLOBAL_LIST(chemical_reagents_list)				//list of all /datum/reagent datums indexed by reagent id. Used by chemistry stuff
 GLOBAL_LIST_EMPTY(tech_list)					//list of all /datum/tech datums indexed by id.
 GLOBAL_LIST_EMPTY(surgeries_list)				//list of all surgeries by name, associated with their path.
-GLOBAL_LIST_EMPTY(uplink_items)					//list of all uplink item typepaths, ascendingly sorted by their initial name.
 GLOBAL_LIST_EMPTY(uplink_categories)			//list of all uplink categories, listed by the order they are loaded in code. Be careful.
 GLOBAL_LIST_EMPTY(crafting_recipes)				//list of all table craft recipes
 GLOBAL_LIST_EMPTY(rcd_list)					//list of Rapid Construction Devices.

code/_globalvars/logging.dm

@@ -2,12 +2,17 @@ GLOBAL_VAR(log_directory)
 GLOBAL_PROTECT(log_directory)
 GLOBAL_VAR(world_game_log)
 GLOBAL_PROTECT(world_game_log)
+/// Log associated with [/proc/log_suspicious_login()] - Intended to hold all logins that failed due to suspicious circumstances such as ban detection, CID randomisation etc.
+GLOBAL_VAR(world_suspicious_login_log)
+GLOBAL_PROTECT(world_suspicious_login_log)
 GLOBAL_VAR(world_runtime_log)
 GLOBAL_PROTECT(world_runtime_log)
 GLOBAL_VAR(world_qdel_log)
 GLOBAL_PROTECT(world_qdel_log)
 GLOBAL_VAR(world_attack_log)
 GLOBAL_PROTECT(world_attack_log)
+GLOBAL_VAR(world_victim_log)
+GLOBAL_PROTECT(world_victim_log)
 // GLOBAL_VAR(world_econ_log)
 // GLOBAL_PROTECT(world_econ_log)
 GLOBAL_VAR(world_href_log)

code/_globalvars/tgui.dm

@@ -0,0 +1 @@
+GLOBAL_DATUM(changelog_tgui, /datum/changelog)

code/_globalvars/traits.dm

@@ -38,6 +38,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_RESISTCOLD" = TRAIT_RESISTCOLD,
 		"TRAIT_RESISTHIGHPRESSURE" = TRAIT_RESISTHIGHPRESSURE,
 		"TRAIT_RESISTLOWPRESSURE" = TRAIT_RESISTLOWPRESSURE,
+		"TRAIT_LOWPRESSURECOOLING" = TRAIT_LOWPRESSURECOOLING,
 		"TRAIT_BOMBIMMUNE" = TRAIT_BOMBIMMUNE,
 		"TRAIT_RADIMMUNE" = TRAIT_RADIMMUNE,
 		"TRAIT_GENELESS" = TRAIT_GENELESS,
@@ -55,6 +56,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_ROBOTIC_ORGANISM" = TRAIT_ROBOTIC_ORGANISM,
 		"TRAIT_ROBOT_RADSHIELDING" = TRAIT_ROBOT_RADSHIELDING,
 		"TRAIT_NOBREATH" = TRAIT_NOBREATH,
+		"TRAIT_AUXILIARY_LUNGS" = TRAIT_AUXILIARY_LUNGS,
 		"TRAIT_ANTIMAGIC" = TRAIT_ANTIMAGIC,
 		"TRAIT_HOLY" = TRAIT_HOLY,
 		"TRAIT_DEPRESSION" = TRAIT_DEPRESSION,