From 211a12e909cc0327523225a09c63fbeac3f52fa0 Mon Sep 17 00:00:00 2001 From: kosticia Date: Mon, 23 Dec 2024 18:48:22 +0300 Subject: [PATCH 1/2] Bedsheets --- .../Entities/Structures/Machines/lathe.yml | 23 ++++ .../Prototypes/Recipes/Lathes/bedsheets.yml | 118 ++++++++++++++++++ .../Prototypes/Recipes/Lathes/carpets.yml | 51 ++++++++ .../Prototypes/Recipes/Lathes/clothing.yml | 53 -------- 4 files changed, 192 insertions(+), 53 deletions(-) create mode 100644 Resources/Prototypes/Recipes/Lathes/bedsheets.yml create mode 100644 Resources/Prototypes/Recipes/Lathes/carpets.yml diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index d511f5b1af5c..564e0448debb 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1082,8 +1082,29 @@ - CarpetPurple - CarpetCyan - CarpetWhite + # Bedsheets + - BedsheetBlack + - BedsheetBlue + - BedsheetBrown + - BedsheetGreen + - BedsheetGrey + - BedsheetOrange + - BedsheetPurple + - BedsheetRed + - BedsheetWhite + - BedsheetYellow + - BedsheetClown + - BedsheetCosmos + - BedsheetIan + - BedsheetMedical + - BedsheetMime + - BedsheetNT + - BedsheetRainbow + - BedsheetBrigmedic + - BedsheetUSA - type: EmagLatheRecipes emagStaticRecipes: + # Clothing - ClothingHeadHatCentcomcap - ClothingHeadHatCentcom - ClothingUniformJumpsuitCentcomAgent @@ -1106,6 +1127,8 @@ - ClothingOuterWinterCentcom - ClothingOuterWinterSyndie - ClothingOuterWinterSyndieCap + # Bedsheet + - BedsheetSyndie - type: MaterialStorage whitelist: tags: diff --git a/Resources/Prototypes/Recipes/Lathes/bedsheets.yml b/Resources/Prototypes/Recipes/Lathes/bedsheets.yml new file mode 100644 index 000000000000..b8c05869315a --- /dev/null +++ b/Resources/Prototypes/Recipes/Lathes/bedsheets.yml @@ -0,0 +1,118 @@ +- type: latheRecipe + abstract: true + id: BaseBedsheetRecipe + completetime: 2 + materials: + Cloth: 150 + +- type: latheRecipe + abstract: true + parent: BaseBedsheetRecipe + id: BaseSpecifiedBedsheetRecipe + materials: + Cloth: 150 + Durathread: 50 + + #Base bedsheets + +- type: latheRecipe + parent: BaseBedsheetRecipe + id: BedsheetBlack + result: BedsheetBlack + +- type: latheRecipe + parent: BaseBedsheetRecipe + id: BedsheetBlue + result: BedsheetBlue + +- type: latheRecipe + parent: BaseBedsheetRecipe + id: BedsheetBrown + result: BedsheetBrown + +- type: latheRecipe + parent: BaseBedsheetRecipe + id: BedsheetGreen + result: BedsheetGreen + +- type: latheRecipe + parent: BaseBedsheetRecipe + id: BedsheetGrey + result: BedsheetGrey + +- type: latheRecipe + parent: BaseBedsheetRecipe + id: BedsheetOrange + result: BedsheetOrange + +- type: latheRecipe + parent: BaseBedsheetRecipe + id: BedsheetPurple + result: BedsheetPurple + +- type: latheRecipe + parent: BaseBedsheetRecipe + id: BedsheetRed + result: BedsheetRed + +- type: latheRecipe + parent: BaseBedsheetRecipe + id: BedsheetWhite + result: BedsheetWhite + +- type: latheRecipe + parent: BaseSpecifiedBedsheetRecipe + id: BedsheetYellow + result: BedsheetYellow + + #Specified bedsheets + +- type: latheRecipe + parent: BaseSpecifiedBedsheetRecipe + id: BedsheetClown + result: BedsheetClown + +- type: latheRecipe + parent: BaseSpecifiedBedsheetRecipe + id: BedsheetCosmos + result: BedsheetCosmos + +- type: latheRecipe + parent: BaseSpecifiedBedsheetRecipe + id: BedsheetIan #I'm not sure that that should be here + result: BedsheetIan + +- type: latheRecipe + parent: BaseSpecifiedBedsheetRecipe + id: BedsheetMedical + result: BedsheetMedical + +- type: latheRecipe + parent: BaseSpecifiedBedsheetRecipe + id: BedsheetMime + result: BedsheetMime + +- type: latheRecipe + parent: BaseSpecifiedBedsheetRecipe + id: BedsheetNT + result: BedsheetNT + +- type: latheRecipe + parent: BaseSpecifiedBedsheetRecipe + id: BedsheetRainbow + result: BedsheetRainbow + +- type: latheRecipe + parent: BaseSpecifiedBedsheetRecipe + id: BedsheetBrigmedic + result: BedsheetBrigmedic + +- type: latheRecipe + parent: BaseSpecifiedBedsheetRecipe + id: BedsheetUSA + result: BedsheetUSA + +- type: latheRecipe + parent: BaseSpecifiedBedsheetRecipe + id: BedsheetSyndie + result: BedsheetSyndie diff --git a/Resources/Prototypes/Recipes/Lathes/carpets.yml b/Resources/Prototypes/Recipes/Lathes/carpets.yml new file mode 100644 index 000000000000..fdf9705c23ce --- /dev/null +++ b/Resources/Prototypes/Recipes/Lathes/carpets.yml @@ -0,0 +1,51 @@ +- type: latheRecipe + abstract: true + id: BaseCarpetRecipe + completetime: 1 + materials: + Cloth: 100 + +- type: latheRecipe + parent: BaseCarpetRecipe + id: Carpet + result: FloorCarpetItemRed + +- type: latheRecipe + parent: BaseCarpetRecipe + id: CarpetBlack + result: FloorCarpetItemBlack + +- type: latheRecipe + parent: BaseCarpetRecipe + id: CarpetPink + result: FloorCarpetItemPink + +- type: latheRecipe + parent: BaseCarpetRecipe + id: CarpetBlue + result: FloorCarpetItemBlue + +- type: latheRecipe + parent: BaseCarpetRecipe + id: CarpetGreen + result: FloorCarpetItemGreen + +- type: latheRecipe + parent: BaseCarpetRecipe + id: CarpetOrange + result: FloorCarpetItemOrange + +- type: latheRecipe + parent: BaseCarpetRecipe + id: CarpetPurple + result: FloorCarpetItemPurple + +- type: latheRecipe + parent: BaseCarpetRecipe + id: CarpetCyan + result: FloorCarpetItemCyan + +- type: latheRecipe + parent: BaseCarpetRecipe + id: CarpetWhite + result: FloorCarpetItemWhite diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index 0db72f36636e..62e2982e5cfa 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -38,13 +38,6 @@ materials: Cloth: 100 -- type: latheRecipe - abstract: true - id: BaseCarpetRecipe - completetime: 1 - materials: - Cloth: 100 - - type: latheRecipe abstract: true parent: BaseHatRecipe @@ -916,49 +909,3 @@ parent: BaseNeckClothingRecipe id: ClothingNeckScarfStripedPurple result: ClothingNeckScarfStripedPurple - -# Carpets -- type: latheRecipe - parent: BaseCarpetRecipe - id: Carpet - result: FloorCarpetItemRed - -- type: latheRecipe - parent: BaseCarpetRecipe - id: CarpetBlack - result: FloorCarpetItemBlack - -- type: latheRecipe - parent: BaseCarpetRecipe - id: CarpetPink - result: FloorCarpetItemPink - -- type: latheRecipe - parent: BaseCarpetRecipe - id: CarpetBlue - result: FloorCarpetItemBlue - -- type: latheRecipe - parent: BaseCarpetRecipe - id: CarpetGreen - result: FloorCarpetItemGreen - -- type: latheRecipe - parent: BaseCarpetRecipe - id: CarpetOrange - result: FloorCarpetItemOrange - -- type: latheRecipe - parent: BaseCarpetRecipe - id: CarpetPurple - result: FloorCarpetItemPurple - -- type: latheRecipe - parent: BaseCarpetRecipe - id: CarpetCyan - result: FloorCarpetItemCyan - -- type: latheRecipe - parent: BaseCarpetRecipe - id: CarpetWhite - result: FloorCarpetItemWhite From 1e6804fcb8ee28736ebf365dbcbbb49e1743b690 Mon Sep 17 00:00:00 2001 From: kosticia Date: Tue, 24 Dec 2024 17:06:49 +0300 Subject: [PATCH 2/2] that one fixes yellow bedsheet and delete american bedsheet --- .../Prototypes/Entities/Structures/Machines/lathe.yml | 3 +-- Resources/Prototypes/Recipes/Lathes/bedsheets.yml | 7 +------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 564e0448debb..bb568041b09f 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1101,7 +1101,6 @@ - BedsheetNT - BedsheetRainbow - BedsheetBrigmedic - - BedsheetUSA - type: EmagLatheRecipes emagStaticRecipes: # Clothing @@ -1127,7 +1126,7 @@ - ClothingOuterWinterCentcom - ClothingOuterWinterSyndie - ClothingOuterWinterSyndieCap - # Bedsheet + # Bedsheets - BedsheetSyndie - type: MaterialStorage whitelist: diff --git a/Resources/Prototypes/Recipes/Lathes/bedsheets.yml b/Resources/Prototypes/Recipes/Lathes/bedsheets.yml index b8c05869315a..1ff143e49140 100644 --- a/Resources/Prototypes/Recipes/Lathes/bedsheets.yml +++ b/Resources/Prototypes/Recipes/Lathes/bedsheets.yml @@ -61,7 +61,7 @@ result: BedsheetWhite - type: latheRecipe - parent: BaseSpecifiedBedsheetRecipe + parent: BaseBedsheetRecipe id: BedsheetYellow result: BedsheetYellow @@ -107,11 +107,6 @@ id: BedsheetBrigmedic result: BedsheetBrigmedic -- type: latheRecipe - parent: BaseSpecifiedBedsheetRecipe - id: BedsheetUSA - result: BedsheetUSA - - type: latheRecipe parent: BaseSpecifiedBedsheetRecipe id: BedsheetSyndie