]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Adds minable salt "ore" (#25324)
authorZadeon <loldude9000@gmail.com>
Mon, 26 Feb 2024 23:34:15 +0000 (17:34 -0600)
committerGitHub <noreply@github.com>
Mon, 26 Feb 2024 23:34:15 +0000 (16:34 -0700)
commit133bd0353a16a3b2260555318a1389b1c2c0f0e9
treec62d71d4a3ab97b3472ece53c4cf7af51c4f6752
parent8e951f3582a39bdf4183fea9fdf3fa1bd7ec9eda
Adds minable salt "ore" (#25324)

* Added salt to ore.yml
Added salt to ores.yml
Added salt walls to asteroid.yml
Added salt to BaseAsteroidDebris' list of ores to generate in asteroids.yml
Added OreSalt to biome_ore_templates.yml
Added salt to guaranteed salvageLoot in salvage_loot.yml
Added salt entry under salvage-magnet-resources in salvage-magnet.ftl
Added WIP sprites for salt.

* Renamed salt's id to SaltOre inside Entities/Objects/Materials/ore.yml
Fixed salt not being grindable due to using an incorrect reagent name
Added salt to ore.rsi/meta.json and rock.rsi/meta.json

* Added chlorine to the list of solutions salt gives when used in the grinder.

* Gave salt ore and salt rock overlay unique sprites.

* Added raw salt to materials/materials.ftl
Updated SaltOre definition in ore.yml to have RawSalt under materialComposition

* Updated saltore definition to give 10 units of tablesalt and 5 units of iodine when ground.
15 files changed:
Resources/Locale/en-US/materials/materials.ftl
Resources/Locale/en-US/salvage/salvage-magnet.ftl
Resources/Prototypes/Entities/Objects/Materials/ore.yml
Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
Resources/Prototypes/Entities/World/Debris/asteroids.yml
Resources/Prototypes/Procedural/Magnet/asteroid.yml
Resources/Prototypes/Procedural/biome_ore_templates.yml
Resources/Prototypes/Procedural/salvage_loot.yml
Resources/Prototypes/Reagents/Materials/ores.yml
Resources/Prototypes/Stacks/Materials/ore.yml
Resources/Prototypes/ore.yml
Resources/Textures/Objects/Materials/ore.rsi/meta.json
Resources/Textures/Objects/Materials/ore.rsi/salt.png [new file with mode: 0644]
Resources/Textures/Structures/Walls/rock.rsi/meta.json
Resources/Textures/Structures/Walls/rock.rsi/rock_salt.png [new file with mode: 0644]