rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Resources/Textures/Interface
History
VigersRay 67c8ba2471 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
#	Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml
#	Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/Clothing/Components/GloveHeatResistanceComponent.cs
#	Content.Server/Light/EntitySystems/PoweredLightSystem.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/Medical/SuitSensors/SuitSensorComponent.cs
#	Content.Server/StationEvents/Events/MeteorSwarmSystem.cs
#	Content.Server/StationEvents/Events/StationEventSystem.cs
#	Content.Shared/Actions/SharedActionsSystem.cs
#	Content.Shared/Interaction/SharedInteractionSystem.cs
#	Resources/Prototypes/AlertLevels/alert_levels.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml
#	Resources/Prototypes/Datasets/Names/fortunes.yml
#	Resources/Prototypes/Datasets/ion_storm.yml
#	Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
#	Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
#	Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
#	Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
#	Resources/Prototypes/Entities/Objects/Fun/pai.yml
#	Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
#	Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
#	Resources/Prototypes/Recipes/Lathes/clothing.yml
#	Resources/Prototypes/game_presets.yml
#	Resources/Prototypes/secret_weights.yml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
#	Resources/Textures/Clothing/Mask/ert.rsi/meta.json
#	Resources/Textures/Clothing/Mask/joy.rsi/meta.json
#	Resources/Textures/Clothing/Mask/squadron.rsi/meta.json
#	Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png
#	Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png
#	Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
#	Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png
#	Resources/Textures/Objects/Tools/crowbar.rsi/red-storage.png
#	Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png
#	Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png
#	Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png
#	Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png
#	Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png
#	Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json
#	Resources/migration.yml
2024-08-14 19:55:44 +03:00
..
Actions Продвинутые борги (#247) 2024-07-27 10:23:34 +03:00
AdminActions Adds the super speed smite (#10707) 2022-08-23 09:04:17 -05:00
AdminNotes Better notes and bans (#14228) 2023-07-21 13:38:52 +02:00
Alerts Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-06-23 21:07:25 +03:00
Ashen Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
Bwoink aHelp fixes and improvements (#28639) 2024-07-30 18:28:32 +10:00
Changelog Make + and - in changelog look less blurry. 2021-10-31 15:04:19 +01:00
Clockwork Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
Default Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-08-14 19:55:44 +03:00
Emotes Added new icons for the emote wheel (#27541) 2024-05-05 20:12:30 -05:00
Inventory Move slot UI files around (#11282) 2022-09-14 17:13:28 -07:00
ItemStatus/Bullets Add IItemStatus to some weapon types (#1879) 2020-08-24 13:13:26 +02:00
Minimalist Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
Misc Говнокрад (#268) 2024-08-08 09:28:44 +03:00
Nano Adds Support for Guidebook Buttons in UIs (#27891) 2024-05-10 22:21:18 -04:00
NavMap Set nav map icon textures to use bilinear filtering (#25411) 2024-02-20 22:31:32 +11:00
Paper Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-31 03:54:09 +03:00
Plasmafire Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
PowerMonitoring Power monitoring console overhaul (#20927) 2023-12-24 17:07:41 +11:00
Radial Improved RCDs (#22799) 2024-03-30 23:29:47 -05:00
Retro Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
Slimecore Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
VerbIcons Add new icon for Remove Evidence verb (#28898) 2024-06-12 18:05:56 -04:00
WireHacking Re-organizing the Resources folder. Part 1. (#1234) 2020-07-07 19:19:00 +02:00
character.svg Re-organizing the Resources folder. Part 1. (#1234) 2020-07-07 19:19:00 +02:00
character.svg.192dpi.png Crisp double scale icons for top button bar. 2021-01-15 11:49:57 +01:00
character.svg.192dpi.png.yml Crisp double scale icons for top button bar. 2021-01-15 11:49:57 +01:00
eject.png PDA UI refactor and cartridges (#11335) 2022-11-08 14:00:20 -06:00
emotes.svg Emotes Menu (#26702) 2024-04-28 21:38:23 -07:00
emotes.svg.192dpi.png Emotes Menu (#26702) 2024-04-28 21:38:23 -07:00
emotes.svg.192dpi.png.yml Emotes Menu (#26702) 2024-04-28 21:38:23 -07:00
eraser.svg Add mapping editor (#23427) 2024-08-04 13:31:45 +10:00
eraser.svg.png Add mapping editor (#23427) 2024-08-04 13:31:45 +10:00
examine-star.png Examine Groups (#12400) 2022-12-19 20:53:36 -06:00
examine-star.png.yml Examine Groups (#12400) 2022-12-19 20:53:36 -06:00
eyedropper.svg Add mapping editor (#23427) 2024-08-04 13:31:45 +10:00
eyedropper.svg.png Add mapping editor (#23427) 2024-08-04 13:31:45 +10:00
fist.svg Improved top menu (#2949) 2021-01-09 15:40:07 +11:00
fist.svg.192dpi.png Crisp double scale icons for top button bar. 2021-01-15 11:49:57 +01:00
fist.svg.192dpi.png.yml Crisp double scale icons for top button bar. 2021-01-15 11:49:57 +01:00
gavel.svg Improved top menu (#2949) 2021-01-09 15:40:07 +11:00
gavel.svg.192dpi.png Crisp double scale icons for top button bar. 2021-01-15 11:49:57 +01:00
gavel.svg.192dpi.png.yml Crisp double scale icons for top button bar. 2021-01-15 11:49:57 +01:00
hamburger.svg Improved top menu (#2949) 2021-01-09 15:40:07 +11:00
hamburger.svg.192dpi.png Crisp double scale icons for top button bar. 2021-01-15 11:49:57 +01:00
hamburger.svg.192dpi.png.yml Crisp double scale icons for top button bar. 2021-01-15 11:49:57 +01:00
hammer.svg Re-organizing the Resources folder. Part 1. (#1234) 2020-07-07 19:19:00 +02:00
hammer.svg.192dpi.png Crisp double scale icons for top button bar. 2021-01-15 11:49:57 +01:00
hammer.svg.192dpi.png.yml Crisp double scale icons for top button bar. 2021-01-15 11:49:57 +01:00
hammer_sca;ed.svg.192dpi.png.yml Add Alt-click functionality (#4497) 2021-08-21 10:20:18 -07:00
hammer_scaled.svg Add Alt-click functionality (#4497) 2021-08-21 10:20:18 -07:00
hammer_scaled.svg.192dpi.png Add Alt-click functionality (#4497) 2021-08-21 10:20:18 -07:00
handsbox.png Re-organizing the Resources folder. Part 1. (#1234) 2020-07-07 19:19:00 +02:00
handsbox.png.yml Enable bilinear filtering on some UI icons. 2021-01-13 03:39:07 +01:00
home.png Fix PDA home icon (#25721) 2024-02-29 20:22:12 +01:00
home.svg PDA UI refactor and cartridges (#11335) 2022-11-08 14:00:20 -06:00
info.svg Adds server rules (#3475) 2021-03-03 17:56:52 +11:00
info.svg.192dpi.png Adds server rules (#3475) 2021-03-03 17:56:52 +11:00
info.svg.192dpi.png.yml Adds server rules (#3475) 2021-03-03 17:56:52 +11:00
inventory.svg Re-organizing the Resources folder. Part 1. (#1234) 2020-07-07 19:19:00 +02:00
inventory.svg.192dpi.png Crisp double scale icons for top button bar. 2021-01-15 11:49:57 +01:00
inventory.svg.192dpi.png.yml Crisp double scale icons for top button bar. 2021-01-15 11:49:57 +01:00
light.png PDA UI refactor and cartridges (#11335) 2022-11-08 14:00:20 -06:00
pai.png Adding PAI Slot to PDA (#21086) 2024-01-04 05:56:14 -07:00
pencil.png PDA UI refactor and cartridges (#11335) 2022-11-08 14:00:20 -06:00
pencil.svg PDA UI refactor and cartridges (#11335) 2022-11-08 14:00:20 -06:00
pray.svg Prayers Again (#10960) 2022-11-08 15:02:14 -06:00
pray.svg.png Prayers Again (#10960) 2022-11-08 15:02:14 -06:00
pray.svg.png.yml Prayers Again (#10960) 2022-11-08 15:02:14 -06:00
sandbox.svg Re-organizing the Resources folder. Part 1. (#1234) 2020-07-07 19:19:00 +02:00
sandbox.svg.192dpi.png Crisp double scale icons for top button bar. 2021-01-15 11:49:57 +01:00
sandbox.svg.192dpi.png.yml Crisp double scale icons for top button bar. 2021-01-15 11:49:57 +01:00
students-cap.svg Re-organizing the Resources folder. Part 1. (#1234) 2020-07-07 19:19:00 +02:00
students-cap.svg.192dpi.png Crisp double scale icons for top button bar. 2021-01-15 11:49:57 +01:00
students-cap.svg.192dpi.png.yml Crisp double scale icons for top button bar. 2021-01-15 11:49:57 +01:00
target-doll-high.svg Re-organizing the Resources folder. Part 1. (#1234) 2020-07-07 19:19:00 +02:00
target-doll-high.svg.96dpi.png Re-organizing the Resources folder. Part 1. (#1234) 2020-07-07 19:19:00 +02:00
target-doll-high.svg.96dpi.png.yml Enable bilinear filtering on some UI icons. 2021-01-13 03:39:07 +01:00
target-doll-high.svg.192dpi.png Crisp double scale icons for top button bar. 2021-01-15 11:49:57 +01:00
target-doll-high.svg.192dpi.png.yml Crisp double scale icons for top button bar. 2021-01-15 11:49:57 +01:00
target-doll-low.svg Re-organizing the Resources folder. Part 1. (#1234) 2020-07-07 19:19:00 +02:00
target-doll-low.svg.96dpi.png Re-organizing the Resources folder. Part 1. (#1234) 2020-07-07 19:19:00 +02:00
target-doll-low.svg.96dpi.png.yml Enable bilinear filtering on some UI icons. 2021-01-13 03:39:07 +01:00
target-doll-low.svg.192dpi.png Crisp double scale icons for top button bar. 2021-01-15 11:49:57 +01:00
target-doll-low.svg.192dpi.png.yml Crisp double scale icons for top button bar. 2021-01-15 11:49:57 +01:00
target-doll-middle.svg Re-organizing the Resources folder. Part 1. (#1234) 2020-07-07 19:19:00 +02:00
target-doll-middle.svg.96dpi.png Re-organizing the Resources folder. Part 1. (#1234) 2020-07-07 19:19:00 +02:00
target-doll-middle.svg.96dpi.png.yml Enable bilinear filtering on some UI icons. 2021-01-13 03:39:07 +01:00
target-doll-middle.svg.192dpi.png Crisp double scale icons for top button bar. 2021-01-15 11:49:57 +01:00
target-doll-middle.svg.192dpi.png.yml Crisp double scale icons for top button bar. 2021-01-15 11:49:57 +01:00
target-doll.svg Re-organizing the Resources folder. Part 1. (#1234) 2020-07-07 19:19:00 +02:00
target-doll.svg.192dpi.png Crisp double scale icons for top button bar. 2021-01-15 11:49:57 +01:00
target-doll.svg.192dpi.png.yml Crisp double scale icons for top button bar. 2021-01-15 11:49:57 +01:00