Merge remote-tracking branch 'upstream/master' into code

.github/alternate_byond_versions.txt

@@ -6,4 +6,4 @@
 # Example:
 # 500.1337: runtimestation
 
-516.1648: runtime
+516.1655: runtime

.github/maps_to_ignore.txt

@@ -0,0 +1,4 @@
+chinook
+corsat
+ice_colony_v2
+prison_station_fop

.github/workflows/ci_suite.yml

@@ -67,6 +67,9 @@ jobs:
     name: Lint with OpenDream
     runs-on: ubuntu-22.04
     steps:
+      - uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 9
       - uses: actions/checkout@v4
       - uses: robinraju/[email protected]
         with:
@@ -111,6 +114,8 @@ jobs:
           shopt -s extglob
           echo "$(ls -mw0 maps/!(*override*).json)" > maps_output.txt
           sed -i -e s+maps/+\"+g -e s+.json+\"+g maps_output.txt
+          echo "Ignored Maps: $(cat .github/maps_to_ignore.txt)"
+          cat .github/maps_to_ignore.txt | sed -r 's/\s*//g' | xargs -i sed -ri 's/(, "{}")|("{}", )//g' maps_output.txt
           echo "Maps: $(cat maps_output.txt)"
           echo "maps={\"paths\":[$(cat maps_output.txt)]}" >> $GITHUB_OUTPUT
       - name: Find Alternate Tests

code/__DEFINES/__game.dm

@@ -148,7 +148,7 @@
 #define PLAY_SYNTH (1<<5)
 #define PLAY_MISC (1<<6)
 
-//toggles_hunting_grounds
+//toggles_ert_pred
 #define PLAY_MERC (1<<0)
 #define PLAY_TWE (1<<1)
 #define PLAY_UPP (1<<2)
@@ -258,7 +258,7 @@
 
 /// Frequency stuff only works with 45kbps oggs.
 #define GET_RANDOM_FREQ rand(32000, 55000)
-
+#define GET_RANDOM_FREQ_MINOR rand(42000, 48000)
 
 // Ceilings
 // Ceiling types

code/__DEFINES/atmospherics.dm

@@ -13,16 +13,19 @@
 /// The maximum number of degrees that your body can heat up in 1 tick, when in a hot area.
 #define BODYTEMP_HEATING_MAX 30
 /// The limit the human body can take before it starts taking damage from heat.
-#define BODYTEMP_HEAT_DAMAGE_LIMIT 360.15
+#define BODYTEMP_HEAT_DAMAGE_LIMIT 373.15 // 100degC
 /// The limit the human body can take before it starts taking damage from coldness.
-#define BODYTEMP_COLD_DAMAGE_LIMIT 260.15
+#define BODYTEMP_COLD_DAMAGE_LIMIT 260.15 // -13degC
+/// The limit the human body will reach in extremely cold liquids (required for cryo effects).
+#define BODYTEMP_CRYO_LIQUID_THRESHOLD 210 // -63.15degC
 
 #define ONE_ATMOSPHERE 101.325 //kPa
 
 #define O2STANDARD 0.21
 
 #define T0C 273.15 // 0degC
 #define T20C 293.15 // 20degC
+#define T37C 310.15 // 37degC - body temp
 #define T90C 363.15 // 90degC
 #define T120C 393.15 // 120degC
 #define TCMB 2.7 // -270.3degC

code/__DEFINES/chat.dm

@@ -2,6 +2,11 @@
  * Copyright (c) 2020 Aleksej Komarov
  * SPDX-License-Identifier: MIT
  */
+
+/// How many chat payloads to keep in history
+#define CHAT_RELIABILITY_HISTORY_SIZE 5
+/// How many resends to allow before giving up
+#define CHAT_RELIABILITY_MAX_RESENDS 3
 
 #define MESSAGE_TYPE_SYSTEM "system"
 #define MESSAGE_TYPE_LOCALCHAT "localchat"

code/__DEFINES/chemistry.dm

@@ -46,8 +46,12 @@
 #define ALCOHOL_METABOLISM AMOUNT_PER_TIME(1, 5 SECONDS)
 #define RAPID_METABOLISM AMOUNT_PER_TIME(1, 2 SECONDS)
 
