Morb0 ce4a90a054 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml # Resources/Prototypes/GameRules/events.yml # Resources/Prototypes/Loadouts/role_loadouts.yml # Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json # Resources/Textures/Structures/Power/apc.rsi/base.png # Resources/Textures/Structures/Power/apc.rsi/broken.png # Resources/Textures/Structures/Power/apc.rsi/channel0-auto_off.png # Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png # Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png # Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png # Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png # Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png # Resources/Textures/Structures/Power/apc.rsi/channel1-manual_off.png # Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png # Resources/Textures/Structures/Power/apc.rsi/channel2-auto_off.png # Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png # Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png # Resources/Textures/Structures/Power/apc.rsi/channel2-manual_on.png # Resources/Textures/Structures/Power/apc.rsi/display-charging.png # Resources/Textures/Structures/Power/apc.rsi/display-full.png # Resources/Textures/Structures/Power/apc.rsi/display-lack.png # Resources/Textures/Structures/Power/apc.rsi/display-remote.png # Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png # Resources/Textures/Structures/Power/apc.rsi/frame.png # Resources/Textures/Structures/Power/apc.rsi/lock0-locked.png # Resources/Textures/Structures/Power/apc.rsi/lock0-unlocked.png # Resources/Textures/Structures/Power/apc.rsi/lock1-locked.png # Resources/Textures/Structures/Power/apc.rsi/lock1-unlocked.png # Resources/Textures/Structures/Power/apc.rsi/meta.json # Resources/Textures/Structures/Power/apc.rsi/panel.png # Resources/Textures/Structures/Power/apc.rsi/static.png		2024-06-17 23:51:01 +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	Add search filter to the admin menu player tab (#28030)	2024-05-31 02:28:08 -04: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	Fix admin notes and database time nonsense. (#25280)	2024-02-20 10:13:31 +01: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-06-14 19:48:52 +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	SS14-28662 Add Baby Jail: a Jail for Babies (inverse panic bunker) (#28763)	2024-06-09 14:58:10 -04:00
AdminMenuWindow.xaml.cs	SS14-28662 Add Baby Jail: a Jail for Babies (inverse panic bunker) (#28763)	2024-06-09 14:58:10 -04: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