CatStation/Resources/Textures/Interface/Slimecore
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
..
Slots Localize hands interface (#1914) 2024-03-02 02:31:14 +03:00
Storage Satchel empty space is now fully transparent (#25147) 2024-02-25 18:24:59 -05:00
item_status_left.png THE RETURN OF ITEM STATUS (#22986) 2024-04-21 23:16:23 +10:00
item_status_left_highlight.png THE RETURN OF ITEM STATUS (#22986) 2024-04-21 23:16:23 +10:00
item_status_right.png THE RETURN OF ITEM STATUS (#22986) 2024-04-21 23:16:23 +10:00
item_status_right_highlight.png THE RETURN OF ITEM STATUS (#22986) 2024-04-21 23:16:23 +10:00
slot_highlight.png The HUDening™️ (SS13 HUD themes, Classic as default, and more) (#22287) 2023-12-11 02:28:17 -07:00
SlotBackground.png The HUDening™️ (SS13 HUD themes, Classic as default, and more) (#22287) 2023-12-11 02:28:17 -07:00
template_small.png The HUDening™️ (SS13 HUD themes, Classic as default, and more) (#22287) 2023-12-11 02:28:17 -07:00