Merge remote-tracking branch 'cmss13-devs/master' into forest/brainslugs

.github/CODEOWNERS

@@ -24,6 +24,13 @@
 /tools/docker/ @Fira
 /Dockerfile @Fira
 
+# Forest2001
+
+/code/game/machinery/ARES @realforest2001
+/tgui/packages/tgui/interfaces/AresAdmin.jsx @realforest2001
+/tgui/packages/tgui/interfaces/AresInterface.jsx @realforest2001
+/tgui/packages/tgui/interfaces/WorkingJoe.jsx @realforest2001
+
 # Nanu
 
 /maps @Nanu308

code/__DEFINES/__game.dm

@@ -151,10 +151,11 @@
 /// Splits admin tabs in Statpanel
 #define SPLIT_ADMIN_TABS (1<<0)
 #define ADMIN_STEALTHMODE (1<<1)
+#define ADMIN_AFK_SAFE (1<<2)
 
 //=================================================
 
-#define TOGGLES_CHAT_DEFAULT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_LOOC|CHAT_GHOSTHIVEMIND)
+#define TOGGLES_CHAT_DEFAULT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_LOOC|CHAT_GHOSTHIVEMIND|CHAT_FFATTACKLOGS)
 
 #define TOGGLES_GHOST_DEFAULT (GHOST_HEALTH_SCAN)
 
@@ -166,7 +167,7 @@
 
 #define TOGGLES_ERT_DEFAULT (PLAY_LEADER|PLAY_MEDIC|PLAY_ENGINEER|PLAY_HEAVY|PLAY_SMARTGUNNER|PLAY_SYNTH|PLAY_MISC)
 
-#define TOGGLES_ADMIN_DEFAULT (NONE)
+#define TOGGLES_ADMIN_DEFAULT (ADMIN_AFK_SAFE)
 
 // Game Intents
 #define INTENT_HELP 1
@@ -186,6 +187,7 @@
 #define DOCK_ATTEMPT_TIMEOUT 20 SECONDS
 #define DROPSHIP_WARMUP_TIME 10 SECONDS
 #define DROPSHIP_DROP_MSG_DELAY 30 SECONDS
+#define DROPSHIP_DROP_FIRE_DELAY 20 SECONDS
 #define DROPSHIP_TRANSIT_DURATION 100 SECONDS
 #define DROPSHIP_CORSAT_DURATION 30 SECONDS
 #define ELEVATOR_TRANSIT_DURATION 5 SECONDS

code/__DEFINES/access.dm

@@ -147,10 +147,12 @@ most of them are tied into map-placed objects. This should be reworked in the fu
 // Yautja Access Levels
 /// Requires a visible ID chip to open
 #define ACCESS_YAUTJA_SECURE 390
+/// Elites+ only
+#define ACCESS_YAUTJA_ELITE 391
 /// Elders+ only
-#define ACCESS_YAUTJA_ELDER 391
+#define ACCESS_YAUTJA_ELDER 392
 /// Ancients only
-#define ACCESS_YAUTJA_ANCIENT 392
+#define ACCESS_YAUTJA_ANCIENT 393
 
 /// Anything in a tutorial sequence that shouldn't be accessed
 #define ACCESS_TUTORIAL_LOCKED 998

code/__DEFINES/client_prefs.dm

@@ -36,6 +36,7 @@
 #define TOGGLE_LATE_JOIN_CURRENT_SLOT (1<<17) //Whether joining during the round ignores assigned character slot for the job and uses currently selected slot.
 #define TOGGLE_ABILITY_DEACTIVATION_OFF (1<<18) // This toggles whether selecting the same ability again can toggle it off
 #define TOGGLE_AMMO_DISPLAY_TYPE (1<<19)/// limit how often the ammo is displayed when using semi-automatic fire
+#define TOGGLE_AUTO_SHOVE_OFF (1<<20) /// Toggles between automatically shoving xenomorphs in the way as Queen.
 
 #define JOB_SLOT_RANDOMISED_SLOT -1
 #define JOB_SLOT_CURRENT_SLOT 0

code/__DEFINES/cooldowns.dm

@@ -5,6 +5,8 @@
 #define COOLDOWN_ITEM_HOOD_SOUND "item_hood_sound"
 #define COOLDOWN_LIGHT "cooldown_light"
 
+#define COOLDOWN_PRINTER_ERROR "cooldown_printer_error"
+
 //Define for ship alt
 #define COOLDOWN_ALTITUDE_CHANGE "altitude_change"
 

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

