]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Organize StackPrototype with inheritance (#38412)
authorāda <ss.adasts@gmail.com>
Sun, 12 Oct 2025 01:18:12 +0000 (20:18 -0500)
committerGitHub <noreply@github.com>
Sun, 12 Oct 2025 01:18:12 +0000 (01:18 +0000)
commit1250cb4d4462b763dc3ce63905a36a8719c055e2
treee8a225992631412a584364446b3e5d4b552f42f5
parenta35c3030a65d2bfa0c3c687354c930011fb43f6b
Organize StackPrototype with inheritance (#38412)

* In one commit like an animal

* carpet fix

* move materials, more bad commit discipline

* re-add marble

* don't also do materials in the same PR, dude

* the return of floor_tile_stacks.yml for atomizing

* resolve an old issue

* re-add det cable

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
24 files changed:
Resources/Prototypes/Entities/Objects/Misc/space_cash.yml
Resources/Prototypes/Reagents/Materials/ores.yml
Resources/Prototypes/Stacks/Materials/crystals.yml [deleted file]
Resources/Prototypes/Stacks/Materials/ingots.yml [deleted file]
Resources/Prototypes/Stacks/Materials/materials.yml [deleted file]
Resources/Prototypes/Stacks/Materials/parts.yml [deleted file]
Resources/Prototypes/Stacks/Sheets/glass.yml [moved from Resources/Prototypes/Stacks/Materials/Sheets/glass.yml with 87% similarity]
Resources/Prototypes/Stacks/Sheets/metal.yml [moved from Resources/Prototypes/Stacks/Materials/Sheets/metal.yml with 85% similarity]
Resources/Prototypes/Stacks/Sheets/organic.yml [new file with mode: 0644]
Resources/Prototypes/Stacks/Sheets/other.yml [moved from Resources/Prototypes/Stacks/Materials/Sheets/other.yml with 68% similarity]
Resources/Prototypes/Stacks/Specific/engineering.yml [new file with mode: 0644]
Resources/Prototypes/Stacks/Specific/medical.yml [moved from Resources/Prototypes/Stacks/medical_stacks.yml with 85% similarity]
Resources/Prototypes/Stacks/Specific/science.yml [moved from Resources/Prototypes/Stacks/science_stacks.yml with 63% similarity]
Resources/Prototypes/Stacks/Specific/security.yml [new file with mode: 0644]
Resources/Prototypes/Stacks/base_stacks.yml
Resources/Prototypes/Stacks/cloth.yml [new file with mode: 0644]
Resources/Prototypes/Stacks/consumable.yml [moved from Resources/Prototypes/Stacks/consumable_stacks.yml with 78% similarity]
Resources/Prototypes/Stacks/currency.yml [new file with mode: 0644]
Resources/Prototypes/Stacks/engineering_stacks.yml [deleted file]
Resources/Prototypes/Stacks/ore.yml [moved from Resources/Prototypes/Stacks/Materials/ore.yml with 83% similarity]
Resources/Prototypes/Stacks/ore_refined.yml [new file with mode: 0644]
Resources/Prototypes/Stacks/organic.yml [new file with mode: 0644]
Resources/Prototypes/Stacks/other.yml [new file with mode: 0644]
Resources/Prototypes/Stacks/power_stacks.yml [deleted file]