rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Content.Client/Administration/UI
History
VigersRay 31b2d24e30 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Shared/MagicMirror/MagicMirrorComponent.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
#	Resources/Prototypes/Entities/Stations/base.yml
#	Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png
#	Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png
#	Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png
#	Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png
#	Resources/migration.yml
2024-07-31 03:54:09 +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 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-31 03:54:09 +03:00
CustomControls Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-31 03:54:09 +03: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/wizards/master' 2024-07-22 04:16:05 +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