-// Factor of how fast mob nutrition decreases
+/// How fast mob nutrition normally decreases
 #define HUNGER_FACTOR 0.05
+/// Additional mob nutrition cost when regenerating blood
+#define BLOOD_NUTRITION_COST 0.25
+/// Additional mob nutrition cost when cold
+#define COLD_NUTRITION_COST 1
 
 // Nutrition levels
 #define NUTRITION_MAX 550
@@ -132,6 +136,7 @@
 #define PROPERTY_CARDIOTOXIC "cardiotoxic"
 #define PROPERTY_NEUROTOXIC "neurotoxic"
 #define PROPERTY_HYPERMETABOLIC "hypermetabolic"
+#define PROPERTY_IGNITING "igniting"
 //Neutral
 #define PROPERTY_NUTRITIOUS "nutritious"
 #define PROPERTY_KETOGENIC "ketogenic"
@@ -325,3 +330,5 @@
 #define INCENDIARY_SHARDS_MAX_REDUCTION	2
 #define HORNET_SHARDS_MAX_REDUCTION 2
 #define NEURO_SHARDS_MAX_REDUCTION 2
+
+#define LEVEL_TO_POTENCY_MULTIPLIER 0.5

code/__DEFINES/colours.dm

@@ -120,14 +120,18 @@
 #define LIGHT_COLOR_FIRE    "#FAA019"
 /// Very warm yellow, leaning slightly towards orange. rgb(196, 138, 24)
 #define LIGHT_COLOR_LAVA    "#C48A18"
+/// Very warm yellowish-white color for candlelight. rgb(255, 187, 110)
+#define LIGHT_COLOR_CANDLE "#FFBB6E"
 /// Bright, non-saturated red. Leaning slightly towards pink for visibility. rgb(250, 100, 75)
 #define LIGHT_COLOR_FLARE   "#FA644B"
 /// Weird color, between yellow and green, very slimy. rgb(175, 200, 75)
 #define LIGHT_COLOR_SLIME_LAMP "#AFC84B"
-/// Extremely diluted yellow, close to skin color (for some reason). rgb(250, 225, 175)
-#define LIGHT_COLOR_TUNGSTEN   "#FAE1AF"
+/// Incandascent warm white, for usage in lights. rgb(255, 239, 210)
+#define LIGHT_COLOR_TUNGSTEN "#FFEFD2"
 /// Barely visible cyan-ish hue, as the doctor prescribed. rgb(240, 250, 250)
 #define LIGHT_COLOR_HALOGEN "#F0FAFA"
+/// Bluish cyan color for blue lights. rgb(210, 227, 236)
+#define LIGHT_COLOR_XENON "#D2E3EC"
 
 /// The default color for admin say, used as a fallback when the preference is not enabled
 

code/__DEFINES/dcs/signals/atom/signals_item.dm

@@ -58,3 +58,7 @@
 #define COMSIG_CAMERA_REFRESH "camera_manager_refresh"
 
 #define COMSIG_PRED_BRACER_DECLOAKED "pred_bracer_decloaked"
+
+//from /datum/component/overwatch_console_control
+#define COMSIG_OW_CONSOLE_OBSERVE_START "ow_console_observe_start"
+#define COMSIG_OW_CONSOLE_OBSERVE_END "ow_console_observe_end"

code/__DEFINES/dcs/signals/signals_global.dm

@@ -58,7 +58,7 @@
 #define COMSIG_GLOB_GROUNDSIDE_TELECOMM_TURNED_OFF "!groundside_telecomm_turned_off"
 
 /// From /datum/admins/proc/force_predator_round()
-#define COMSIG_GLOB_PREDATOR_ROUND_TOGGLED "!predator_round_toglged"
+#define COMSIG_GLOB_PREDATOR_ROUND_TOGGLED "!predator_round_toggled"
 
 /// From /datum/game_mode/colonialmarines/proc/check_ground_humans()
 #define COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING "!groundside_forsaken_handling"

code/__DEFINES/equipment.dm

