Merge branch 'master' of github.com:space-wizards/space-station-14 into replace-sounds-with-sound-specifier

This commit is contained in:
ShadowCommander
2021-08-10 15:17:58 -07:00
52 changed files with 834 additions and 407 deletions

View File

@@ -34,9 +34,9 @@
Plastic: 50
- type: latheRecipe
id: FlareBase
id: Flare
icon: Objects/Misc/flare.rsi
result: FlareBase
result: Flare
completetime: 500
materials:
Plastic: 50