NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-10 10:51:14 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Resources/Textures/Interface
History
Morb0 3e015c6f67 Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 
# Conflicts:
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
#	Resources/Prototypes/Entities/Clothing/Masks/specific.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
#	Resources/Prototypes/GameRules/midround.yml
#	Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
#	Resources/Prototypes/Roles/Jobs/Security/warden.yml
#	Resources/Prototypes/StatusEffects/health.yml
#	Resources/Prototypes/StatusIcon/antag.yml
#	Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
#	Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
#	Resources/ServerInfo/Guidebook/Engineering/AME.xml
#	Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml
#	Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml
#	Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
#	Resources/ServerInfo/Guidebook/Engineering/Construction.xml
#	Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
#	Resources/ServerInfo/Guidebook/Engineering/Fires.xml
#	Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml
#	Resources/ServerInfo/Guidebook/Engineering/Networking.xml
#	Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
#	Resources/ServerInfo/Guidebook/Engineering/Power.xml
#	Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/ServerInfo/Guidebook/Engineering/TEG.xml
#	Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
#	Resources/ServerInfo/Guidebook/Science/TraversalDistorter.xml
#	Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
#	Resources/ServerInfo/Guidebook/Security/Forensics.xml
#	Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png
2024-04-26 11:19:50 +03:00
..
Actions Merge remote-tracking branch 'upstream/master' into upstream-sync 2024-03-08 16:05:59 +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 'upstream/master' into upstream-sync 2024-03-29 11:43:30 +03:00
Ashen Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-04-26 11:19:50 +03:00
Changelog Make + and - in changelog look less blurry. 2021-10-31 15:04:19 +01:00
Clockwork Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-04-26 11:19:50 +03:00
Default Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-04-26 11:19:50 +03: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 remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-04-26 11:19:50 +03:00
Misc New role - Pilot (#1978) 2024-04-08 11:31:11 +03:00
Nano THE RETURN OF ITEM STATUS (#22986) 2024-04-21 23:16:23 +10:00
NavMap Set nav map icon textures to use bilinear filtering (#25411) 2024-02-20 22:31:32 +11:00
Paper Improve paper stamping experience (#17135) 2023-08-13 14:28:10 -04:00
Plasmafire Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-04-26 11:19:50 +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 remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-04-26 11:19:50 +03:00
Slimecore Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-04-26 11:19:50 +03:00
VerbIcons Revert Paint (#26593) 2024-03-31 16:12:52 +11: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
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
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