Auto lathe branch (#3284)

* My first contribution in a while.Change AddAccent command to be case insensitive (#3112)

* got rid of the bottle of nothingness. thought it was an empty bottle.

* new correction

* Delete SpaceStation14.sln

I honestly don't know what happened here. I didn't code those lines.

* Revert "Delete SpaceStation14.sln"

This reverts commit 68876841dce9c6e2ce9d21996e4caef3512b1385.

* new attempt at fixing

* Revert "new attempt at fixing"

This reverts commit 780f66fda3d66b6d4d086871d0b2ea2f6d4ee004.

* Revert "My first contribution in a while.Change AddAccent command to be case insensitive (#3112)"

This reverts commit 08041a30365331b82309aedaf2136d7631459887.

* Revert "Revert "My first contribution in a while.Change AddAccent command to be case insensitive (#3112)""

This reverts commit b2dc76a6683e8df88188d37a836f9ab9a54287b5.

* Revert "Revert "Revert "My first contribution in a while.Change AddAccent command to be case insensitive (#3112)"""

This reverts commit 478d2bfe5daf6098d2f5665249ce0f161704dd73.

* Revert "Revert "Revert "Revert "My first contribution in a while.Change AddAccent command to be case insensitive (#3112)""""

This reverts commit 23c195143e1e3d05cb5f344329c01754432684a9.

* Revert "Revert "Revert "Revert "My first contribution in a while.Change AddAccent command to be case insensitive (#3112)""""

This reverts commit 23c195143e1e3d05cb5f344329c01754432684a9.

* still having figured what happened with the sln file

* please work

* -Added wood as a material.
-Made a few changes in the material requirements for some of the recipes.

* ok. added a small correction for wood at material_stacks.yml

* ok added another correction for misc.yml because for some reason a : just disappeared.

* -added plastic as a material, complete with a png (credits: tgstation)
-replaced glass with plastic for material requirements for some of the latherecipes

* for some reason the shovel was duplicate, being in both botany.yml and in tools.yml. deleted it from tools

* ok. one last try. noticed that the sprite path for shovel was weird even though it already has its own sprite at Objects/Tools/shovel.rsi . so I decided to fix the path then move the shovel back to tools.yml while deleting it from botany.yml. maybe that was the problem?

* corrected the extra space on the type: material for plastic discovered by Peptide90.

* noticed that wood also had a bad icon path.

* another attempt

* weird. I don't remember messing with the flashlight requirements.

* added plastic in the SharedStakedComponent and the meta.json from materials.rsi is back to how it was

* hopefully this icon is valid.

* small corrections concerning double space.

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
This commit is contained in:
Tarlan2
2021-02-23 04:30:50 +02:00
committed by GitHub
parent a80c803a42
commit 3ee4c5f791
11 changed files with 98 additions and 51 deletions

View File

@@ -1,4 +1,4 @@
- type: entity
- type: entity
name: material stack
id: MaterialStack
abstract: true
@@ -207,12 +207,18 @@
parent: MaterialStack
suffix: Full
components:
# TODO: Specify a material.
- type: Material
materials:
- key: enum.MaterialKeys.Stack
mat: wood
- type: Stack
stacktype: enum.StackType.Wood
- type: Sprite
sprite: Objects/Materials/materials.rsi
state: wood_plank
- type: Stack
stacktype: enum.StackType.Wood
state: wood
- type: Item
sprite: Objects/Materials/materials.rsi
HeldPrefix: wood
- type: entity
id: WoodPlank1
@@ -222,3 +228,31 @@
components:
- type: Stack
count: 1
- type: entity
name: plastic sheet
id: PlasticSheet
parent: MaterialStack
suffix: Full
components:
- type: Material
materials:
- key: enum.MaterialKeys.Stack
mat: plastic
- type: Stack
stacktype: enum.StackType.Plastic
- type: Sprite
sprite: Objects/Materials/sheets.rsi/plastic.png
state: plastic
- type: Item
sprite: Objects/Materials/sheets.rsi/plastic.png
HeldPrefix: plastic
- type: entity
id: PlasticSheet1
name: plastic sheet
parent: PlasticSheet
suffix: 1
components:
- type: Stack
count: 1