Aligator

code/__DEFINES/_globals.dm

@@ -9,6 +9,21 @@
 /// Creates an empty global initializer, do not use
 #define GLOBAL_UNMANAGED(X) /datum/controller/global_vars/proc/InitGlobal##X() { return; }
 
+#define GLOBAL_MANAGED_MULTIPLE(X)\
+/datum/controller/global_vars/proc/InitGlobal##X(){\
+	##X = CollectGlobal##X();\
+}\
+/datum/controller/global_vars/proc/CollectGlobal##X(){\
+	CAN_BE_REDEFINED(TRUE);\
+	return list();\
+}
+
+#define GLOBAL_MULTIPLE_UPDATE(X, NewValue)\
+/datum/controller/global_vars/CollectGlobal##X(){\
+	. = ..();\
+	. += ##NewValue;\
+}
+
 /// Creates name keyed subtype instance list
 #define GLOBAL_SUBTYPE_INDEXED(X, TypePath, Index)\
 /datum/controller/global_vars/proc/InitGlobal##X(){\
@@ -69,6 +84,8 @@
 /// Create a global const var, do not use
 #define GLOBAL_VAR_CONST(X, InitValue) GLOBAL_RAW(/const/##X) = InitValue; GLOBAL_UNMANAGED(X)
 
+#define GLOBAL_MULTIPLE(X) GLOBAL_RAW(/list/##X); GLOBAL_MANAGED_MULTIPLE(X)
+
 /// Create a list global with an initializer expression
 #define GLOBAL_LIST_INIT(X, InitValue) GLOBAL_RAW(/list/##X); GLOBAL_MANAGED(X, InitValue)
 

code/__DEFINES/_protect.dm

@@ -1,4 +1,13 @@
+GLOBAL_MULTIPLE(protected_sentry_procs)
+#define SET_PROTECTED_PROC(proc) GLOBAL_MULTIPLE_UPDATE(protected_sentry_procs, proc)
+
+GLOBAL_MULTIPLE(protected_sentry_datums)
+#define SET_PROTECTED_DATUM(datum) GLOBAL_MULTIPLE_UPDATE(protected_sentry_datums, datum)
+
+GLOBAL_LIST_EMPTY(protected_config_entries)
+
 #define GENERAL_PROTECT_DATUM(Path)\
+SET_PROTECTED_DATUM(Path)\
 ##Path/can_vv_get(var_name){\
 	return FALSE;\
 }\

code/__DEFINES/client.dm

@@ -8,6 +8,6 @@
 /// This gathers all the client *procs* that we are pretending are verbs - but only particularly want
 /// authorized users to be able to use
 /client/proc/collect_client_verbs() as /list
-	CAN_BE_REDEFINED(TRUE);
+	CAN_BE_REDEFINED(TRUE)
 
 	return list()

code/__DEFINES/configuration.dm

@@ -8,6 +8,8 @@
 //flags
 #define CONFIG_ENTRY_LOCKED (1<<0) //can't edit
 #define CONFIG_ENTRY_HIDDEN (1<<1) //can't see value
+#define CONFIG_ENTRY_SENSITIVE (1<<2) //scrubbed from public logging, if a list assumes value is sensitive
+#define CONFIG_ENTRY_SENSITIVE_KEY (1<<3) //scrubbed from public logging, if a list assumes key is sensitive
 
 #define ON_CONFIG_LOAD(type) \
 ##type/New() { \

code/__DEFINES/conflict.dm

@@ -50,6 +50,8 @@
 #define PROJECTILE_SHRAPNEL  (1<<0)
 /// Apply additional effects upon hitting clicked target
 #define PROJECTILE_BULLSEYE  (1<<1)
+/// Reflected projectiles
+#define PROJECTILE_REFLECTED (1<<2)
 
 //Gun defines for gun related thing. More in the projectile folder.
 

code/__DEFINES/job.dm

@@ -76,6 +76,8 @@ GLOBAL_LIST_INIT(job_squad_roles, JOB_SQUAD_ROLES_LIST)
 #define JOB_DOCTOR_ROLES_LIST list(JOB_CMO, JOB_DOCTOR, JOB_SURGEON, JOB_PHARMACIST, JOB_FIELD_DOCTOR)
 #define JOB_RESEARCH_ROLES /datum/timelock/research
 #define JOB_RESEARCH_ROLES_LIST list(JOB_RESEARCHER)
