NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 18:31:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Resources/Textures/Interface/Misc
History
Exact
Morb0 3ab6d3ef71 Merge remote-tracking branch 'wizards/master' into upstream-sync 
# Conflicts:
#	.github/workflows/publish.yml
#	Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
#	Content.Server/GameTicking/GameTicker.Player.cs
#	Content.Server/VoiceMask/VoiceMaskComponent.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Content.Server/VoiceMask/VoiceMaskerComponent.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Entities/Clothing/Masks/specific.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
#	Resources/Prototypes/Roles/Jobs/Command/captain.yml
#	Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
#	Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_director.yml
#	Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
#	Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
#	Resources/Textures/Tiles/attributions.yml
#	Resources/Textures/Tiles/blue_circuit.png
#	Resources/Textures/Tiles/green_circuit.png
#	Resources/Textures/Tiles/steel.png
2024-10-04 19:47:54 +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 Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-08-28 16:40:36 +03:00
pointing.rsi
program_icons.rsi [Resprite] Localizations (#1361) 2023-08-24 21:54:23 +03:00
progress_bar.rsi
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
health_analyzer_out_of_range.png Fix medical PDA/health analyzer long range intel bug (#31879) 2024-09-21 15:54:48 +10:00