Merge branch 'master' into fantasystation

.github/CODEOWNERS

@@ -3,222 +3,3 @@
 # This list is alphabetized by User -> Filename and separated into sections for Maintainers/Contributors KEEP IT THAT WAY
 # In the event that people are to be informed of changes
 # to the same file or dir, add them to the end of under Multiple Owners
-
-# MAINTAINERS
-
-# Dominion/Cyberboss
-
-/.github/workflows/update_tgs_dmapi.yml @Cyberboss
-/.tgs.yml @Cyberboss
-/code/world.dm @Cyberboss
-/code/__DEFINES/tgs.config.dm @Cyberboss
-/code/__DEFINES/tgs.dm @Cyberboss
-/code/__DEFINES/_globals.dm @Cyberboss
-/code/__HELPERS/chat.dm @Cyberboss
-/code/__HELPERS/jatum.dm @Cyberboss
-/code/game/world.dm @Cyberboss
-/code/controllers/subsystem/atoms.dm @Cyberboss
-/code/controllers/globals.dm @Cyberboss
-/code/datums/helper_datums/getrev.dm @Cyberboss
-/code/modules/tgs/ @Cyberboss
-/code/ze_genesis_call/ @Cyberboss
-/tools/tgs_test/ @Cyberboss
-
-# Cobby
-
-/code/modules/reagents/ @ExcessiveUseOfCobblestone
-/code/modules/research/designs/medical_designs.dm @ExcessiveUseOfCobblestone
-/code/game/objects/items/storage/medkit.dm @ExcessiveUseOfCobblestone
-
-# Fikou
-
-/code/modules/awaymissions/ @Fikou
-/code/modules/mining/ @Fikou
-/code/modules/mod/ @Fikou
-/code/modules/mapfluff/ruins/lavalandruin_code/ @Fikou
-/code/modules/mapfluff/ruins/lavaland_ruin_code.dm @Fikou
-
-# JohnFulpWizard
-
-/code/modules/mob/living/simple_animal/bot/ @JohnFulpWillard
-/code/modules/modular_computers/ @JohnFulpWillard
-
-# Kylerace
-
-/code/__DEFINES/spatial_gridmap.dm @Kylerace
-/code/controllers/subsystem/spatial_gridmap.dm @Kylerace
-
-# LemonInTheDark
-
-/.github/guides/VISUALS.md @LemonInTheDark
-/code/_onclick/hud/ @LemonInTheDark
-/code/__DEFINES/layers.dm @LemonInTheDark
-
-# Mothblocks
-
-/.github/workflows/ @Mothblocks
-/code/game/gamemodes/ @Mothblocks
-/code/modules/autowiki/ @Mothblocks
-/code/modules/unit_tests/ @Mothblocks
-/code/modules/client/preferences/ @Mothblocks
-/code/modules/client/preferences_menu.dm @Mothblocks
-/tgui/packages/tgui/interfaces/PreferencesMenu/ @Mothblocks
-/tools/ezdb/ @Mothblocks
-/tools/maplint/source/ @Mothblocks
-/tools/pull_request_hooks/ @Mothblocks
-/tools/screenshot-test-comparison/ @Mothblocks
-/tools/test_merge_bot/ @Mothblocks
-
-# MrMelbert
-
-/code/modules/hydroponics/ @MrMelbert
-
-# ninjanomnom
-
-/code/controllers/subsystem/dcs.dm @ninjanomnom
-/code/datums/signals.dm @ninjanomnom
-/code/datums/components/_component.dm @ninjanomnom
-/code/datums/elements/_element.dm @ninjanomnom
-/code/datums/greyscale/_greyscale_config.dm @ninjanomnom
-/code/datums/greyscale/json_reader.dm @ninjanomnom
-/code/datums/greyscale/layer.dm @ninjanomnom
-
-# Ryll-Ryll/Shaps
-
-/code/datums/wounds/ @Ryll-Ryll
-/code/datums/status_effects/wound_effects.dm @Ryll-Ryll
-/code/__DEFINES/wounds.dm @Ryll-Ryll
-
-# san7890
-
-/code/game/area/ @san7890
-/icons/area/ @san7890
-
-# stylemistake
-
-/code/__DEFINES/chat.dm @stylemistake
-/code/__DEFINES/tgui.dm @stylemistake
-/code/controllers/subsystem/chat.dm @stylemistake
-/code/controllers/subsystem/ping.dm @stylemistake
-/code/controllers/subsystem/tgui.dm @stylemistake
-/code/modules/tgchat/ @stylemistake
-/code/modules/tgui/ @stylemistake
-/code/modules/tgui_panel/ @stylemistake
-/tgui/ @stylemistake
-
-# stylemistake (explicitly disowned)
-
-/tgui/packages/tgui/interfaces/
-/tgui/packages/tgui/styles/interfaces/
-/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
-/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
-
-# SuperNovaa41
-
-/code/modules/forensics/ @SuperNovaa41
-/code/datums/mood.dm @SuperNovaa41
-
-# Time-Green
-
-/code/modules/plumbing/ @Time-Green
-/code/modules/surgery/organs/external/ @Time-Green
-
-# tralezab
-/code/__DEFINES/basic_mobs.dm @tralezab
-/code/datums/ai/ @tralezab
-/code/modules/religion/ @tralezab
-
-# Watermelon914
-
-/code/modules/wiremod/ @Watermelon914
-/code/modules/antagonists/traitor/ @Watermelon914
-/code/controllers/subsystem/tts.dm @Watermelon914
-
-# ZephyrTFA
-
-/code/__HELPERS/admin_verb.dm @ZephyrTFA
-/code/controllers/subsystem/admin_verbs.dm @ZephyrTFA
-/code/datums/json_savefile.dm @ZephyrTFA
-/code/datums/armor/ @ZephyrTFA
-/code/modules/admin/verbs/ @ZephyrTFA
-/code/modules/logging/ @ZephyrTFA
-/tools/ci/check_grep.sh @ZephyrTFA
-
-
-# CONTRIBUTORS
-
-# Jordie0608
-
-/code/controllers/subsystem/dbcore.dm @Jordie0608
-/tools/SQLAlertEmail/ @Jordie0608
-
-# Kapu1178
-
-/code/modules/surgery/bodyparts/ @Kapu1178
-/code/modules/surgery/organs/ @Kapu1178
-/code/modules/mob/living/carbon/carbon_update_icons.dm @Kapu1178
-/code/modules/mob/living/carbon/human/human_update_icons.dm @Kapu1178
-
-# MrStonedOne
-
-/code/__DEFINES/MC.dm @MrStonedOne
-/code/controllers/admin.dm @MrStonedOne
-/code/controllers/master.dm @MrStonedOne
-/code/controllers/failsafe.dm @MrStonedOne
-/code/controllers/subsystem.dm @MrStonedOne
-/code/controllers/subsystem/timer.dm @MrStonedOne
-/code/controllers/configuration/entries @MrStonedOne
-/config/ @MrStonedOne
-
-# NamelessFairy
-
-/code/modules/capture_the_flag/ @NamelessFairy
-/_maps/map_files/CTF/ @NamelessFairy
-
-# Pickle-Coding
-
-/code/__DEFINES/atmospherics/ @Pickle-Coding
-/code/__DEFINES/reactions.dm @Pickle-Coding
-/code/modules/atmospherics/ @Pickle-Coding
-/code/modules/power/ @Pickle-Coding
-
-# MULTIPLE OWNERS
-
-/SQL/ @Jordie0608 @MrStonedOne
-
-/_maps/ @EOBGames @Maurukas @MMMiracles @san7890 @ShizCalev
-
-/icons/ @Imaginos16 @Krysonism @Twaticus @Wallemations
-/icons/ass/ @Ghilker @tralezab
-
-/code/__DEFINES/atmospherics/ @Ghilker @LemonInTheDark
-
-/code/__HELPERS/logging/ @dragomagol @ZephyrTFA
-
-/code/controllers/subsystem/air.dm @LemonInTheDark @MrStonedOne
-
-/code/modules/atmospherics/ @Ghilker @LemonInTheDark
-
-/code/modules/client/preferences.dm @Mothblocks @ZephyrTFA
-/code/modules/client/preferences_savefile.dm @Mothblocks @ZephyrTFA
-
-/code/modules/jobs/job_types/chief_medical_officer.dm @ExcessiveUseOfCobblestone @Ryll-Ryll
-/code/modules/jobs/job_types/medical_doctor.dm @ExcessiveUseOfCobblestone @Ryll-Ryll
-/code/modules/jobs/job_types/paramedic.dm @ExcessiveUseOfCobblestone @Ryll-Ryll
-
-/code/modules/mob/living/basic/ @Jacquerel @san7890 @tralezab
-
-/code/modules/surgery/ @ExcessiveUseOfCobblestone @Ryll-Ryll
-
-/tools/build/ @MrStonedOne @stylemistake
-/tools/tgs_scripts/ @Cyberboss @MrStonedOne
-
-/tools/WebhookProcessor/ @BraveMole @TiviPlus
-
-# Expensive files that touching basically always cause performance problems
-## Init times
-**/*_EXPENSIVE.dm @Mothblocks @LemonInTheDark
-
-# SIC SEMPER TYRANNIS
-
-/code/modules/hydroponics/grown/citrus.dm @optimumtact

_maps/shuttles/emergency_cruise.dmm

@@ -1648,7 +1648,7 @@
 /turf/open/floor/carpet/executive,
 /area/shuttle/escape)
 "Jl" = (
-/mob/living/simple_animal/bot/vibebot,
+/mob/living/basic/bot/vibebot,
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "Jo" = (

code/__DEFINES/ai/bot_keys.dm

@@ -109,3 +109,16 @@ DEFINE_BITFIELD(honkbot_flags, list(
 ///key that holds our honk ability
 #define BB_HONK_ABILITY "honk_ability"
 
+//vibebots
+///key that holds our partying ability
+#define BB_VIBEBOT_PARTY_ABILITY "party_ability"
+///key that holds our birthday song
+#define BB_VIBEBOT_BIRTHDAY_SONG "birthday_song"
+///key that holds happy songs we play to depressed targets
+#define BB_VIBEBOT_HAPPY_SONG "happy_song"
+///key that holds grim song we play when emagged
+#define BB_VIBEBOT_GRIM_SONG "GRIM_song"
+///key that holds neutral targets we vibe with
+#define BB_VIBEBOT_PARTY_TARGET "party_target"
+///key that holds our instrument
+#define BB_VIBEBOT_INSTRUMENT "instrument"

code/__DEFINES/atom_hud.dm

@@ -81,6 +81,7 @@
 #define SECHUD_ASSISTANT "hudassistant"
 #define SECHUD_ATMOSPHERIC_TECHNICIAN "hudatmospherictechnician"
 #define SECHUD_BARTENDER "hudbartender"
+#define SECHUD_BITAVATAR "hudbitavatar"
 #define SECHUD_BITRUNNER "hudbitrunner"
 #define SECHUD_BOTANIST "hudbotanist"
 #define SECHUD_BRIDGE_ASSISTANT "hudbridgeassistant"

code/__DEFINES/mobs.dm

@@ -309,7 +309,7 @@
 #define SLIME_EVOLUTION_THRESHOLD 10
 
 //Slime evolution cost in nutrition
-#define SLIME_EVOLUTION_COST 200
+#define SLIME_EVOLUTION_COST 100
 
 //Slime extract crossing. Controls how many extracts is required to feed to a slime to core-cross.
 #define SLIME_EXTRACT_CROSSING_REQUIRED 10

code/__DEFINES/obj_flags.dm

@@ -87,6 +87,8 @@
 #define INEDIBLE_CLOTHING (1<<16)
 /// Headgear/helmet allows internals
 #define HEADINTERNALS (1<<17)
+/// Prevents masks from getting adjusted from enabling internals
+#define INTERNALS_ADJUST_EXEMPT (1<<18)
 
 /// Integrity defines for clothing (not flags but close enough)
 #define CLOTHING_PRISTINE 0 // We have no damage on the clothing

code/__DEFINES/research/slimes.dm

@@ -11,15 +11,15 @@
 #define SLIME_MAX_POWER 10
 
 ///The maximum amount of nutrition a slime can contain
-#define SLIME_MAX_NUTRITION 1000
+#define SLIME_MAX_NUTRITION 200
 ///The starting nutrition of a slime
-#define SLIME_STARTING_NUTRITION 700
+#define SLIME_STARTING_NUTRITION 100
 /// Above it we grow our amount_grown and our power_level, below it we can eat
-#define SLIME_GROW_NUTRITION 800
+#define SLIME_GROW_NUTRITION 150
 /// Below this, we feel hungry
-#define SLIME_HUNGER_NUTRITION 500
+#define SLIME_HUNGER_NUTRITION 50
 /// Below this, we feel starving
-#define SLIME_STARVE_NUTRITION 200
+#define SLIME_STARVE_NUTRITION 10
 
 ///The slime is not hungry. It might try to feed anyways.
 #define SLIME_HUNGER_NONE 0

code/__DEFINES/song.dm

@@ -15,3 +15,9 @@
 #define MONKEY_SONG "BPM: 200\nC4/0,14,C,A4-F2,F3,A3,F-F2,A-F,F4,G4,F,D4-Bb2-G2\nD3,G3,D-G2,G3-G2,D,D4-G3,D,B4-B2,G,B3,G-B2,B3-B2\nG4,A4,G,E4-C3,E3,G3,E-C,G-C,E,E4-G,E,C5-E-A3,C4\nA-E3,C,E4-C3,A4-C4,B4-A3-A2,C5-C4,D5-F-B3,D4,B-F3\nD,F4-D3,D4,F-B-B2,G4-D,A4-C-F3,F,C/2,B3/2,A3-C3/2\nB/2,C4,E-C3,F4,G-C,F-F3,F-C,C4/2,B/2,A-A2/2,G3/2\nF/I"
 ///song played by the mook bard
 #define MOOK_SONG "BPM: 240\nA5,B5,C#6,D6,E6/0.17,A/0.5,A/0.25,A3/0.25\nA4/0.25,C#5/0.25,E5/0.25,A/0.25,C#/0.25,E/0.12\nC#6/0.25,C#/0.25,E6/0.25,A3/0.25,A4/0.25\nC#5/0.25,E5/0.25,A/0.25,C#/0.25,E/0.25,D/0.25\nG6/0.25,D/0.17,F6/0.17,C#6/0.5,E6/0.5,D4/0.25\nA/0.25,D5/0.25,F5/0.25,A/0.25,D/0.25,F/0.25\nD6/0.08,F6/0.08,D4/0.25,A/0.25,D5/0.25,F5/0.25\nCn4/0.2,B/0.17,D6/0.17,G5/0.5,G/0.25,B3/0.25\nD4/0.25,G4/0.25,B4/0.25,D/0.25,G/0.25,B/0.12\nB5/0.25,B/0.25,D6/0.25,G3/0.25,G4/0.25,B4/0.25\nF/0.25,G/0.25,B/0.25,F/0.25,D/0.25,F6/0.25\nC6/0.17,E/0.17,B5/0.5,D#/0.5,C4/0.25,G/0.25\nC5/0.25,E5/0.25,G/0.25,C/0.25,E/0.25,C6/0.08\nE6/0.08,C4/0.25,Dn4/0.25,E4/0.25,A5/0.17,B/0.5\nC6/0.25,F5/0.08,F4/0.08,C5/0.08,E5/0.12,G5/0.12\nC6/0.25,E6/0.25,E4/0.08,C5/0.08,B/0.17,F6/0.17\nE6/0.5,B/0.25,E4/0.08,G#4/0.08,C6/0.17,D6/0.5\nE6/0.25,A3/0.25,E4/0.25,C5/0.25,Gn3/0.25\nF5/0.12,A5/0.12,A6/0.25,F3/0.25,F4/0.12,A4/0.12\nC/0.12,F6/0.17,A6/0.17,G#6/0.5,A/0.25,F3/0.25\nF4/0.12,A4/0.12,D#5/0.12,B/0.17,G#/0.17,B6/0.5\nB5/0.25,G#/0.25,E3/0.25,E4/0.12,G#4/0.12\nDn/0.12,E6/0.08,E3/0.25,F#3/0.25,G#3/0.25\nE5/0.17,A5/0.17,E/0.5,E/0.25,A3/0.25,C#4/0.25\nE4/0.25,C#/0.25,E/0.12,A5/0.5,B/0.5,C#6/0.5\nD6/0.5,A3/0.25,C#4/0.25,E/0.25,C#/0.25,E/0.25\nE6/0.08,Gn/0.25,E4/0.25,A4/0.25,C#5/0.25,E/0.25\nA/0.25,C#/0.25,E6/0.17,E/0.5,Fn6/0.5,G6/0.5\nG3/0.25,E4/0.25,A/0.25,C#/0.25,E/0.25,A/0.25\nC#/0.25,F/0.08,A6/0.08,F3/0.25,F4/0.25,A4/0.25\nCn/0.25,F/0.25,A/0.25,C/0.25,G6/0.12,A6/0.12\nG A G F6 G3/0.25 D4/0.25 G4/0.25 B4/0.25 D/0.25\nG/0.25 B/0.25 E6/0.12 G6/0.12 F/0.71 G/0.71 F/0.71\nE3/0.25 E4/0.25 G4/0.25 B/0.25 E/0.25 G/0.25 B/0.25\nA5/0.08 E6/0.08 A3/0.25 E4/0.25 A4/0.25 C#/0.25 E/0.25 A/0.25 C#/0.25 D6/0.17 E6/0.5 F/0.25 B3/0.25 D4/0.12 F4/0.12 B4/0.12 F6/0.25 E/0.25 D6/0.25 G#3/0.25 E4/0.12 G#4/0.12 B/0.12 Cn6/0.12 D/0.25 A3/0.25 A4/0.25 C5/0.25 E5/0.25 G#3/0.25 Gn/0.25 C4/0.25 E4/0.25 A/"
+///song played by the vibebot when cheering people up
+#define VIBEBOT_CHEER_SONG "BPM: 360\nE4/0.5,B4-G4/0.5,G-B-E/0.5,D4,Gb,A4-D-G/0.25\nGn-B3-E/0.5,G-B-E/0.5,A3-D-Gb/0.5,E-Gn-B/0.17,E,G\nB4/0.5,E-B-G/0.5,D,Gb,A4-D-G/0.25,B3-Gn-E/0.5\nG-B-E/0.5,A3-D-Gb/0.5,E-Gn-B/0.17,E-G-C5/0.5,G,E,G\nC,B4-Eb-Gb/0.5,B3-E-G/0.5,B-E-G3/0.5,C-Gn4-En/0.5\nG,E,G,C,Eb-Gb-B4/0.17,C-Gn-En/0.5,G,E,G,C\nB-C-Eb-Gb/0.5,B3-E-G/0.5,E-B-G3/0.5,C-En-Gn4,E,G,C\nE,G,A4-Gb-D5/0.17,E/0.5,B4-Gn/0.5,G-B-E/0.5,D4,Gb\nA-D-G/0.25,Gn-B3-E/0.5,G-B-E/0.5,A3-D-Gb/0.5\nE-Gn-B/0.17,E,G,B4/0.5,E-B-G/0.5,D,Gb,A4-D-G/0.25\nB3-Gn-E/0.5,G-B-E/0.5,A3-D-Gb/0.5,E-Gn-B/0.17\nE-G-C/0.5,G,E,G,C,B4-Eb-Gb/0.5,B3-E-G/0.5\nB-E-G3/0.5,C-Gn4-En/0.5,G,E,G,C,Eb-Gb-B4/0.17\nC-Gn-En/0.5,G,E,G,C,B-C-Eb-Gb/0.5,B3-E-G/0.5\nE-B-G3/0.5,C-En-Gn4,E,G,C,E,G,A4-Gb-D5/0.17\nGn-E-B/0.5,B-G3-E,E3-G-B,G4-E4-B/0.5,A3-D4-Gb/0.5\nA-D-G3/0.5,D3-G-A/0.5,Gn4-E-B/0.5,B-G3-E,E3-G-B\nG4-E4-B/0.5,A-D4-Gb/0.17,A4-F4-C4/0.5,C-A3-F\nF3-A-C,C-F4-A4/0.5,B-Gn-E/0.5,B-G3-E/0.5\nG-E3-B/0.5,A3-D-Gb4/0.5,D-A-G3/0.5,D3-A-G/0.5\nA-D4-G4/0.17,Gn-E4-B/0.5,B-G3-E,E3-G-B,G4-E4-B/0.5\nA-D-Gb/0.5,A-D-G3/0.5,D3-G-A/0.5,Gn4-E-B/0.5\nB-G3-E,E3-G-B,G4-E4-B/0.5,A-D4-Gb/0.17,A4-F-C/0.5\nC-A3-F,F3-A-C,C-F4-A4/0.5,B-Gn-E/0.5,B-G3-E/0.5\nG-E3-B/0.5,A3-D-Gb4/0.5,D-A-G3/0.5,D3-A-G/0.5\nE4-A-Db4/0.17,A2,E3,Gn-B-E4,A,E3,B-G-E4\nA3-Dn-F-D3/0.5,F3-A-D4/0.5,D3/0.5,A2,E3,B-E4-G,A\nE3,B-G-E4,F-D4-A3/0.17,A2,E3,B-E4-G,A,E3,B-G-E4\nB-A3-F4-D-D3/0.5,F3-D4-A/0.5,F-A-D3/0.5,A2,E3\nB-E4-G,A,E3,B-E4-G,F-A3-D4-D3/0.17,A2,E3,G-B-E4,A\nE3,B-G-E4,A3-D4-F4-D3/0.5,F3-A-D4/0.5,D3/0.5,A2,E3\nB-E4-G,A,E3,B-G-E4,F-D4-A3/0.17,A2,E3,B-E4-G,A,E3\nB-G-E4,B-A3-F4-D-D3/0.5,F3-D4-A/0.5,F-A-D3/0.5,A2\nE3,B-E4-G,A,E3,B-E4-G,F-A3-D4-D3/0.17,E/0.5\nB4-G4/0.5,G-B-E/0.5,D4,Gb,A4-D-G/0.25,Gn-B3-E/0.5\nG-B-E/0.5,A3-D-Gb/0.5,E-Gn-B/0.17,E,G,B4/0.5\nE-B-G/0.5,D,Gb,A4-D-G/0.25,B3-Gn-E/0.5,G-B-E/0.5\nA3-D-Gb/0.5,E-Gn-B/0.17,E-G-C5/0.5,G,E,G,C\nB4-Eb-Gb/0.5,B3-E-G/0.5,B-E-G3/0.5,C-Gn4-En/0.5,G\nE,G,C,Eb-Gb-B4/0.17,C-Gn-En/0.5,G,E,G,C\nB-Eb-Gb/0.5,B3-E-G/0.5,E-B-G3/0.53,En-Gn4/8,C,G,E\nB4,G,E,B3-E-G/0.07"
+///grim music played by the vibebot
+#define VIBEBOT_GRIM_MUSIC "BPM: 92\nG5/0.5,C#7-F#5/1.08,G6-G5/0.52,D6-D5,B6-E5/0.52\nG6-G5/1.08,D6-D5/0.34,Cn6-C5-G6/0.5,D,B5-F#6/13\nB4/0.52,C6-C5-G,A4/0.28,G-G5/0.5\nC#7-F#-F#5/1.08,G6-G5/0.52,D6-D5,B6-E/0.52,G-G6\nB5,D7/13,D6/0.52,Cn6,B6-B5,G-G5,G/0.5\nF#-C#7/1.08,G6-G5/0.22,G/0.5,C#-F#/1.08\nG6-G5/0.52,D-D5,B6-E/0.52,G6-G5/1.08,D6-D5/0.34\nCn6-C5-G6/0.5,D,B5-F#6/13,B4/0.52,C6-G-C5/0.25\nG-G5/0.5,C#7-F#-F#5/1.08,G6-G5/0.52,D6-D5\nB6-E/0.52,G-G6,B5,D7/13,D6/0.52,Cn6,B6-B5,G-G5\nG/0.5,F#-C#7/1.08,G6-G5/0.65"
+///happy birthday music we play to the birthday boy
+#define VIBEBOT_HAPPY_BIRTHDAY "BPM: 120\nG4/0.5,G4/0.25,A4/0.5,G4/0.5,C5/0.5,B4/1\nG4/0.5,G4/0.25,A4/0.5,G4/0.5,D5/0.5,C5/1\nG4/0.5,G4/0.5,G5/0.5,E5/0.5,C5/0.5,B4/0.5,A4/0.5\nF5/0.5,F5/0.5,E5/0.5,C5/0.5,D5/0.5,C5/1"

code/__DEFINES/traits/declarations.dm

@@ -1167,4 +1167,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 /// This trait lets you attach limbs to any player without surgery.
 #define TRAIT_EASY_ATTACH "easy_attach"
 
+///Trait given to the birthday boy
+#define TRAIT_BIRTHDAY_BOY "birthday_boy"
 // END TRAIT DEFINES

code/_globalvars/bitfields.dm

@@ -99,6 +99,7 @@ DEFINE_BITFIELD(clothing_flags, list(
 	"THICKMATERIAL" = THICKMATERIAL,
 	"VOICEBOX_DISABLED" = VOICEBOX_DISABLED,
 	"VOICEBOX_TOGGLABLE" = VOICEBOX_TOGGLABLE,
+	"INTERNALS_ADJUST_EXEMPT" = INTERNALS_ADJUST_EXEMPT,
 ))
 
 DEFINE_BITFIELD(datum_flags, list(

code/_globalvars/lists/names.dm

@@ -24,6 +24,7 @@ GLOBAL_LIST_INIT(nightmare_names, world.file2list("strings/names/nightmare.txt")
 GLOBAL_LIST_INIT(megacarp_first_names, world.file2list("strings/names/megacarp1.txt"))
 GLOBAL_LIST_INIT(megacarp_last_names, world.file2list("strings/names/megacarp2.txt"))
 GLOBAL_LIST_INIT(cyberauth_names, world.file2list("strings/names/cyberauth.txt"))
+GLOBAL_LIST_INIT(hacker_aliases, world.file2list("strings/names/hackers.txt"))
 GLOBAL_LIST_INIT(syndicate_monkey_names, world.file2list("strings/names/syndicate_monkey.txt"))
 GLOBAL_LIST_INIT(cargorilla_names, world.file2list("strings/names/cargorilla.txt"))
 GLOBAL_LIST_INIT(guardian_first_names, world.file2list("strings/names/guardian_descriptions.txt"))

code/_globalvars/traits/_traits.dm

@@ -140,6 +140,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_BATON_RESISTANCE" = TRAIT_BATON_RESISTANCE,
 		"TRAIT_BEAST_EMPATHY" = TRAIT_BEAST_EMPATHY,
 		"TRAIT_BEING_BLADE_SHIELDED" = TRAIT_BEING_BLADE_SHIELDED,
+		"TRAIT_BIRTHDAY_BOY" = TRAIT_BIRTHDAY_BOY,
 		"TRAIT_BLOB_ALLY" = TRAIT_BLOB_ALLY,
 		"TRAIT_BLOCK_SHUTTLE_MOVEMENT" = TRAIT_BLOCK_SHUTTLE_MOVEMENT,
 		"TRAIT_BLOOD_CLANS" = TRAIT_BLOOD_CLANS,

code/datums/ai/_ai_controller.dm

@@ -625,7 +625,7 @@ multiple modular subtrees with behaviors
 /datum/ai_controller/proc/post_blackboard_key_set(key)
 	if (isnull(pawn))
 		return
-	SEND_SIGNAL(pawn, COMSIG_AI_BLACKBOARD_KEY_SET(key))
+	SEND_SIGNAL(pawn, COMSIG_AI_BLACKBOARD_KEY_SET(key), key)
 
 /**
  * Adds the passed "thing" to the associated key

code/datums/components/crafting/robot.dm

@@ -119,7 +119,7 @@
 
 /datum/crafting_recipe/vibebot
 	name = "Vibebot"
-	result = /mob/living/simple_animal/bot/vibebot
+	result = /mob/living/basic/bot/vibebot
 	reqs = list(
 		/obj/item/light/bulb = 2,
 		/obj/item/bodypart/head/robot = 1,

code/datums/components/trapdoor.dm

@@ -349,8 +349,8 @@
 	. = ..()
 	AddElement(/datum/element/openspace_item_click_handler)
 
-/obj/item/trapdoor_kit/handle_openspace_click(turf/target, mob/user, click_parameters)
-	interact_with_atom(target, user, click_parameters)
+/obj/item/trapdoor_kit/handle_openspace_click(turf/target, mob/user, list/modifiers)
+	interact_with_atom(target, user, modifiers)
 
 /obj/item/trapdoor_kit/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
 	var/turf/target_turf = get_turf(interacting_with)

code/datums/elements/openspace_item_click_handler.dm

@@ -8,22 +8,19 @@
 	. = ..()
 	if(!isitem(target))
 		return ELEMENT_INCOMPATIBLE
-	RegisterSignal(target, COMSIG_ITEM_INTERACTING_WITH_ATOM, PROC_REF(divert_interaction))
+	RegisterSignal(target, COMSIG_RANGED_ITEM_INTERACTING_WITH_ATOM, PROC_REF(divert_interaction))
 
 /datum/element/openspace_item_click_handler/Detach(datum/source)
-	UnregisterSignal(source, COMSIG_ITEM_INTERACTING_WITH_ATOM)
+	UnregisterSignal(source, COMSIG_RANGED_ITEM_INTERACTING_WITH_ATOM)
 	return ..()
 
 //Invokes the proctype with a turf above as target.
-/datum/element/openspace_item_click_handler/proc/divert_interaction(obj/item/source, mob/user, atom/target, click_parameters)
+/datum/element/openspace_item_click_handler/proc/divert_interaction(obj/item/source, mob/user, atom/target, list/modifiers)
 	SIGNAL_HANDLER
 	if((target.z == 0) || (user.z == 0) || target.z == user.z)
 		return NONE
-	var/turf/checked_turf = get_turf(target)
-	while(!isnull(checked_turf))
-		checked_turf = GET_TURF_ABOVE(checked_turf)
-		if(checked_turf?.z == user.z && user.CanReach(checked_turf, source))
-			INVOKE_ASYNC(source, TYPE_PROC_REF(/obj/item, handle_openspace_click), checked_turf, user, click_parameters)
-			return ITEM_INTERACT_BLOCKING
-
+	var/turf/target_turf = parse_caught_click_modifiers(modifiers, get_turf(user.client?.eye || user), user.client)
+	if(target_turf?.z == user.z && user.CanReach(target_turf, source))
+		INVOKE_ASYNC(source, TYPE_PROC_REF(/obj/item, handle_openspace_click), target_turf, user, modifiers)
+		return ITEM_INTERACT_BLOCKING
 	return NONE