Morb0 acf1ff4ec0 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Chat/Systems/ChatSystem.cs # Resources/Prototypes/AlertLevels/alert_levels.yml # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Datasets/Names/fortunes.yml # Resources/Prototypes/Datasets/ion_storm.yml # Resources/Prototypes/Entities/Clothing/Neck/mantles.yml # Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml # Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml # Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Recipes/Lathes/clothing.yml # Resources/Prototypes/StatusIcon/faction.yml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json # Resources/Textures/Clothing/Mask/joy.rsi/meta.json # Resources/Textures/Clothing/Mask/squadron.rsi/meta.json # Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png # Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png # Resources/Textures/Objects/Tools/crowbar.rsi/meta.json # Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png # Resources/Textures/Objects/Tools/crowbar.rsi/red-storage.png # Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png # Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png # Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png # Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png # Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png # Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json		2024-08-12 13:18: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	Fix Bwoink Player sorting again.... (#30580)	2024-08-02 13:58:00 -05: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	Implement a playerpanel (#30238)	2024-08-09 15:33:25 +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-08-12 13:18: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