rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Resources/Textures/Interface/Misc
History
VigersRay 0a91b468b4 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
#	Content.Client/Voting/UI/VotePopup.xaml.cs
#	Content.Client/Voting/VoteManager.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/Power/EntitySystems/BatterySystem.cs
#	Content.Server/Radio/EntitySystems/RadioSystem.cs
#	Content.Server/VoiceMask/VoiceMaskComponent.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Content.Server/VoiceMask/VoiceMaskerComponent.cs
#	Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
#	Content.Server/Voting/Managers/VoteManager.cs
#	Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
#	Content.Shared/Voting/MsgVoteData.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Recipes/Crafting/crates.yml
#	Resources/Prototypes/Recipes/Crafting/improvised.yml
2024-09-26 20:17:14 +03:00
..
crosshair_pointers.rsi Improve visibility of gun bolts (#23711) 2024-01-07 23:23:41 -07:00
food_icons.rsi Task/food hud (#19312) 2023-09-23 16:14:06 +03:00
health_icons.rsi Fix Medical Hud death icon animation and Changes critical icon (#26391) 2024-03-24 12:38:03 -04:00
job_icons.rsi Новая роль, Адъютант (#379) 2024-09-16 11:11:46 +03:00
pointing.rsi Swept commits JSON genocide. (#2991) 2021-01-13 23:04:38 +11:00
program_icons.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
progress_bar.rsi Swept commits JSON genocide. (#2991) 2021-01-13 23:04:38 +11:00
research_disciplines.rsi Arsenal tech discipline (#17400) 2023-06-18 15:56:49 -06:00
security_icons.rsi Criminal record hud icons (#25192) 2024-03-11 14:12:52 +11:00
beakerlarge.png Chem guidebook (#17123) 2023-06-04 15:45:02 -05:00
buffering_smite_icon.png Adds twenty-one new smites, moves the explosion smite to the verb category. (#8456) 2022-05-27 00:41:18 -07:00
health_analyzer_out_of_range.png Fix medical PDA/health analyzer long range intel bug (#31879) 2024-09-21 15:54:48 +10:00