@@ -0,0 +1,2 @@
+/// From /area/proc/purge_weeds()
+#define COMSIG_AREA_RESIN_DISALLOWED "area_weeds_disallowed"

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

@@ -2,6 +2,10 @@
 // Sent after the limb has taken damage
 #define COMSIG_LIMB_TAKEN_DAMAGE "limb_taken_damage"
 
+// From /datum/effects/bleeding/internal/process_mob() and /datum/effects/bleeding/external/process_mob()
+#define COMSIG_BLEEDING_PROCESS "bleeding_process"
+	#define COMPONENT_BLEEDING_CANCEL (1<<0)
+
 /// From /obj/effect/alien/weeds/Initialize()
 #define COMSIG_WEEDNODE_GROWTH_COMPLETE "weednode_growth_complete"
 /// From /obj/effect/alien/weeds/Initialize()

code/__DEFINES/equipment.dm

@@ -178,7 +178,9 @@
 /// 2 tiles of full and 2 of partial impairment
 #define VISION_IMPAIR_STRONG 5
 /// 3 tiles of full and 2 of partial impairment (original one)
-#define VISION_IMPAIR_MAX 6
+#define VISION_IMPAIR_ULTRA 6
+/// Full blindness, 1 tile visibility
+#define VISION_IMPAIR_MAX 7
 
 //VISION IMPAIRMENT LEVELS===========================================================================
 
