CatStation/Resources/Textures/Objects/Materials
Morb0 8572f60456 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
#	Resources/Prototypes/Voice/disease_emotes.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
#	Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
#	Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml
#	Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml
#	Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml
#	Resources/ServerInfo/Guidebook/Engineering/Atmospherics.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/Singularity.xml
#	Resources/ServerInfo/Guidebook/Engineering/TEG.xml
#	Resources/ServerInfo/Guidebook/Medical/Chemist.xml
#	Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml
#	Resources/ServerInfo/Guidebook/NewPlayer/CharacterCreation.xml
#	Resources/ServerInfo/Guidebook/Science/APE.xml
#	Resources/ServerInfo/Guidebook/Security/Forensics.xml
#	Resources/ServerInfo/Guidebook/Survival.xml
#	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/Structures/Wallmounts/signs.rsi/meta.json
2024-08-19 08:18:59 +03:00
..
hide.rsi Goliath mob (#30839) 2024-08-18 12:22:36 -04:00
ingots.rsi Copyright Pass/Pruning | Part 2 - Objects (#3905) 2021-04-29 18:09:14 +00:00
materials.rsi Shiny Diamonds (#25750) 2024-07-13 15:15:57 +03:00
Mob add space carp and sharkminnow teeth (#31070) 2024-08-18 21:04:59 -06:00
ore.rsi Shiny Diamonds (#25750) 2024-07-13 15:15:57 +03:00
parts.rsi Adds tons of new materials + cleans up existing ones (#3413) 2021-02-26 18:59:24 +11:00
Scrap/generic.rsi Scrap (#30762) 2024-08-09 09:31:53 +10:00
Shards crystals drop shards and ore crab tweaks. (#20930) 2023-12-16 15:20:14 -07:00
Sheets Add plasma stack sprites (#2011) 2024-04-04 10:34:52 +03:00
silk.rsi Arachnid 2: Episode 2 (#19984) 2023-11-08 12:18:52 -08:00