@@ -92,6 +92,8 @@
 #define FORCEDROP_CONDITIONAL (1<<14)
 /// Overrides smartgunner not being able to wear backpacks
 #define SMARTGUNNER_BACKPACK_OVERRIDE (1<<15)
+/// The item will incur click delay if an empty adjacent tile is clicked
+#define ADJACENT_CLICK_DELAY (1<<16)
 //==========================================================================================
 
 
@@ -479,6 +481,8 @@ GLOBAL_LIST_INIT(slot_to_contained_sprite_shorthand, list(
 #define ACCESSORY_SLOT_PONCHO "Ponchos"
 #define ACCESSORY_SLOT_TROPHY "Trophy"
 #define ACCESSORY_SLOT_MASK "Mask"
+#define ACCESSORY_SLOT_WRIST_L "Left wrist"
+#define ACCESSORY_SLOT_WRIST_R "Right wrist"
 
 /// Used for uniform armor inserts.
 #define ACCESSORY_SLOT_ARMOR_C "Chest armor"

code/__DEFINES/gamemode.dm

@@ -0,0 +1,18 @@
+#define QUEEN_DEATH_COUNTDOWN 10 MINUTES
+
+#define MODE_INFESTATION_X_MAJOR "Xenomorph Major Victory"
+#define MODE_INFESTATION_M_MAJOR "Marine Major Victory"
+#define MODE_INFESTATION_X_MINOR "Xenomorph Minor Victory"
+#define MODE_INFESTATION_M_MINOR "Marine Minor Victory"
+#define MODE_INFESTATION_DRAW_DEATH "DRAW: Mutual Annihilation"
+
+#define MODE_INFECTION_ZOMBIE_WIN "Major Zombie Victory"
+
+#define MODE_BATTLEFIELD_W_MAJOR "Wey-Yu PMC Major Success"
+#define MODE_BATTLEFIELD_M_MAJOR "Marine Major Success"
+#define MODE_BATTLEFIELD_W_MINOR "Wey-Yu PMC Minor Success"
+#define MODE_BATTLEFIELD_M_MINOR "Marine Minor Success"
+#define MODE_BATTLEFIELD_DRAW_STALEMATE "DRAW: Stalemate"
+#define MODE_BATTLEFIELD_DRAW_DEATH "DRAW: My Friends Are Dead"
+
+#define MODE_GENERIC_DRAW_NUKE "DRAW: Nuclear Explosion"

code/__DEFINES/job.dm

@@ -71,7 +71,6 @@ GLOBAL_LIST_INIT(job_squad_roles, JOB_SQUAD_ROLES_LIST)
 
 #define JOB_MESS_SERGEANT "Mess Technician"
 #define JOB_SYNTH "Synthetic"
-#define JOB_SHIP_SYNTH "Ship Operations Synthetic"
 #define JOB_SYNTH_K9 "Synthetic K9"
 #define JOB_WORKING_JOE "Working Joe"
 
@@ -214,21 +213,23 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 #define JOB_ASSISTANT_MANAGER "Corporate Assistant Manager"
 #define JOB_DIVISION_MANAGER "Corporate Division Manager"
 #define JOB_CHIEF_EXECUTIVE "Corporate Chief Executive"
-#define JOB_DIRECTOR "W-Y Director"
+#define JOB_DEPUTY_DIRECTOR "WY Deputy Director"
+#define JOB_DIRECTOR "WY Director"
 
 #define ROLES_WY_CORPORATE list(JOB_EXECUTIVE_SUPERVISOR, JOB_EXECUTIVE_SPECIALIST, JOB_SENIOR_EXECUTIVE, JOB_EXECUTIVE, JOB_JUNIOR_EXECUTIVE, JOB_TRAINEE)
-#define ROLES_WY_LEADERSHIP list(JOB_DIRECTOR, JOB_PMC_DIRECTOR, JOB_CHIEF_EXECUTIVE, JOB_DIVISION_MANAGER, JOB_ASSISTANT_MANAGER)
+#define ROLES_WY_LEADERSHIP list(JOB_DIRECTOR, JOB_PMC_DIRECTOR, JOB_DEPUTY_DIRECTOR, JOB_CHIEF_EXECUTIVE, JOB_DIVISION_MANAGER, JOB_ASSISTANT_MANAGER)
 
 #define JOB_CORPORATE_ROLES /datum/timelock/corporate
-#define JOB_CORPORATE_ROLES_LIST list(JOB_CORPORATE_LIAISON, JOB_WO_CORPORATE_LIAISON, JOB_DIRECTOR, JOB_PMC_DIRECTOR, JOB_CHIEF_EXECUTIVE, JOB_DIVISION_MANAGER, JOB_ASSISTANT_MANAGER, JOB_EXECUTIVE_SUPERVISOR, JOB_EXECUTIVE_SPECIALIST, JOB_SENIOR_EXECUTIVE, JOB_EXECUTIVE, JOB_JUNIOR_EXECUTIVE, JOB_TRAINEE)
+#define JOB_CORPORATE_ROLES_LIST list(JOB_CORPORATE_LIAISON, JOB_WO_CORPORATE_LIAISON, JOB_DIRECTOR, JOB_PMC_DIRECTOR, JOB_DEPUTY_DIRECTOR, JOB_CHIEF_EXECUTIVE, JOB_DIVISION_MANAGER, JOB_ASSISTANT_MANAGER, JOB_EXECUTIVE_SUPERVISOR, JOB_EXECUTIVE_SPECIALIST, JOB_SENIOR_EXECUTIVE, JOB_EXECUTIVE, JOB_JUNIOR_EXECUTIVE, JOB_TRAINEE)
 
 //-------- WY Goons --------//
 #define JOB_WY_GOON "WY Corporate Security"
+#define JOB_WY_GOON_MEDIC "WY Corporate Security Medic"
 #define JOB_WY_GOON_TECH "WY Corporate Security Technician"
 #define JOB_WY_GOON_LEAD "WY Corporate Security Lead"
 #define JOB_WY_GOON_RESEARCHER "WY Research Consultant"
 
-#define ROLES_WY_GOONS list(JOB_WY_GOON_LEAD, JOB_WY_GOON_TECH, JOB_WY_GOON)
+#define ROLES_WY_GOONS list(JOB_WY_GOON_LEAD, JOB_WY_GOON_TECH, JOB_WY_GOON, JOB_WY_GOON_RESEARCHER)
 
 //---- Contractors ----//
 #define JOB_CONTRACTOR "VAIPO Mercenary"
@@ -352,11 +353,14 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 #define JOB_TWE_RMC_MARKSMAN "RMC Marksman"
 #define JOB_TWE_RMC_SMARTGUNNER "RMC Smartgunner"
 #define JOB_TWE_RMC_BREACHER "RMC Breacher"
+#define JOB_TWE_RMC_MEDIC "RMC Corpsman"
 #define JOB_TWE_RMC_TEAMLEADER "RMC Team Leader"
 #define JOB_TWE_RMC_LIEUTENANT "RMC Lieutenant"
+#define JOB_TWE_RMC_CAPTAIN "RMC Captain"
+#define JOB_TWE_RMC_MAJOR "RMC Major"
 #define JOB_TWE_RMC_COMMANDER "RMC Commander"
 
-#define TWE_COMMANDO_JOB_LIST list(JOB_TWE_RMC_RIFLEMAN, JOB_TWE_RMC_BREACHER, JOB_TWE_RMC_SMARTGUNNER,JOB_TWE_RMC_MARKSMAN ,JOB_TWE_RMC_TEAMLEADER, JOB_TWE_RMC_LIEUTENANT, JOB_TWE_RMC_COMMANDER)
+#define TWE_COMMANDO_JOB_LIST list(JOB_TWE_RMC_RIFLEMAN, JOB_TWE_RMC_BREACHER, JOB_TWE_RMC_MEDIC, JOB_TWE_RMC_SMARTGUNNER,JOB_TWE_RMC_MARKSMAN ,JOB_TWE_RMC_TEAMLEADER, JOB_TWE_RMC_LIEUTENANT, JOB_TWE_RMC_CAPTAIN, JOB_TWE_RMC_MAJOR, JOB_TWE_RMC_COMMANDER)
 
 #define JOB_TWE_SEAMAN "TWE Seaman"
 #define JOB_TWE_LSEAMAN "TWE Leading Seaman"

code/__DEFINES/keybinding.dm

@@ -167,6 +167,7 @@
 #define COMSIG_KB_XENO_HIDE "keybinding_hide"
 #define COMSIG_KB_XENO_EVOLVE "keybinding_evolve"
 #define COMSIG_KB_XENO_PURCHASE_STRAIN "keybinding_purchase_strain"
+#define COMSIG_KB_XENO_RESET_STRAIN "keybinding_reset_strain"
 
 // Yautja
 

code/__DEFINES/lighting.dm

@@ -25,7 +25,8 @@
 ///The dim natural vision of Yautja
 #define LIGHTING_PLANE_ALPHA_YAUTJA 235
 #define LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE 192
-#define LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE 127
+#define LIGHTING_PLANE_ALPHA_SOMEWHAT_INVISIBLE 127
+#define LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE 80
 #define LIGHTING_PLANE_ALPHA_INVISIBLE 0
 
 

code/__DEFINES/minimap.dm

@@ -1,6 +1,6 @@
 #define MINIMAP_FLAG_XENO (1<<0)
 #define MINIMAP_FLAG_USCM (1<<1)
-#define MINIMAP_FLAG_PMC (1<<2)
+#define MINIMAP_FLAG_WY (1<<2)
 #define MINIMAP_FLAG_UPP (1<<3)
 #define MINIMAP_FLAG_CLF (1<<4)
 #define MINIMAP_FLAG_YAUTJA (1<<5)

code/__DEFINES/misc.dm

@@ -300,6 +300,7 @@
 //ghost vision mode pref settings
 #define GHOST_VISION_LEVEL_NO_NVG "No Night Vision"
 #define GHOST_VISION_LEVEL_MID_NVG "Half Night Vision"
+#define GHOST_VISION_LEVEL_HIGH_NVG "Three Quarters Night Vision"
 #define GHOST_VISION_LEVEL_FULL_NVG "Full Night Vision"
 
 //Ghost orbit types:

code/__DEFINES/mobs.dm

@@ -290,11 +290,11 @@
 #define PANDEMIC 2
 
 //emote flags
-#define EMOTING_HIGH_FIVE  1
-#define EMOTING_FIST_BUMP  2
-#define EMOTING_HEADBUTT   3
-#define EMOTING_TAIL_SWIPE 4
-#define EMOTING_ROCK_PAPER_SCISSORS 5
+#define EMOTING_HIGH_FIVE  (1<<0)
+#define EMOTING_FIST_BUMP  (1<<1)
+#define EMOTING_HEADBUTT   (1<<2)
+#define EMOTING_TAIL_SWIPE (1<<3)
+#define EMOTING_ROCK_PAPER_SCISSORS (1<<4)
 
 //forcesay types
 #define SUDDEN 0

code/__DEFINES/mode.dm

@@ -86,6 +86,13 @@
 #define FLASH_OVERLAY_DARK 1 //Flashes your screen a dark grey.
 //=================================================
 
+#define NV_COLOR_GREEN "#39FF14"
+#define NV_COLOR_WHITE "#D3D3D3"
+#define NV_COLOR_ORANGE "#FFCC66"
+#define NV_COLOR_YELLOW "#FFFF66" //crazy ? i was crazy once
+#define NV_COLOR_RED "#FF3333"
+#define NV_COLOR_BLUE "#66CCFF"
+
 //=================================================
 #define CRIT_OVERLAY_WHITE 0 //Overlays your screen white.
 #define CRIT_OVERLAY_DARK 1 //Overlays your screen a dark grey.
@@ -113,12 +120,12 @@
 GLOBAL_LIST_INIT(ROLES_COMMAND, list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_CAS_PILOT, JOB_DROPSHIP_PILOT, JOB_TANK_CREW, JOB_DROPSHIP_CREW_CHIEF, JOB_POLICE, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_CHIEF_REQUISITION, JOB_CHIEF_ENGINEER, JOB_CMO, JOB_CHIEF_POLICE, JOB_SEA, JOB_SYNTH, JOB_WARDEN))
 
 //Marine roles
-#define ROLES_OFFICERS list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_CAS_PILOT, JOB_DROPSHIP_PILOT, JOB_TANK_CREW, JOB_DROPSHIP_CREW_CHIEF, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_SYNTH, JOB_SHIP_SYNTH, JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE)
+#define ROLES_OFFICERS list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_CAS_PILOT, JOB_DROPSHIP_PILOT, JOB_TANK_CREW, JOB_DROPSHIP_CREW_CHIEF, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_SYNTH, JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE)
 GLOBAL_LIST_INIT(ROLES_CIC, list(JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO))
 GLOBAL_LIST_INIT(ROLES_CIC_ANTAG, list(JOB_UPP_SRLT_OFFICER, JOB_UPP_KPT_OFFICER, JOB_UPP_CO_OFFICER, JOB_UPP_COMMISSAR))
-GLOBAL_LIST_INIT(ROLES_AUXIL_SUPPORT, list(JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_CAS_PILOT, JOB_DROPSHIP_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_TANK_CREW, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT))
+GLOBAL_LIST_INIT(ROLES_AUXIL_SUPPORT, list(JOB_AUXILIARY_OFFICER, JOB_SEA, JOB_INTEL, JOB_CAS_PILOT, JOB_DROPSHIP_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_TANK_CREW, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT))
 GLOBAL_LIST_INIT(ROLES_AUXIL_SUPPORT_ANTAG, list(JOB_UPP_CREWMAN, JOB_UPP_PILOT))
-GLOBAL_LIST_INIT(ROLES_MISC, list(JOB_SYNTH, JOB_SHIP_SYNTH, JOB_WORKING_JOE, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_MESS_SERGEANT, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH))
+GLOBAL_LIST_INIT(ROLES_MISC, list(JOB_SYNTH, JOB_WORKING_JOE, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_MESS_SERGEANT, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH))
 GLOBAL_LIST_INIT(ROLES_MISC_ANTAG, list(JOB_UPP_COMBAT_SYNTH, JOB_UPP_SUPPORT_SYNTH, JOB_UPP_JOE))
 GLOBAL_LIST_INIT(ROLES_POLICE, list(JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE))
 GLOBAL_LIST_INIT(ROLES_POLICE_ANTAG, list(JOB_UPP_POLICE))
@@ -274,15 +281,19 @@ DEFINE_BITFIELD(whitelist_status, list(
 #define FACTION_SOUTO "Souto Man"
 #define FACTION_COLONIST "Colonist"
 #define FACTION_YAUTJA "Yautja"
-#define FACTION_HUNTED "Hunted"
+#define FACTION_HUNTED "Hunted USCM"
+#define FACTION_HUNTED_CLF "Hunted CLF"
+#define FACTION_HUNTED_UPP "Hunted UPP"
+#define FACTION_HUNTED_TWE "Hunted TWE"
+#define FACTION_HUNTED_MERC "Hunted Mercs"
 #define FACTION_ZOMBIE "Zombie"
 #define FACTION_MONKEY "Monkey" // Nanu
 #define FACTION_FAX "Fax Responder"
 
 #define FACTION_LIST_MARINE list(FACTION_MARINE)
-#define FACTION_LIST_HUMANOID list(FACTION_MARINE, FACTION_PMC, FACTION_WY, FACTION_WY_DEATHSQUAD, FACTION_CLF, FACTION_CONTRACTOR, FACTION_MARSHAL, FACTION_UPP, FACTION_FREELANCER, FACTION_SURVIVOR, FACTION_NEUTRAL, FACTION_COLONIST, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_YAUTJA, FACTION_ZOMBIE, FACTION_TWE, FACTION_HUNTED, FACTION_FAX)
+#define FACTION_LIST_HUMANOID list(FACTION_MARINE, FACTION_PMC, FACTION_WY, FACTION_WY_DEATHSQUAD, FACTION_CLF, FACTION_CONTRACTOR, FACTION_MARSHAL, FACTION_UPP, FACTION_FREELANCER, FACTION_SURVIVOR, FACTION_NEUTRAL, FACTION_COLONIST, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_YAUTJA, FACTION_ZOMBIE, FACTION_TWE, FACTION_HUNTED, FACTION_HUNTED_CLF, FACTION_HUNTED_UPP, FACTION_HUNTED_TWE, FACTION_HUNTED_MERC, FACTION_FAX)
 #define FACTION_LIST_ERT_OTHER list(FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO)
-#define FACTION_LIST_ERT_ALL list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY, FACTION_CLF, FACTION_CONTRACTOR, FACTION_UPP, FACTION_FREELANCER, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_MARSHAL, FACTION_TWE, FACTION_HUNTED)
+#define FACTION_LIST_ERT_ALL list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY, FACTION_CLF, FACTION_CONTRACTOR, FACTION_UPP, FACTION_FREELANCER, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_MARSHAL, FACTION_TWE, FACTION_HUNTED, FACTION_HUNTED_CLF, FACTION_HUNTED_UPP, FACTION_HUNTED_TWE, FACTION_HUNTED_MERC)
 #define FACTION_LIST_WY list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY)
 #define FACTION_LIST_UPP list(FACTION_UPP)
 #define FACTION_LIST_CLF list(FACTION_CLF)
@@ -298,7 +309,7 @@ DEFINE_BITFIELD(whitelist_status, list(
 #define FACTION_LIST_MARINE_UPP list(FACTION_MARINE, FACTION_UPP)
 #define FACTION_LIST_MARINE_TWE list(FACTION_MARINE, FACTION_TWE)
 #define FACTION_LIST_YAUTJA list(FACTION_YAUTJA)
-#define FACTION_LIST_HUNTED list(FACTION_HUNTED)
+#define FACTION_LIST_HUNTED list(FACTION_HUNTED, FACTION_HUNTED_CLF, FACTION_HUNTED_UPP, FACTION_HUNTED_TWE, FACTION_HUNTED_MERC)
 
 // Xenomorphs
 #define FACTION_PREDALIEN "Predalien"

code/__DEFINES/paygrade_defs/weyland.dm

@@ -31,9 +31,12 @@
 /// WYC9, Chief Executive
 #define PAY_SHORT_WYC9 "WYC9"
 
-/// WYC10, Director
+/// WYC10, Deputy Director
 #define PAY_SHORT_WYC10 "WYC10"
 
+/// WYC11, Director
+#define PAY_SHORT_WYC11 "WYC11"
+
 // Weyland Yutani Private Military
 /// PMC-OP, Operator, standard PMC.
 #define PAY_SHORT_PMC_OP "PMC-OP"

code/__DEFINES/pred.dm

@@ -14,7 +14,7 @@
 #define SD_TYPE_BIG   0
 #define SD_TYPE_SMALL 1
 
-#define PRED_MASK_TYPE_MAX 19
-#define PRED_MASK_ACCESSORY_TYPE_MAX 1
+#define PRED_MASK_TYPE_MAX 20
+#define PRED_MASK_ACCESSORY_TYPE_MAX 3
 #define PRED_ARMOR_TYPE_MAX 8
 #define PRED_GREAVE_TYPE_MAX 4

code/__DEFINES/subsystems.dm

@@ -125,6 +125,7 @@
 #define SS_INIT_HUMANS  21
 #define SS_INIT_WHO 20
 #define SS_INIT_POWER   19
+#define SS_INIT_PREDSHIPS 18
 #define SS_INIT_INFLUXMCSTATS 12
 #define SS_INIT_INFLUXSTATS 11
 #define SS_INIT_LIGHTING 10
@@ -139,10 +140,9 @@
 #define SS_INIT_INTERIOR 2.7
 #define SS_INIT_TECHTREE    2.5
 #define SS_INIT_RADIO 2
+#define SS_INIT_ASSETS 1
 #define SS_INIT_TIMER   100
 #define SS_INIT_UNSPECIFIED 0
-#define SS_INIT_PREDSHIPS  -19
-#define SS_INIT_ASSETS -20
 #define SS_INIT_TICKER -21
 #define SS_INIT_VOTE   -23
 #define SS_INIT_DATABASE   -27