From d27ee0a419429bcef977477632da33292c7dfa35 Mon Sep 17 00:00:00 2001 From: aada Date: Wed, 8 Jan 2025 20:25:08 -0600 Subject: [PATCH 1/7] uniform --- .../Locale/en-US/lathe/lathe-categories.ftl | 9 ++++++++ .../Prototypes/Recipes/Lathes/categories.yml | 23 ++++++++++++++++++- .../Prototypes/Recipes/Lathes/clothing.yml | 16 ++++++++++++- 3 files changed, 46 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/en-US/lathe/lathe-categories.ftl b/Resources/Locale/en-US/lathe/lathe-categories.ftl index 7a4c20918cf3..adf1b67db785 100644 --- a/Resources/Locale/en-US/lathe/lathe-categories.ftl +++ b/Resources/Locale/en-US/lathe/lathe-categories.ftl @@ -1,3 +1,4 @@ +# Generic lathe-category-ammo = Ammo lathe-category-circuitry = Circuitry lathe-category-lights = Lights @@ -7,6 +8,14 @@ lathe-category-robotics = Robotics lathe-category-tools = Tools lathe-category-weapons = Weapons +# Biogen lathe-category-food = Food lathe-category-chemicals = Chemicals lathe-category-materials = Materials + +# Uniform +lathe-category-coat = Coat +lathe-category-command = Command +lathe-category-hat = Hat +lathe-category-jumpsuit = Jumpsuit +lathe-category-neck = Neck diff --git a/Resources/Prototypes/Recipes/Lathes/categories.yml b/Resources/Prototypes/Recipes/Lathes/categories.yml index 0d26305b75f7..dec247df1630 100644 --- a/Resources/Prototypes/Recipes/Lathes/categories.yml +++ b/Resources/Prototypes/Recipes/Lathes/categories.yml @@ -1,3 +1,4 @@ +# Generic - type: latheCategory id: Ammo name: lathe-category-ammo @@ -31,7 +32,6 @@ name: lathe-category-weapons # Biogen - - type: latheCategory id: Food name: lathe-category-food @@ -43,3 +43,24 @@ - type: latheCategory id: Materials name: lathe-category-materials + +# Uniform printer +- type: latheCategory + id: Coat + name: lathe-category-coat + +- type: latheCategory + id: Command + name: lathe-category-command + +- type: latheCategory + id: Hat + name: lathe-category-hat + +- type: latheCategory + id: Jumpsuit + name: lathe-category-jumpsuit + +- type: latheCategory + id: Neck + name: lathe-category-neck diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index 0db72f36636e..40e3ee31fd0b 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -3,6 +3,7 @@ - type: latheRecipe abstract: true id: BaseJumpsuitRecipe + category: Jumpsuit completetime: 4 materials: Cloth: 300 @@ -11,6 +12,9 @@ abstract: true parent: BaseJumpsuitRecipe id: BaseCommandJumpsuitRecipe + category: + - Command + - Jumpsuit materials: Cloth: 300 Durathread: 100 @@ -18,6 +22,7 @@ - type: latheRecipe abstract: true id: BaseCoatRecipe + category: Coat completetime: 3.2 # don't ask why its faster than a jumpsuit?? materials: Cloth: 500 @@ -27,6 +32,9 @@ abstract: true parent: BaseCoatRecipe id: BaseCommandCoatRecipe + category: + - Command + - Coat materials: Cloth: 500 Durathread: 300 @@ -34,6 +42,7 @@ - type: latheRecipe abstract: true id: BaseHatRecipe + category: Hat completetime: 2 materials: Cloth: 100 @@ -41,6 +50,7 @@ - type: latheRecipe abstract: true id: BaseCarpetRecipe + category: Tiles completetime: 1 materials: Cloth: 100 @@ -49,6 +59,9 @@ abstract: true parent: BaseHatRecipe id: BaseCommandHatRecipe + category: + - Command + - Hat materials: Cloth: 100 Durathread: 50 @@ -56,11 +69,12 @@ - type: latheRecipe abstract: true id: BaseNeckClothingRecipe + category: Neck completetime: 2 materials: Cloth: 200 -# Recipes +## Recipes # Jumpsuits/skirts - type: latheRecipe From 53d654d37c9defd4f4b371294ee3a21812a12edf Mon Sep 17 00:00:00 2001 From: aada Date: Wed, 8 Jan 2025 20:29:44 -0600 Subject: [PATCH 2/7] missing category --- Resources/Locale/en-US/lathe/lathe-categories.ftl | 1 + Resources/Prototypes/Recipes/Lathes/categories.yml | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/Resources/Locale/en-US/lathe/lathe-categories.ftl b/Resources/Locale/en-US/lathe/lathe-categories.ftl index adf1b67db785..49750637f337 100644 --- a/Resources/Locale/en-US/lathe/lathe-categories.ftl +++ b/Resources/Locale/en-US/lathe/lathe-categories.ftl @@ -5,6 +5,7 @@ lathe-category-lights = Lights lathe-category-mechs = Mechs lathe-category-parts = Parts lathe-category-robotics = Robotics +lathe-category-tiles = Tiles lathe-category-tools = Tools lathe-category-weapons = Weapons diff --git a/Resources/Prototypes/Recipes/Lathes/categories.yml b/Resources/Prototypes/Recipes/Lathes/categories.yml index dec247df1630..f792837668c9 100644 --- a/Resources/Prototypes/Recipes/Lathes/categories.yml +++ b/Resources/Prototypes/Recipes/Lathes/categories.yml @@ -23,6 +23,10 @@ id: Robotics name: lathe-category-robotics +- type: latheCategory + id: Tiles + name: lathe-category-tiles + - type: latheCategory id: Tools name: lathe-category-tools From bf8869939e2859362a4578f89163fea4e43ed6fe Mon Sep 17 00:00:00 2001 From: aada Date: Wed, 8 Jan 2025 21:54:10 -0600 Subject: [PATCH 3/7] lint --- Resources/Prototypes/Recipes/Lathes/clothing.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index 40e3ee31fd0b..859a2205ac57 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -3,7 +3,7 @@ - type: latheRecipe abstract: true id: BaseJumpsuitRecipe - category: Jumpsuit + category: [ Jumpsuit ] completetime: 4 materials: Cloth: 300 @@ -22,7 +22,7 @@ - type: latheRecipe abstract: true id: BaseCoatRecipe - category: Coat + category: [ Coat ] completetime: 3.2 # don't ask why its faster than a jumpsuit?? materials: Cloth: 500 @@ -42,7 +42,7 @@ - type: latheRecipe abstract: true id: BaseHatRecipe - category: Hat + category: [ Hat ] completetime: 2 materials: Cloth: 100 @@ -50,7 +50,7 @@ - type: latheRecipe abstract: true id: BaseCarpetRecipe - category: Tiles + category: [ Tiles ] completetime: 1 materials: Cloth: 100 @@ -69,7 +69,7 @@ - type: latheRecipe abstract: true id: BaseNeckClothingRecipe - category: Neck + category: [ Neck ] completetime: 2 materials: Cloth: 200 From 4ac17d7b0e65044d324d9e163b0f5a14f59bbb85 Mon Sep 17 00:00:00 2001 From: aada Date: Sun, 19 Jan 2025 15:20:56 -0600 Subject: [PATCH 4/7] bedsheets --- .../Locale/en-US/lathe/lathe-categories.ftl | 7 +++--- .../Prototypes/Recipes/Lathes/bedsheets.yml | 2 ++ .../Prototypes/Recipes/Lathes/categories.yml | 16 ++++++++----- .../Prototypes/Recipes/Lathes/clothing.yml | 24 +++++++++++-------- 4 files changed, 30 insertions(+), 19 deletions(-) diff --git a/Resources/Locale/en-US/lathe/lathe-categories.ftl b/Resources/Locale/en-US/lathe/lathe-categories.ftl index 49750637f337..58bc58429272 100644 --- a/Resources/Locale/en-US/lathe/lathe-categories.ftl +++ b/Resources/Locale/en-US/lathe/lathe-categories.ftl @@ -15,8 +15,9 @@ lathe-category-chemicals = Chemicals lathe-category-materials = Materials # Uniform -lathe-category-coat = Coat +lathe-category-beadsheets = Beadsheets +lathe-category-coats = Coats lathe-category-command = Command -lathe-category-hat = Hat -lathe-category-jumpsuit = Jumpsuit +lathe-category-hats = Hats +lathe-category-jumpsuits = Jumpsuits lathe-category-neck = Neck diff --git a/Resources/Prototypes/Recipes/Lathes/bedsheets.yml b/Resources/Prototypes/Recipes/Lathes/bedsheets.yml index 1ff143e49140..01c0e0f67c30 100644 --- a/Resources/Prototypes/Recipes/Lathes/bedsheets.yml +++ b/Resources/Prototypes/Recipes/Lathes/bedsheets.yml @@ -1,6 +1,8 @@ - type: latheRecipe abstract: true id: BaseBedsheetRecipe + categories: + - Bedsheets completetime: 2 materials: Cloth: 150 diff --git a/Resources/Prototypes/Recipes/Lathes/categories.yml b/Resources/Prototypes/Recipes/Lathes/categories.yml index f792837668c9..d1cc57bc7c92 100644 --- a/Resources/Prototypes/Recipes/Lathes/categories.yml +++ b/Resources/Prototypes/Recipes/Lathes/categories.yml @@ -50,20 +50,24 @@ # Uniform printer - type: latheCategory - id: Coat - name: lathe-category-coat + id: Beadsheets + name: lathe-category-beadsheets + +- type: latheCategory + id: Coats + name: lathe-category-coats - type: latheCategory id: Command name: lathe-category-command - type: latheCategory - id: Hat - name: lathe-category-hat + id: Hats + name: lathe-category-hats - type: latheCategory - id: Jumpsuit - name: lathe-category-jumpsuit + id: Jumpsuits + name: lathe-category-jumpsuits - type: latheCategory id: Neck diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index 2274b59a01f1..b03db0c1036b 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -3,7 +3,8 @@ - type: latheRecipe abstract: true id: BaseJumpsuitRecipe - category: [ Jumpsuit ] + categories: + - Jumpsuits completetime: 4 materials: Cloth: 300 @@ -12,9 +13,9 @@ abstract: true parent: BaseJumpsuitRecipe id: BaseCommandJumpsuitRecipe - category: + categories: + - Jumpsuits - Command - - Jumpsuit materials: Cloth: 300 Durathread: 100 @@ -22,7 +23,8 @@ - type: latheRecipe abstract: true id: BaseCoatRecipe - category: [ Coat ] + categories: + - Coats completetime: 3.2 # don't ask why its faster than a jumpsuit?? materials: Cloth: 500 @@ -32,9 +34,9 @@ abstract: true parent: BaseCoatRecipe id: BaseCommandCoatRecipe - category: + categories: + - Coats - Command - - Coat materials: Cloth: 500 Durathread: 300 @@ -42,7 +44,8 @@ - type: latheRecipe abstract: true id: BaseHatRecipe - category: [ Hat ] + categories: + - Hats completetime: 2 materials: Cloth: 100 @@ -51,9 +54,9 @@ abstract: true parent: BaseHatRecipe id: BaseCommandHatRecipe - category: + categories: + - Hats - Command - - Hat materials: Cloth: 100 Durathread: 50 @@ -61,7 +64,8 @@ - type: latheRecipe abstract: true id: BaseNeckClothingRecipe - category: [ Neck ] + categories: + - Neck completetime: 2 materials: Cloth: 200 From c60bc58fae83040db51d12903c616f0cf00c3e81 Mon Sep 17 00:00:00 2001 From: aada Date: Sun, 19 Jan 2025 19:41:03 -0600 Subject: [PATCH 5/7] carpets --- Resources/Locale/en-US/lathe/lathe-categories.ftl | 2 +- Resources/Prototypes/Recipes/Lathes/carpets.yml | 2 ++ Resources/Prototypes/Recipes/Lathes/categories.yml | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Resources/Locale/en-US/lathe/lathe-categories.ftl b/Resources/Locale/en-US/lathe/lathe-categories.ftl index 58bc58429272..f27ad1c5037a 100644 --- a/Resources/Locale/en-US/lathe/lathe-categories.ftl +++ b/Resources/Locale/en-US/lathe/lathe-categories.ftl @@ -5,7 +5,6 @@ lathe-category-lights = Lights lathe-category-mechs = Mechs lathe-category-parts = Parts lathe-category-robotics = Robotics -lathe-category-tiles = Tiles lathe-category-tools = Tools lathe-category-weapons = Weapons @@ -16,6 +15,7 @@ lathe-category-materials = Materials # Uniform lathe-category-beadsheets = Beadsheets +lathe-category-carpets = Carpets lathe-category-coats = Coats lathe-category-command = Command lathe-category-hats = Hats diff --git a/Resources/Prototypes/Recipes/Lathes/carpets.yml b/Resources/Prototypes/Recipes/Lathes/carpets.yml index fdf9705c23ce..cd0e29776a83 100644 --- a/Resources/Prototypes/Recipes/Lathes/carpets.yml +++ b/Resources/Prototypes/Recipes/Lathes/carpets.yml @@ -1,6 +1,8 @@ - type: latheRecipe abstract: true id: BaseCarpetRecipe + categories: + - Carpets completetime: 1 materials: Cloth: 100 diff --git a/Resources/Prototypes/Recipes/Lathes/categories.yml b/Resources/Prototypes/Recipes/Lathes/categories.yml index d1cc57bc7c92..a4ccabfaacc3 100644 --- a/Resources/Prototypes/Recipes/Lathes/categories.yml +++ b/Resources/Prototypes/Recipes/Lathes/categories.yml @@ -23,10 +23,6 @@ id: Robotics name: lathe-category-robotics -- type: latheCategory - id: Tiles - name: lathe-category-tiles - - type: latheCategory id: Tools name: lathe-category-tools @@ -53,6 +49,10 @@ id: Beadsheets name: lathe-category-beadsheets +- type: latheCategory + id: Carpets + name: lathe-category-carpets + - type: latheCategory id: Coats name: lathe-category-coats From a76598b1e7187d37156136bf5545e5a1201ade46 Mon Sep 17 00:00:00 2001 From: aada Date: Mon, 20 Jan 2025 13:38:06 -0600 Subject: [PATCH 6/7] typo --- Resources/Locale/en-US/lathe/lathe-categories.ftl | 2 +- Resources/Prototypes/Recipes/Lathes/categories.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/en-US/lathe/lathe-categories.ftl b/Resources/Locale/en-US/lathe/lathe-categories.ftl index f27ad1c5037a..c6e300e0080a 100644 --- a/Resources/Locale/en-US/lathe/lathe-categories.ftl +++ b/Resources/Locale/en-US/lathe/lathe-categories.ftl @@ -14,7 +14,7 @@ lathe-category-chemicals = Chemicals lathe-category-materials = Materials # Uniform -lathe-category-beadsheets = Beadsheets +lathe-category-bedsheets = Bedsheets lathe-category-carpets = Carpets lathe-category-coats = Coats lathe-category-command = Command diff --git a/Resources/Prototypes/Recipes/Lathes/categories.yml b/Resources/Prototypes/Recipes/Lathes/categories.yml index a4ccabfaacc3..486d8a090df4 100644 --- a/Resources/Prototypes/Recipes/Lathes/categories.yml +++ b/Resources/Prototypes/Recipes/Lathes/categories.yml @@ -46,8 +46,8 @@ # Uniform printer - type: latheCategory - id: Beadsheets - name: lathe-category-beadsheets + id: Bedsheets + name: lathe-category-bedsheets - type: latheCategory id: Carpets From f94176d7296fce6a13495c9b4819b07deb11407a Mon Sep 17 00:00:00 2001 From: aada Date: Sat, 8 Feb 2025 20:08:29 -0600 Subject: [PATCH 7/7] indent --- .../Prototypes/Recipes/Lathes/bedsheets.yml | 2 +- .../Prototypes/Recipes/Lathes/carpets.yml | 2 +- .../Prototypes/Recipes/Lathes/clothing.yml | 20 +++++++++---------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Resources/Prototypes/Recipes/Lathes/bedsheets.yml b/Resources/Prototypes/Recipes/Lathes/bedsheets.yml index 01c0e0f67c30..386ef7ab82ef 100644 --- a/Resources/Prototypes/Recipes/Lathes/bedsheets.yml +++ b/Resources/Prototypes/Recipes/Lathes/bedsheets.yml @@ -2,7 +2,7 @@ abstract: true id: BaseBedsheetRecipe categories: - - Bedsheets + - Bedsheets completetime: 2 materials: Cloth: 150 diff --git a/Resources/Prototypes/Recipes/Lathes/carpets.yml b/Resources/Prototypes/Recipes/Lathes/carpets.yml index cd0e29776a83..fe172879e71d 100644 --- a/Resources/Prototypes/Recipes/Lathes/carpets.yml +++ b/Resources/Prototypes/Recipes/Lathes/carpets.yml @@ -2,7 +2,7 @@ abstract: true id: BaseCarpetRecipe categories: - - Carpets + - Carpets completetime: 1 materials: Cloth: 100 diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index b03db0c1036b..2e92840be7c8 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -4,7 +4,7 @@ abstract: true id: BaseJumpsuitRecipe categories: - - Jumpsuits + - Jumpsuits completetime: 4 materials: Cloth: 300 @@ -14,8 +14,8 @@ parent: BaseJumpsuitRecipe id: BaseCommandJumpsuitRecipe categories: - - Jumpsuits - - Command + - Jumpsuits + - Command materials: Cloth: 300 Durathread: 100 @@ -24,7 +24,7 @@ abstract: true id: BaseCoatRecipe categories: - - Coats + - Coats completetime: 3.2 # don't ask why its faster than a jumpsuit?? materials: Cloth: 500 @@ -35,8 +35,8 @@ parent: BaseCoatRecipe id: BaseCommandCoatRecipe categories: - - Coats - - Command + - Coats + - Command materials: Cloth: 500 Durathread: 300 @@ -45,7 +45,7 @@ abstract: true id: BaseHatRecipe categories: - - Hats + - Hats completetime: 2 materials: Cloth: 100 @@ -55,8 +55,8 @@ parent: BaseHatRecipe id: BaseCommandHatRecipe categories: - - Hats - - Command + - Hats + - Command materials: Cloth: 100 Durathread: 50 @@ -65,7 +65,7 @@ abstract: true id: BaseNeckClothingRecipe categories: - - Neck + - Neck completetime: 2 materials: Cloth: 200