Morb0 721f7bfecf Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync ... # Conflicts: # Content.Server/Connection/ConnectionManager.cs # Resources/Prototypes/Datasets/Names/ai.yml # Resources/Prototypes/Datasets/adjectives.yml # Resources/Prototypes/Datasets/verbs.yml # Resources/Prototypes/Entities/Clothing/Shoes/specific.yml # Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml # Resources/Prototypes/Entities/Mobs/base.yml # Resources/Prototypes/Maps/bagel.yml # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json # Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json # Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png # Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png # SpaceStation14.sln		2024-08-28 16:40:36 +03:00
..
AdminRemarks	Improve admin message seen/dismiss state. (#26223)	2024-03-21 16:15:46 +01:00
BanList	Power stuff (#31314)	2024-08-25 22:18:42 +10:00
BanPanel	Hiding and clearing department prototype code (#28114)	2024-06-01 19:49:34 -04:00
Bwoink	Power stuff (#31314)	2024-08-25 22:18:42 +10:00
CustomControls	Fix aHelp menu sorting (#30518)	2024-07-31 11:58:31 +10:00
Logs	Remove cringe hardcodes for background (#20374)	2023-09-22 14:50:34 -05:00
ManageSolutions	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
Notes	Better admin note popups text visibility (#29909)	2024-07-12 00:03:21 +10:00
PlayerPanel	Fix false and true in player-panel.ftl (#31043)	2024-08-15 18:00:56 +03:00
SetOutfit	Power stuff (#31314)	2024-08-25 22:18:42 +10:00
SpawnExplosion	Replace Matrix3 with System.Numerics.Matrix3x2 (#27443)	2024-06-02 14:07:41 +10:00
Tabs	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-08-19 08:18:59 +03:00
AdminAnnounceWindow.xaml	Multiline edit everywhere (#15216)	2023-04-14 12:57:47 -07:00
AdminAnnounceWindow.xaml.cs	Multiline edit everywhere (#15216)	2023-04-14 12:57:47 -07:00
AdminMenuWindow.xaml	Fix baby jail (#29896)	2024-07-11 15:14:01 +10:00
AdminMenuWindow.xaml.cs	Fix baby jail (#29896)	2024-07-11 15:14:01 +10:00
AdminMenuWindowEui.cs	Ensure EUIs close themselves (#15860)	2023-04-29 13:16:24 +10:00
AdminUIHelpers.cs	Add confirmation to kick and respawn in the admin player actions panel (#20542)	2023-09-28 15:46:06 -07:00
PermissionsEui.cs	Update content vectors to numerics (#17759)	2023-07-08 14:08:32 +10:00