rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Resources/Textures/Interface/Misc
History
Vigers Ray 252e81c728 Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
#	Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
#	Content.Server/Mindshield/MindShieldSystem.cs
#	Content.Shared/Gravity/SharedGravitySystem.cs
#	Content.Shared/Implants/SharedSubdermalImplantSystem.cs
#	Resources/Locale/en-US/_strings/traits/traits.ftl
#	Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
#	Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
#	Resources/Prototypes/Entities/Objects/Misc/implanters.yml
#	Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
#	Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
#	Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
2025-08-23 23:10:05 +03:00
..
ai_hud.rsi Electrified doors/windoors now spark, new tips to deal with doors without access or when electrified (#34502) 2025-01-21 11:39:15 +01: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 'space-wizards/master' 2025-08-23 23:10:05 +03:00
pointing.rsi Swept commits JSON genocide. (#2991) 2021-01-13 23:04:38 +11:00
program_icons.rsi Merge remote-tracking branch 'space-wizards/master' 2025-03-25 11:30:01 +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