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 9328f4d9cb Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
#	Content.Server/Connection/ConnectionManager.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Server/Shuttles/Systems/ArrivalsSystem.cs
#	Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
#	Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Shared/Chat/SharedChatSystem.cs
#	Content.Shared/UserInterface/ActivatableUIComponent.cs
#	Resources/Prototypes/Datasets/Names/ai.yml
#	Resources/Prototypes/Datasets/adjectives.yml
#	Resources/Prototypes/Datasets/verbs.yml
#	Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
#	Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
#	Resources/Prototypes/Entities/Stations/base.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Roles/Jobs/Science/borg.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
#	Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
#	SpaceStation14.sln
2024-08-28 19:12:01 +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 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-08-28 19:12:01 +03:00
CustomControls Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-31 21:36:42 +03:00
Logs Remove cringe hardcodes for background (#20374) 2023-09-22 14:50:34 -05:00
ManageSolutions Опять Перевод/Фиксы (#320) 2024-08-28 18:15:49 +03: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/wizards/master' 2024-08-18 01:15:36 +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