+/// all roles expected to perform shipside larva removal, used for ares_autodoc_check
+#define JOB_SURGERY_ROLES_LIST list(JOB_CMO, JOB_DOCTOR, JOB_SURGEON, JOB_PHARMACIST, JOB_FIELD_DOCTOR, JOB_SYNTH, JOB_SYNTH_ENG, JOB_SYNTH_MED, JOB_SYNTH_INTEL, JOB_SYNTH_MP, JOB_SYNTH_CMD, JOB_SYNTH_SCI)
 
 #define JOB_CORPORATE_LIAISON "Corporate Liaison"
 #define JOB_CORPORATE_BODYGUARD "Corporate Bodyguard"

code/__DEFINES/mode.dm

@@ -305,6 +305,7 @@ DEFINE_BITFIELD(whitelist_status, list(
 #define FACTION_LIST_SURVIVOR_IASF list(FACTION_SURVIVOR, FACTION_IASF, FACTION_TWE)
 #define FACTION_LIST_SURVIVOR_PAP list(FACTION_SURVIVOR, FACTION_PAP, FACTION_UPP)
 #define FACTION_LIST_SURVIVOR_UPP list(FACTION_SURVIVOR, FACTION_UPP)
+#define FACTION_LIST_SURVIVOR_HYPERDYNE list(FACTION_SURVIVOR, FACTION_UPP, FACTION_HYPERDYNE)
 #define FACTION_LIST_MARINE_WY list(FACTION_MARINE, FACTION_PMC, FACTION_WY)
 #define FACTION_LIST_MARINE_UPP list(FACTION_MARINE, FACTION_UPP)
 #define FACTION_LIST_MARINE_TWE list(FACTION_MARINE, FACTION_TWE)

code/__DEFINES/paygrade_defs/navy.dm

@@ -1,55 +1,55 @@
 // Paygrade shorthand defines, to allow clearer designation.
 
 // USCM NAVY
-/// NE1, Seaman Recruit
+/// NE1, Aerospaceman Recruit
 #define PAY_SHORT_NE1 "NE1"
 
-/// NE2M, Seaman Apprentice
+/// NE2M, Aerospaceman
 #define PAY_SHORT_NE2 "NE2"
 
-/// NE3, Seaman
+/// NE3, Aerospaceman 1st Class
 #define PAY_SHORT_NE3 "NE3"
 
-/// NE4, Petty Officer 3rd Class
+/// NE4, Buck Sergeant
 #define PAY_SHORT_NE4 "NE4"
 
-/// NE5, Petty Officer 2nd Class
+/// NE5, Staff Sergeant
 #define PAY_SHORT_NE5 "NE5"
 
-/// NE6, Petty Officer 1st Class
+/// NE6, Technical Sergeant
 #define PAY_SHORT_NE6 "NE6"
 
-/// NE7, Chief Petty Officer
+/// NE7, Master Sergeant
 #define PAY_SHORT_NE7 "NE7"
 
-/// NE8, Senior Chief Petty Officer
+/// NE8, Senior Master Sergeant
 #define PAY_SHORT_NE8 "NE8"
 
-/// NE8C, Command Senior Chief Petty Officer
+/// NE8C, Command Senior Master Sergeant
 #define PAY_SHORT_NE8C "NE8C"
 
-/// NE9, Master Chief Petty Officer
+/// NE9, Chief Master Sergeant
 #define PAY_SHORT_NE9 "NE9"
 
-/// NE9C, Command Master Chief Petty Officer
+/// NE9C, Command Chief Master Sergeant Of The Aerospace Force
 #define PAY_SHORT_NE9C "NE9C"
 
-/// NO1, Ensign
+/// NO1, 2nd Lieutenant
 #define PAY_SHORT_NO1 "NO1"
 
-/// NO2, Lieutenant Junior Grade
+/// NO2, 1st Lieutenant
 #define PAY_SHORT_NO2 "NO2"
 
-/// NO3, Lieutenant
+/// NO3, Captain
 #define PAY_SHORT_NO3 "NO3"
 
-/// NO4, Lieutenant Commander
+/// NO4, Lieutenant Colonel
 #define PAY_SHORT_NO4 "NO4"
 
-/// NO5, Commander
+/// NO5, Colonel
 #define PAY_SHORT_NO5 "NO5"
 
-/// NO6, Captain
+/// NO6, Major
 #define PAY_SHORT_NO6 "NO6"
 
 /// NO6E, Commodore
@@ -58,16 +58,16 @@
 /// NO6C, Senior Commodore
 #define PAY_SHORT_NO6C "NO6C"
 
-/// NO7, Rear Admiral (Lower Half)
+/// NO7, Brigadier General
 #define PAY_SHORT_NO7 "NO7"
 
-/// NO8, Rear Admiral (Upper Half)
+/// NO8, Major General
 #define PAY_SHORT_NO8 "NO8"
 
-/// NO9, Vice Admiral
+/// NO9, Lieutenant General
 #define PAY_SHORT_NO9 "NO9"
 
-/// NO10, Admiral
+/// NO10, General
 #define PAY_SHORT_NO10 "NO10"
 
 /// NO10C, Chief of Naval Operations

code/__DEFINES/traits.dm

@@ -169,6 +169,8 @@
 #define TRAIT_VALKYRIE_ARMORED "trait_valkyrie_armored"
 /// Prevents mob from riding mobs when buckled onto something
 #define TRAIT_CANT_RIDE "cant_ride"
+/// Makes mob immune to dir lock slowdown.
+#define TRAIT_NO_DIR_LOCK_SLOWDOWN "no_dir_lock_slowdown"
 
 // SPECIES TRAITS
 /// Knowledge of Yautja technology
@@ -265,6 +267,11 @@
 #define TRAIT_ABILITY_BURROWED "t_ability_burrowed"
 /// Xenos with this trait can toggle long sight while resting.
 #define TRAIT_ABILITY_SIGHT_IGNORE_REST "t_ability_sight_ignore_rest"
+/// Used by shielder to check stance.
+#define TRAIT_ABILITY_ENCLOSED_PLATES "t_ability_enclosed_plates"
+/// Used by shielder for reflective plates.
+#define TRAIT_ABILITY_REFLECTIVE_PLATES "t_ability_reflective_plates"
+
 
 //-- item traits --
 // TOOL TRAITS
@@ -344,6 +351,8 @@ GLOBAL_LIST_INIT(mob_traits, list(
 	TRAIT_DEXTROUS,
 	TRAIT_REAGENT_SCANNER,
 	TRAIT_ABILITY_BURROWED,
+	TRAIT_ABILITY_ENCLOSED_PLATES,
+	TRAIT_ABILITY_REFLECTIVE_PLATES,
 	TRAIT_VULTURE_USER,
 	TRAIT_IN_TUTORIAL,
 	TRAIT_SPEC_KIT,

code/__DEFINES/typecheck/items.dm

@@ -1,9 +1,7 @@
 #define iswelder(O) (istype(O, /obj/item/tool/weldingtool))
-#define iscoil(O) (istype(O, /obj/item/stack/cable_coil))
 #define iswire(O) (istype(O, /obj/item/stack/cable_coil))
 #define isweapon(O) (O && is_type_in_list(O, GLOB.weapons))
 #define isgun(O) (istype(O, /obj/item/weapon/gun))
-#define isbanana(O) (istype(O, /obj/item/reagent_container/food/snacks/grown/banana))
 #define istool(O) (O && is_type_in_list(O, GLOB.common_tools))
 #define ispowerclamp(O) (istype(O, /obj/item/powerloader_clamp))
 #define isstorage(O) (istype(O, /obj/item/storage))
@@ -27,7 +25,3 @@ GLOBAL_LIST_INIT(common_tools, list(
 	/obj/item/device/multitool,
 	/obj/item/tool/crowbar
 ))
-
-/obj/item/proc/can_pry()
-	if(pry_capable > IS_PRY_CAPABLE_SIMPLE || HAS_TRAIT(src, TRAIT_TOOL_CROWBAR))
-		return TRUE

code/__DEFINES/xeno.dm

@@ -421,6 +421,9 @@
 // Lurker strain flags
 #define LURKER_VAMPIRE "Vampire"
 
+// Warrior strain flags
+#define WARRIOR_BULWARK "Bulwark"
+
 // Ravager strain flags
 #define RAVAGER_HEDGEHOG "Hedgehog"
 #define RAVAGER_BERSERKER "Berserker"
@@ -449,6 +452,7 @@
 
 // Damage - this is applied as a flat nerf/buff to the xeno's average damage
 #define XENO_DAMAGE_MOD_VERY_SMALL  5
+#define XENO_DAMAGE_MOD_BULWARK  8
 #define XENO_DAMAGE_MOD_SMALL   10
 #define XENO_DAMAGE_MOD_MED 15
 #define XENO_DAMAGE_MOD_LARGE   20
@@ -747,6 +751,8 @@
 // dancer defines
 #define DANCER_DODGE_TIME 7 SECONDS
 
+// bulwark defines
+#define BULWARK_REFLECTIVE_TIME 6 SECONDS
 
 // drone fruits
 

code/_globalvars/lists/mobs.dm

@@ -4,6 +4,15 @@ GLOBAL_PROTECT(admins)
 
 GLOBAL_LIST_EMPTY(directory) //all ckeys with associated client
 
+GLOBAL_DATUM(all_player_keys_regex, /regex)
+GLOBAL_LIST_EMPTY(all_player_keys)
+
+GLOBAL_DATUM(all_player_cids_regex, /regex)
+GLOBAL_LIST_EMPTY(all_player_cids)
+
+GLOBAL_DATUM(all_player_ckeys_regex, /regex)
+GLOBAL_LIST_EMPTY(all_player_ckeys)
+
 GLOBAL_LIST_EMPTY(player_list) //all mobs **with clients attached**.
 GLOBAL_LIST_EMPTY(living_player_list) // all /mob/living with clients
 

code/_onclick/adjacent.dm

@@ -273,7 +273,7 @@ Quick adjacency (to turf):
 		var/list/cur_dense_blockers = list()
 		for(var/atom/blocker in blockers["fd1"])
 			if(blocker.flags_barrier & HANDLE_BARRIER_CHANCE)
-				if(blocker.handle_barrier_chance())
+				if(blocker.handle_barrier_chance(attacker))
 					return blocker
 			else
 				guaranteed_hit = 1
@@ -282,7 +282,7 @@ Quick adjacency (to turf):
 
 		for(var/atom/blocker in blockers["fd2"])
 			if(blocker.flags_barrier & HANDLE_BARRIER_CHANCE)
-				if(blocker.handle_barrier_chance())
+				if(blocker.handle_barrier_chance(attacker))
 					return blocker
 			else
 				guaranteed_hit++

code/_onclick/item_attack.dm

@@ -105,6 +105,10 @@
 		if(isxeno(M))
 			var/mob/living/carbon/xenomorph/X = M
 			power = armor_damage_reduction(GLOB.xeno_melee, power, X.armor_deflection + X.armor_deflection_buff - X.armor_deflection_debuff, 20, 0, 0, X.armor_integrity)
+
+			if(X.melee_vulnerability_mult != 0)
+				power *= X.melee_vulnerability_mult
+
 			var/armor_punch = armor_break_calculation(GLOB.xeno_melee, power, X.armor_deflection + X.armor_deflection_buff - X.armor_deflection_debuff, 20, 0, 0, X.armor_integrity)
 			X.apply_armorbreak(armor_punch)
 		if(hitsound)

code/controllers/configuration/config_entry.dm

@@ -6,6 +6,8 @@
 #define KEY_MODE_TYPE 1
 #define KEY_MODE_TEXT_UNALTERED 2
 
+SET_PROTECTED_DATUM(/datum/config_entry)
+
 /datum/config_entry
 	var/name //read-only, this is determined by the last portion of the derived entry type
 	var/config_entry_value

code/controllers/configuration/configuration.dm

@@ -1,3 +1,5 @@
+SET_PROTECTED_DATUM(/datum/controller/configuration)
+
 /datum/controller/configuration
 	name = "Configuration"
 
@@ -162,6 +164,9 @@
 		_entries[esname] = E
 		_entries_by_type[I] = E
 
+		if(E.protection & (CONFIG_ENTRY_SENSITIVE|CONFIG_ENTRY_SENSITIVE_KEY))
+			GLOB.protected_config_entries += E
+
 
 /datum/controller/configuration/proc/RemoveEntry(datum/config_entry/CE)
 	entries -= CE.name

code/controllers/configuration/entries/achievements.dm

@@ -1,10 +1,10 @@
 /// The base URL for the achievements API endpoint
 /datum/config_entry/string/achievements_api_url
-	protection = CONFIG_ENTRY_HIDDEN
+	protection = CONFIG_ENTRY_HIDDEN|CONFIG_ENTRY_SENSITIVE
 
 /// The API key for authenticating with the achievements service
 /datum/config_entry/string/achievements_api_key
-	protection = CONFIG_ENTRY_HIDDEN|CONFIG_ENTRY_LOCKED
+	protection = CONFIG_ENTRY_HIDDEN|CONFIG_ENTRY_LOCKED|CONFIG_ENTRY_SENSITIVE
 
 /// Additional parameter passed to the backend service
 /datum/config_entry/string/achievements_instance

code/controllers/configuration/entries/dbconfig.dm

@@ -15,7 +15,7 @@
 	protection = CONFIG_ENTRY_HIDDEN|CONFIG_ENTRY_LOCKED
 
 /datum/config_entry/string/db_password
-	protection = CONFIG_ENTRY_HIDDEN|CONFIG_ENTRY_LOCKED
+	protection = CONFIG_ENTRY_HIDDEN|CONFIG_ENTRY_LOCKED|CONFIG_ENTRY_SENSITIVE
 
 /datum/config_entry/flag/db_debug_mode
 	protection = CONFIG_ENTRY_HIDDEN|CONFIG_ENTRY_LOCKED