Morb0 a5980baa7d Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml # Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml # Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/meta.json # Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry1.png # Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry2.png # Resources/Textures/Structures/Wallmounts/signs.rsi/court.png # Resources/Textures/Structures/Wallmounts/signs.rsi/deathsposal.png # Resources/Textures/Structures/Wallmounts/signs.rsi/doors.png # Resources/Textures/Structures/Wallmounts/signs.rsi/examroom.png # Resources/Textures/Structures/Wallmounts/signs.rsi/hydro1.png # Resources/Textures/Structures/Wallmounts/signs.rsi/hydro2.png # Resources/Textures/Structures/Wallmounts/signs.rsi/hydro3.png # Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png # Resources/Textures/Structures/Wallmounts/signs.rsi/law.png # Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json # Resources/Textures/Structures/Wallmounts/signs.rsi/psychology.png # Resources/Textures/Structures/Wallmounts/signs.rsi/science1.png # Resources/Textures/Structures/Wallmounts/signs.rsi/science2.png # Resources/Textures/Structures/Wallmounts/signs.rsi/security.png # Resources/Textures/Structures/Wallmounts/signs.rsi/space.png # Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio.png # Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio2.png # Resources/migration.yml		2024-07-21 07:20:43 +03:00
..
AdminRemarks	Improve admin message seen/dismiss state. (#26223)	2024-03-21 16:15:46 +01:00
BanList	Add role bans tab to the bans admin window (#20388)	2023-09-22 14:08:28 -07:00
BanPanel	Hiding and clearing department prototype code (#28114)	2024-06-01 19:49:34 -04:00
Bwoink	Bwoink fix (#28899)	2024-06-15 04:25:42 -07:00
CustomControls	Admin UI localization (#29340)	2024-06-22 23:05:33 +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
SetOutfit	Fix misc commands (#20004)	2023-09-11 15:21:52 +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-07-21 07:20:43 +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