@@ -467,6 +469,8 @@ GLOBAL_LIST_INIT(slot_to_contained_sprite_shorthand, list(
 #define ACCESSORY_SLOT_DECOR "Decor"
 #define ACCESSORY_SLOT_MEDAL "Medal"
 #define ACCESSORY_SLOT_PONCHO "Ponchos"
+#define ACCESSORY_SLOT_TROPHY "Trophy"
+#define ACCESSORY_SLOT_MASK "Mask"
 
 /// Used for uniform armor inserts.
 #define ACCESSORY_SLOT_ARMOR_C "Chest armor"
@@ -541,7 +545,7 @@ GLOBAL_LIST_INIT(uniform_categories, list(
 #define STORAGE_ALLOW_QUICKDRAW (1<<11) // Whether the storage can be drawn with E or Holster verb
 
 #define STORAGE_FLAGS_DEFAULT (STORAGE_SHOW_FULLNESS|STORAGE_GATHER_SIMULTAENOUSLY|STORAGE_ALLOW_EMPTY)
-#define STORAGE_FLAGS_BOX (STORAGE_FLAGS_DEFAULT^STORAGE_ALLOW_EMPTY)
+#define STORAGE_FLAGS_BOX (STORAGE_FLAGS_DEFAULT)
 #define STORAGE_FLAGS_BAG (STORAGE_QUICK_GATHER|STORAGE_QUICK_EMPTY|STORAGE_CLICK_GATHER|STORAGE_FLAGS_DEFAULT)
 #define STORAGE_FLAGS_POUCH (STORAGE_FLAGS_DEFAULT|STORAGE_ALLOW_DRAWING_METHOD_TOGGLE)
 

code/__DEFINES/flags.dm

@@ -33,6 +33,8 @@
 #define EMOTE_IMPORTANT (1<<2)
 /// Does the emote not have a message?
 #define EMOTE_NO_MESSAGE (1<<3)
+///	Can only code call this event instead of the player.
+#define EMOTE_FORCED_AUDIO (1<<4)
 
 // Bitflags for Working Joe emotes
 /// Working Joe emote

code/__DEFINES/hud.dm

@@ -25,3 +25,9 @@
 #define NOTIFY_JOIN_XENO "join_xeno"
 #define NOTIFY_XENO_TACMAP "xeno_tacmap"
 #define NOTIFY_USCM_TACMAP "uscm_tacmap"
+
+#define INHERENT_HUD_MEDICAL "med"
+#define INHERENT_HUD_SECURITY "sec"
+#define INHERENT_HUD_NEW_PLAYER "new"
+
+#define HUD_MENTOR_SIGHT "New Player Markers"

code/__DEFINES/human.dm

@@ -142,10 +142,10 @@
 #define SUIT_SQUAD_LAYER 28
 #define GLASSES_LAYER 27
 #define BELT_LAYER 26
-#define SUIT_STORE_LAYER 25
-#define BACK_LAYER 24
-#define HAIR_LAYER 23
-#define HAIR_GRADIENT_LAYER 22
+#define BACK_LAYER 25
+#define HAIR_LAYER 24
+#define HAIR_GRADIENT_LAYER 23
+#define SUIT_STORE_LAYER 22
 #define FACIAL_LAYER 21
 #define EARS_LAYER 20
 #define FACEMASK_LAYER 19
@@ -191,6 +191,7 @@
 #define SYNTH_GEN_ONE "First Generation Synthetic"
 #define SYNTH_GEN_TWO "Second Generation Synthetic"
 #define SYNTH_GEN_THREE "Third Generation Synthetic"
+#define SYNTH_K9 "Synthetic K9"
 
 #define PLAYER_SYNTHS list(SYNTH_GEN_ONE, SYNTH_GEN_TWO, SYNTH_GEN_THREE)
 #define SYNTH_TYPES list(SYNTH_COLONY, SYNTH_COLONY_GEN_ONE, SYNTH_COLONY_GEN_TWO, SYNTH_COMBAT, SYNTH_INFILTRATOR, SYNTH_WORKING_JOE, SYNTH_GEN_ONE, SYNTH_GEN_TWO, SYNTH_GEN_THREE)

code/__DEFINES/job.dm

@@ -67,6 +67,7 @@ GLOBAL_LIST_INIT(job_squad_roles, JOB_SQUAD_ROLES_LIST)
 #define JOB_COMBAT_REPORTER "Combat Correspondent"
 #define JOB_MESS_SERGEANT "Mess Technician"
 #define JOB_SYNTH "Synthetic"
+#define JOB_SYNTH_K9 "Synthetic K9"
 #define JOB_WORKING_JOE "Working Joe"
 
 #define JOB_CO "Commanding Officer"
@@ -260,29 +261,35 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 #define JOB_FORECON_SMARTGUNNER "Reconnaissance Smartgunner"
 
 //-------- UPP --------//
-#define JOB_UPP "UPP Private"
+#define JOB_UPP	"UPP Ryadovoy"
 #define JOB_UPP_CONSCRIPT "UPP Conscript"
-#define JOB_UPP_ENGI "UPP Korporal Sapper"
-#define JOB_UPP_MEDIC "UPP Korporal Medic"
+#define JOB_UPP_ENGI "UPP MSzht Engineer"
+#define JOB_UPP_MEDIC "UPP MSzht Medic"
 #define JOB_UPP_SPECIALIST "UPP Serzhant"
-#define JOB_UPP_LEADER "UPP Master Serzhant"
+#define JOB_UPP_LEADER "UPP Starshiy Serzhant"
 #define JOB_UPP_POLICE "UPP Politsiya"
+#define JOB_UPP_LT_OFFICER "UPP Mladshiy Leytenant"
 #define JOB_UPP_SUPPLY "UPP Logistics Technician"
-#define JOB_UPP_LT_OFFICER "UPP Leytenant"
 #define JOB_UPP_LT_DOKTOR "UPP Leytenant Doktor"
-#define JOB_UPP_SRLT_OFFICER "UPP Senior Leytenant"
+#define JOB_UPP_SRLT_OFFICER "UPP Starshiy Leytenant"
 #define JOB_UPP_KPT_OFFICER "UPP Kapitan"
 #define JOB_UPP_MAY_OFFICER "UPP Mayjor"
-#define JOB_UPP_LTKOL_OFFICER "UPP Leytenant Kolonel"
-#define JOB_UPP_KOL_OFFICER "UPP Kolonel"
-#define JOB_UPP_MAY_GENERAL "UPP Mayjor General"
-#define JOB_UPP_LT_GENERAL "UPP Leytenant General"
-#define JOB_UPP_GENERAL "UPP Army General"
+#define JOB_UPP_LTKOL_OFFICER "UPP Podpolkovnik"
+#define JOB_UPP_KOL_OFFICER "UPP Polkovnik"
+#define JOB_UPP_BRIG_GENERAL "UPP General Mayjor"
+#define JOB_UPP_MAY_GENERAL "UPP General Leytenant"
+#define JOB_UPP_LT_GENERAL "UPP General Polkovnik"
+#define JOB_UPP_GENERAL "UPP General Armii"
+#define SQUAD_UPP_1 "Akula"
+#define SQUAD_UPP_2 "Bizon"
+#define SQUAD_UPP_3 "Chayka"
+#define SQUAD_UPP_4 "Delfin"
+#define SQUAD_UPP_5 "UPPKdo"
 
 #define JOB_UPP_COMBAT_SYNTH "UPP Combat Synthetic"
 #define JOB_UPP_SUPPORT_SYNTH "UPP Support Synthetic"
 
-#define UPP_JOB_LIST list(JOB_UPP, JOB_UPP_ENGI, JOB_UPP_MEDIC, JOB_UPP_SPECIALIST, JOB_UPP_LEADER, JOB_UPP_POLICE, JOB_UPP_LT_OFFICER, JOB_UPP_LT_DOKTOR, JOB_UPP_SRLT_OFFICER, JOB_UPP_KPT_OFFICER, JOB_UPP_KOL_OFFICER, JOB_UPP_COMBAT_SYNTH)
+#define UPP_JOB_LIST list(JOB_UPP, JOB_UPP_ENGI, JOB_UPP_MEDIC, JOB_UPP_SPECIALIST, JOB_UPP_LEADER, JOB_UPP_POLICE, JOB_UPP_LT_OFFICER, JOB_UPP_LT_DOKTOR, JOB_UPP_SUPPLY, JOB_UPP_SRLT_OFFICER, JOB_UPP_KPT_OFFICER, JOB_UPP_KOL_OFFICER,  JOB_UPP_SUPPORT_SYNTH,JOB_UPP_COMMISSAR)
 #define UPP_JOB_GRUNT_LIST list(JOB_UPP, JOB_UPP_ENGI, JOB_UPP_MEDIC, JOB_UPP_SPECIALIST, JOB_UPP_LEADER, JOB_UPP_POLICE, JOB_UPP_CREWMAN)
 
 #define JOB_UPP_COMMANDO "UPP Junior Kommando"

code/__DEFINES/keybinding.dm

@@ -49,15 +49,15 @@
 #define COMSIG_KB_HUMAN_ISSUE_ORDER_MOVE "keybinding_human_issue_order_move"
 #define COMSIG_KB_HUMAN_ISSUE_ORDER_HOLD "keybinding_human_issue_order_hold"
 #define COMSIG_KB_HUMAN_ISSUE_ORDER_FOCUS "keybinding_human_issue_order_focus"
-
 #define COMSIG_KB_HUMAN_SPECIALIST_ACTIVATION_ONE "keybinding_human_specialist_activation_one"
 #define COMSIG_KB_HUMAN_SPECIALIST_ACTIVATION_TWO "keybinding_human_specialist_activation_two"
-
 #define COMSIG_KB_HUMAN_ROTATE_CHAIR "keybinding_human_rotate_chair"
-
 #define COMSIG_KB_HUMAN_SHOW_HELD_ITEM "keybinding_human_show_held_item"
-
 #define COMSIG_KB_HUMAN_CYCLE_HELMET_HUD "keybinding_human_cycle_helmet_hud"
+#define COMSIG_KB_HUMAN_PIXEL_SHIFT_GRABBED_NORTH "keybinding_human_pixel_shift_grabbed_north"
+#define COMSIG_KB_HUMAN_PIXEL_SHIFT_GRABBED_SOUTH "keybinding_human_pixel_shift_grabbed_south"
+#define COMSIG_KB_HUMAN_PIXEL_SHIFT_GRABBED_EAST "keybinding_human_pixel_shift_grabbed_east"
+#define COMSIG_KB_HUMAN_PIXEL_SHIFT_GRABBED_WEST "keybinding_human_pixel_shift_grabbed_west"
 
 // Human Inventory Navigation
 #define COMSIG_KB_HUMAN_INTERACT_OTHER_HAND "keybinding_human_interact_other_hand"
@@ -178,7 +178,7 @@
 // Yautja Bracer
 #define COMSIG_KB_YAUTJA_TOGGLE_NOTIFICATION_SOUND "keybinding_yautja_toggle_notification_sound"
 #define COMSIG_KB_YAUTJA_BRACER_MESSAGE "keybinding_yautja_bracer_message"
-#define COMSIG_KB_YAUTJA_WRISTBLADES "keybinding_yautja_wristblades"
+#define COMSIG_KB_YAUTJA_BRACER_ATTACHMENT "keybinding_yautja_bracer_attachement"
 #define COMSIG_KB_YAUTJA_TRACK_GEAR "keybinding_yautja_track_gear"
 #define COMSIG_KB_YAUTJA_CLOAKER "keybinding_yautja_cloaker"
 #define COMSIG_KB_YAUTJA_CASTER "keybinding_yautja_caster"

code/__DEFINES/language.dm

@@ -3,6 +3,7 @@
 #define LANGUAGE_CHINESE "Chinese"
 #define LANGUAGE_RUSSIAN "Russian"
 #define LANGUAGE_GERMAN "German"
+#define LANGUAGE_SCANDINAVIAN "Scandinavian"
 #define LANGUAGE_SPANISH "Spanish"
 #define LANGUAGE_TSL "Tactical Sign Language"
 #define LANGUAGE_YAUTJA "Sainja"
@@ -17,11 +18,11 @@
 #define LANGUAGE_TELEPATH "Telepath Implant"
 #define LANGUAGE_BORER "Cortical Link"
 
-#define ALL_HUMAN_LANGUAGES list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_SPANISH)
+#define ALL_HUMAN_LANGUAGES list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_SCANDINAVIAN, LANGUAGE_SPANISH)
 
-#define ALL_SYNTH_LANGUAGES list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_SPANISH, LANGUAGE_YAUTJA, LANGUAGE_XENOMORPH)
+#define ALL_SYNTH_LANGUAGES list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_SCANDINAVIAN, LANGUAGE_SPANISH, LANGUAGE_YAUTJA, LANGUAGE_XENOMORPH)
 
-#define ALL_SYNTH_LANGUAGES_UPP list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_GERMAN, LANGUAGE_SPANISH, LANGUAGE_YAUTJA, LANGUAGE_XENOMORPH)
+#define ALL_SYNTH_LANGUAGES_UPP list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_GERMAN, LANGUAGE_SCANDINAVIAN, LANGUAGE_SPANISH, LANGUAGE_YAUTJA, LANGUAGE_XENOMORPH)
 
 //Chinese language sound bitflags
 

code/__DEFINES/machinery.dm

@@ -16,3 +16,6 @@
 #define DEFENDER_MODE "Xenomorph Defenders"
 #define RAVAGER_MODE "Xenomorph Ravagers"
 #define CRUSHER_MODE "Xenomorph Crushers"
+#define WARRIOR_MODE "Xenomorph Warriors"
+#define PRAETORIAN_MODE "Xenomorph Praetorians"
+#define BOILER_MODE "Xenomorph Boilers"

code/__DEFINES/maps.dm

@@ -120,3 +120,8 @@ require only minor tweaks.
 
 /// A map key that corresponds to being one exclusively for Space.
 #define SPACE_KEY "space"
+
+#define SENTRY_TOP_LEFT "top_left"
+#define SENTRY_TOP_RIGHT "top_right"
+#define SENTRY_BOTTOM_LEFT "bottom_left"
+#define SENTRY_BOTTOM_RIGHT "bottom_right"

code/__DEFINES/minimap.dm

@@ -1,4 +1,3 @@
-
 #define MINIMAP_FLAG_XENO (1<<0)
 #define MINIMAP_FLAG_USCM (1<<1)
 #define MINIMAP_FLAG_PMC (1<<2)
@@ -17,12 +16,15 @@
 #define MINIMAP_FLAG_XENO_RENEGADE (1<<15)
 #define MINIMAP_FLAG_ALL (1<<16) - 1
 
-///Converts the overworld x and y to minimap x and y values
+///The minimap zoom scale
 #define MINIMAP_SCALE 2
+///Converts the overworld x and y to minimap x and y values
 #define MINIMAP_PIXEL_FROM_WORLD(val) (val * MINIMAP_SCALE - 3)
 
-//actual size of a users screen in pixels
+///The actual size of a users screen in pixels
 #define SCREEN_PIXEL_SIZE 480
+///The actual size of the minimap in pixels
+#define MINIMAP_PIXEL_SIZE 512
 
 GLOBAL_LIST_INIT(all_minimap_flags, bitfield2list(MINIMAP_FLAG_ALL))
 
@@ -49,10 +51,14 @@ GLOBAL_LIST_INIT(all_minimap_flags, bitfield2list(MINIMAP_FLAG_ALL))
 #define MINIMAP_AREA_COMMAND "#2d3fa2ee"
 #define MINIMAP_AREA_COMMAND_CAVE "#132242ee"
 #define MINIMAP_AREA_CAVES "#3f3c3cef"
+#define MINIMAP_AREA_CAVES_DEEP "#272525ef"
+#define MINIMAP_AREA_CAVES_STRUCTURE "#5b5757"
 #define MINIMAP_AREA_JUNGLE "#2b5b2bee"
 #define MINIMAP_AREA_COLONY "#6c6767d8"
 #define MINIMAP_AREA_LZ "#ebe5e5e3"
 #define MINIMAP_AREA_CONTESTED_ZONE "#0603c4ee"
+#define MINIMAP_AREA_GLASS "#80a0b0ee"
+#define MINIMAP_AREA_MINING "#4d3619e7"
 
 #define MINIMAP_SQUAD_UNKNOWN "#d8d8d8"
 #define MINIMAP_SQUAD_ALPHA "#ed1c24"
@@ -64,18 +70,6 @@ GLOBAL_LIST_INIT(all_minimap_flags, bitfield2list(MINIMAP_FLAG_ALL))
 #define MINIMAP_SQUAD_SOF "#400000"
 #define MINIMAP_SQUAD_INTEL "#053818"
 
-#define MINIMAP_ICON_BACKGROUND_CIVILIAN "#7D4820"
-#define MINIMAP_ICON_BACKGROUND_CIC "#3f3f3f"
-#define MINIMAP_ICON_BACKGROUND_USCM "#888888"
-#define MINIMAP_ICON_BACKGROUND_XENO "#3a064d"
-
-#define MINIMAP_ICON_COLOR_COMMANDER "#c6fcfc"
-#define MINIMAP_ICON_COLOR_HEAD "#F0C542"
-#define MINIMAP_ICON_COLOR_BRONZE "#eb9545"
-
-#define MINIMAP_ICON_COLOR_DOCTOR "#b83737"
-
-
 //Prison
 #define MINIMAP_AREA_CELL_MAX "#570101ee"
 #define MINIMAP_AREA_CELL_HIGH "#a54b01ee"

code/__DEFINES/misc.dm

@@ -47,6 +47,8 @@
 #define AREA_CONTAINMENT (1<<3)
 /// Flags the area as permanently unweedable. Still requires is_resin_allowed = FALSE
 #define AREA_UNWEEDABLE (1<<4)
+/// Flags the area as having purpose by the Yautja, and exempt from gear tracking.
+#define AREA_YAUTJA_GROUNDS (1<<5)
 /// Default number of ticks for do_after
 #define DA_DEFAULT_NUM_TICKS 5
 

code/__DEFINES/mob_hud.dm

@@ -27,7 +27,8 @@
 #define HUNTER_CLAN "25" //Displays a colored icon to represent ingame Hunter Clans
 #define HUNTER_HUD "26" //Displays various statuses on mobs for Hunters to identify targets
 #define HOLOCARD_HUD "27" //Displays the holocards set by medical personnel
-#define HUD_BRAINWORM "28" //Displays infested HUD for brainworms.
+#define NEW_PLAYER_HUD "29" //Makes it easy to see new players.
+#define HUD_BRAINWORM "30" //Displays infested HUD for brainworms.
 
 //data HUD (medhud, sechud) defines
 #define MOB_HUD_SECURITY_BASIC 1
@@ -48,7 +49,8 @@
 #define MOB_HUD_HUNTER 16
 #define MOB_HUD_HUNTER_CLAN 17
 #define MOB_HUD_EXECUTE 18
-#define MOB_HUD_BRAINWORM 19
+#define MOB_HUD_NEW_PLAYER 19
+#define MOB_HUD_BRAINWORM 20
 
 //for SL/FTL/LZ targeting on locator huds
 #define TRACKER_SL "track_sl"

code/__DEFINES/mobs.dm

@@ -218,6 +218,7 @@
 #define SPECIAL_BONEBREAK (1<<13) //species do not get their bonebreak chance modified by endurance
 #define NO_SHRAPNEL (1<<14)
 #define HAS_HARDCRIT (1<<15)
+#define NO_OVERLAYS (1<<16) // Stop OnMob overlays from appearing on sprite
 
 //=================================================
 
@@ -346,6 +347,7 @@ GLOBAL_LIST_INIT(default_xeno_onmob_icons, list(
 #define SPECIES_HUMAN "Human"
 #define SPECIES_YAUTJA "Yautja"
 #define SPECIES_SYNTHETIC "Synthetic"
+#define SPECIES_SYNTHETIC_K9 "Synthetic K9"
 #define SPECIES_MONKEY "Monkey"
 #define SPECIES_ZOMBIE "Zombie"