rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Content.Client/Administration/UI/Tabs
History
Vigers Ray 84c607c84a Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml.cs
#	Content.Server/Administration/Systems/AdminSystem.cs
#	Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
#	Content.Server/Ghost/GhostSystem.cs
#	Resources/Locale/en-US/_strings/administration/antag.ftl
#	Resources/Locale/en-US/_strings/administration/commands/adminnotes.ftl
#	Resources/Locale/en-US/_strings/construction/components/block-anchor-component.ftl
#	Resources/Locale/en-US/_strings/power/commands.ftl
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/eggy.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/produce.png
2025-03-27 20:37:49 +03:00
..
AdminbusTab Admin UI localization (#29340) 2024-06-22 23:05:33 +10:00
AdminTab Revert "Proton (#420)" 2024-10-02 09:05:30 +03:00
AtmosTab Admin UI localization (#29340) 2024-06-22 23:05:33 +10:00
ObjectsTab add confirmation to the delete button in objects tab (#30946) 2024-08-17 12:05:17 -04:00
PanicBunkerTab Panic Bunker uses minutes not hours (#28805) 2024-06-09 22:45:47 +02:00
PlayerTab Merge remote-tracking branch 'space-wizards/master' 2025-03-27 20:37:49 +03:00
RoundTab.xaml Admin UI localization (#29340) 2024-06-22 23:05:33 +10:00
RoundTab.xaml.cs Seal/abstract/virtual everything (#6739) 2022-02-16 18:23:23 +11:00
ServerTab.xaml Add panic bunker UI and automatic panic bunker (#20954) 2023-10-13 11:56:12 -07:00
ServerTab.xaml.cs Add panic bunker UI and automatic panic bunker (#20954) 2023-10-13 11:56:12 -07:00