From 1c4e3ff8d54daa0b603f4167d490b3f2ce6f3ec8 Mon Sep 17 00:00:00 2001 From: Tarlan2 <76408146+Tarlan2@users.noreply.github.com> Date: Sat, 13 Feb 2021 18:51:49 +0200 Subject: [PATCH] Auto lathe branch (#3151) * 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 Co-authored-by: DrSmugleaf --- .../Catalog/LatheRecipes/cooking.yml | 32 +++++++++++++++++++ .../Catalog/LatheRecipes/janitorial.yml | 8 +++++ .../Catalog/LatheRecipes/medical.yml | 8 +++++ .../Prototypes/Catalog/LatheRecipes/misc.yml | 8 +++++ 4 files changed, 56 insertions(+) diff --git a/Resources/Prototypes/Catalog/LatheRecipes/cooking.yml b/Resources/Prototypes/Catalog/LatheRecipes/cooking.yml index 5bcd12aedf..07258a7740 100644 --- a/Resources/Prototypes/Catalog/LatheRecipes/cooking.yml +++ b/Resources/Prototypes/Catalog/LatheRecipes/cooking.yml @@ -5,3 +5,35 @@ completetime: 500 materials: steel: 90 + +- type: latheRecipe + id: KitchenKnife + icon: Objects/Weapons/Melee/kitchen_knife.rsi + result: KitchenKnife + completetime: 400 + materials: + steel: 30 + +- type: latheRecipe + id: DrinkMug + icon: Objects/Consumable/Drinks/mug.rsi + result: DrinkMug + completetime: 200 + materials: + glass: 20 + +- type: latheRecipe + id: DrinkMugMetal + icon: Objects/Consumable/Drinks/mug_metal.rsi + result: DrinkMugMetal + completetime: 200 + materials: + steel: 20 + +- type: latheRecipe + id: DrinkGlass + icon: Objects/Consumable/Drinks/glass_clear.rsi + result: DrinkGlass + completetime: 200 + materials: + glass: 15 diff --git a/Resources/Prototypes/Catalog/LatheRecipes/janitorial.yml b/Resources/Prototypes/Catalog/LatheRecipes/janitorial.yml index 5dea57dd21..2192205135 100644 --- a/Resources/Prototypes/Catalog/LatheRecipes/janitorial.yml +++ b/Resources/Prototypes/Catalog/LatheRecipes/janitorial.yml @@ -39,3 +39,11 @@ completetime: 500 materials: glass: 50 + +- type: latheRecipe + id: TrashBag + icon: Objects/Specific/Janitorial/trashbag.rsi + result: TrashBag + completetime: 300 + materials: + glass: 15 diff --git a/Resources/Prototypes/Catalog/LatheRecipes/medical.yml b/Resources/Prototypes/Catalog/LatheRecipes/medical.yml index 8bc5004a0d..f60ac0b5f5 100644 --- a/Resources/Prototypes/Catalog/LatheRecipes/medical.yml +++ b/Resources/Prototypes/Catalog/LatheRecipes/medical.yml @@ -74,3 +74,11 @@ completetime: 500 materials: steel: 50 + +- type: latheRecipe + id: BodyBag_Item + icon: Objects/Specific/Morgue/bodybags.rsi + result: BodyBag_Item + completetime: 300 + materials: + glass: 20 diff --git a/Resources/Prototypes/Catalog/LatheRecipes/misc.yml b/Resources/Prototypes/Catalog/LatheRecipes/misc.yml index 73e7644726..d58d31231f 100644 --- a/Resources/Prototypes/Catalog/LatheRecipes/misc.yml +++ b/Resources/Prototypes/Catalog/LatheRecipes/misc.yml @@ -58,3 +58,11 @@ materials: steel: 80 glass: 30 + +- type: latheRecipe + id: Matchbox + icon: Objects/Tools/matches.rsi + result: Matchbox + completetime: 10 + materials: + glass: 10