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 a5a2bbd386 Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-left.png
#	Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-right.png
#	Resources/Textures/Clothing/Hands/Gloves/captain.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-left.png
#	Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-right.png
#	Resources/Textures/Clothing/Hands/Gloves/combat.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/fingerless.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/inhand-left.png
#	Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/inhand-right.png
#	Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/latex.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/leather.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/inhand-left.png
#	Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/inhand-right.png
#	Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/robohands.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
#	Resources/Textures/Mobs/Aliens/Xenos/purple_snake.rsi/meta.json
2025-04-17 06:26:03 +03:00
..
AdminbusTab Admin UI localization (#29340) 2024-06-22 23:05:33 +10:00
AdminTab Cleanup various admin buttons (#36312) 2025-04-17 03:02:41 +02:00
AtmosTab Admin UI localization (#29340) 2024-06-22 23:05:33 +10:00
ObjectsTab Cleanup various admin buttons (#36312) 2025-04-17 03:02:41 +02: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-04-17 00:07:59 +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