]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Printable bedsheets (#34034)
authorkosticia <kosticia46@gmail.com>
Wed, 15 Jan 2025 19:35:58 +0000 (22:35 +0300)
committerGitHub <noreply@github.com>
Wed, 15 Jan 2025 19:35:58 +0000 (20:35 +0100)
* Bedsheets

* that one fixes yellow bedsheet and delete american bedsheet

Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Resources/Prototypes/Recipes/Lathes/bedsheets.yml [new file with mode: 0644]
Resources/Prototypes/Recipes/Lathes/carpets.yml [new file with mode: 0644]
Resources/Prototypes/Recipes/Lathes/clothing.yml

index 679a823241176c2a06694f28feaf1274f466081d..17f470253bb4e4f2af98e5d02e0c5f0ca54fd3ea 100644 (file)
       - CarpetPurple
       - CarpetCyan
       - CarpetWhite
+      # Bedsheets
+      - BedsheetBlack
+      - BedsheetBlue
+      - BedsheetBrown
+      - BedsheetGreen
+      - BedsheetGrey
+      - BedsheetOrange
+      - BedsheetPurple
+      - BedsheetRed
+      - BedsheetWhite
+      - BedsheetYellow
+      - BedsheetClown
+      - BedsheetCosmos
+      - BedsheetIan
+      - BedsheetMedical
+      - BedsheetMime
+      - BedsheetNT
+      - BedsheetRainbow
+      - BedsheetBrigmedic
   - type: EmagLatheRecipes
     emagStaticRecipes:
+      # Clothing
       - ClothingHeadHatCentcomcap
       - ClothingHeadHatCentcom
       - ClothingUniformJumpsuitCentcomAgent
       - ClothingOuterWinterCentcom
       - ClothingOuterWinterSyndie
       - ClothingOuterWinterSyndieCap
+      # Bedsheets
+      - 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 (file)
index 0000000..1ff143e
--- /dev/null
@@ -0,0 +1,113 @@
+- 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: BaseBedsheetRecipe
+  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: BedsheetSyndie
+  result: BedsheetSyndie
diff --git a/Resources/Prototypes/Recipes/Lathes/carpets.yml b/Resources/Prototypes/Recipes/Lathes/carpets.yml
new file mode 100644 (file)
index 0000000..fdf9705
--- /dev/null
@@ -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
index 0db72f36636e78ce9f56f310b55ae5a9dc5115c1..62e2982e5cfa4d7e93f56a209ac7f473714af335 100644 (file)
   materials:
     Cloth: 100
 
-- type: latheRecipe
-  abstract: true
-  id: BaseCarpetRecipe
-  completetime: 1
-  materials:
-    Cloth: 100
-
 - type: latheRecipe
   abstract: true
   parent: BaseHatRecipe
   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