From 04cf1c3c49446571d9c52eac2431c7562c25984e Mon Sep 17 00:00:00 2001 From: MACMAN2003 Date: Sat, 6 Jan 2024 06:54:57 -0800 Subject: [PATCH] Add hats and berets to the uniform printer (take 2) (#23556) * hates and beretes welcome to team 4tress, after eighteen millennia in development, hopefully it will have been worth the wait * EEYIKES!! How will I ever "fix" these "typos"??? * SPELL WARS 2: ATTACK OF THE TYPOS hlep me i catn' stop speeling bad * put hats above associated uniforms --- .../Entities/Structures/Machines/lathe.yml | 21 +++ .../Prototypes/Recipes/Lathes/clothing.yml | 160 ++++++++++++++++++ 2 files changed, 181 insertions(+) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 5cafca6560..07d5f3f854 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -847,6 +847,8 @@ - ClothingUniformJumpskirtColorGrey - ClothingUniformJumpsuitBartender - ClothingUniformJumpskirtBartender + - ClothingHeadHatCapcap + - ClothingHeadHatCaptain - ClothingUniformJumpsuitCaptain - ClothingUniformJumpskirtCaptain - ClothingUniformJumpsuitCapFormal @@ -854,6 +856,7 @@ - ClothingUniformJumpsuitCargo - ClothingUniformJumpskirtCargo - ClothingUniformJumpsuitSalvageSpecialist + - ClothingHeadHatBeretEngineering - ClothingUniformJumpsuitChiefEngineer - ClothingUniformJumpskirtChiefEngineer - ClothingUniformJumpsuitChiefEngineerTurtle @@ -865,14 +868,18 @@ - ClothingUniformJumpsuitChemistry - ClothingUniformJumpskirtChemistry - ClothingUniformJumpsuitClown + - ClothingHeadHatBeretCmo - ClothingUniformJumpsuitCMO - ClothingUniformJumpskirtCMO - ClothingUniformJumpsuitDetective - ClothingUniformJumpskirtDetective - ClothingUniformJumpsuitEngineering - ClothingUniformJumpskirtEngineering + - ClothingHeadHatHopcap - ClothingUniformJumpsuitHoP - ClothingUniformJumpskirtHoP + - ClothingHeadHatBeretHoS + - ClothingHeadHatHoshat - ClothingUniformJumpsuitHoS - ClothingUniformJumpskirtHoS - ClothingUniformJumpsuitHosFormal @@ -890,6 +897,7 @@ - ClothingUniformJumpsuitLawyerBlack - ClothingUniformJumpsuitLibrarian - ClothingUniformJumpskirtColorLightBrown + - ClothingHeadHatBeretSeniorPhysician - ClothingUniformJumpsuitMedicalDoctor - ClothingUniformJumpskirtMedicalDoctor - ClothingUniformJumpsuitMime @@ -899,18 +907,24 @@ - ClothingUniformJumpskirtParamedic - ClothingUniformJumpsuitPrisoner - ClothingUniformJumpskirtPrisoner + - ClothingHeadHatQMsoft - ClothingUniformJumpsuitQM - ClothingUniformJumpskirtQM - ClothingUniformJumpsuitQMTurtleneck - ClothingUniformJumpskirtQMTurtleneck + - ClothingHeadHatBeretRND - ClothingUniformJumpsuitResearchDirector - ClothingUniformJumpskirtResearchDirector - ClothingUniformJumpsuitScientist - ClothingUniformJumpskirtScientist + - ClothingHeadHatBeretSecurity - ClothingUniformJumpsuitSec - ClothingUniformJumpskirtSec + - ClothingHeadHatBeretBrigmedic - ClothingUniformJumpsuitBrigmedic - ClothingUniformJumpskirtBrigmedic + - ClothingHeadHatBeretWarden + - ClothingHeadHatWarden - ClothingUniformJumpsuitWarden - ClothingUniformJumpskirtWarden - ClothingOuterWinterCap @@ -949,17 +963,24 @@ - ClothingOuterWinterSec - type: EmagLatheRecipes emagStaticRecipes: + - ClothingHeadHatCentcomcap + - ClothingHeadHatCentcom - ClothingUniformJumpsuitCentcomAgent - ClothingUniformJumpsuitCentcomFormal - ClothingUniformJumpskirtCentcomFormalDress - ClothingUniformJumpsuitCentcomOfficer - ClothingUniformJumpsuitCentcomOfficial + - ClothingHeadHatSyndieMAA + - ClothingHeadHatSyndie - ClothingUniformJumpsuitOperative - ClothingUniformJumpskirtOperative - ClothingUniformJumpsuitSyndieFormal - ClothingUniformJumpskirtSyndieFormalDress + - ClothingHeadPyjamaSyndicateBlack - ClothingUniformJumpsuitPyjamaSyndicateBlack + - ClothingHeadPyjamaSyndicatePink - ClothingUniformJumpsuitPyjamaSyndicatePink + - ClothingHeadPyjamaSyndicateRed - ClothingUniformJumpsuitPyjamaSyndicateRed - ClothingOuterWinterCentcom - ClothingOuterWinterSyndie diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index 942970a7d6..65ee7fb17b 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -876,3 +876,163 @@ completetime: 3.2 materials: Cloth: 500 + +- type: latheRecipe + id: ClothingHeadHatCaptain + result: ClothingHeadHatCaptain + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 + +- type: latheRecipe + id: ClothingHeadHatCapcap + result: ClothingHeadHatCapcap + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 + +- type: latheRecipe + id: ClothingHeadHatBeretHoS + result: ClothingHeadHatBeretHoS + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 + +- type: latheRecipe + id: ClothingHeadHatHoshat + result: ClothingHeadHatHoshat + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 + +- type: latheRecipe + id: ClothingHeadHatWarden + result: ClothingHeadHatWarden + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 + +- type: latheRecipe + id: ClothingHeadHatBeretWarden + result: ClothingHeadHatBeretWarden + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 + +- type: latheRecipe + id: ClothingHeadHatHopcap + result: ClothingHeadHatHopcap + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 + +- type: latheRecipe + id: ClothingHeadHatQMsoft + result: ClothingHeadHatQMsoft + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 + +- type: latheRecipe + id: ClothingHeadHatBeretRND + result: ClothingHeadHatBeretRND + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 + +- type: latheRecipe + id: ClothingHeadHatBeretEngineering + result: ClothingHeadHatBeretEngineering + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 + +- type: latheRecipe + id: ClothingHeadHatBeretCmo + result: ClothingHeadHatBeretCmo + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 + +- type: latheRecipe + id: ClothingHeadHatBeretBrigmedic + result: ClothingHeadHatBeretBrigmedic + completetime: 2 + materials: + Cloth: 100 + +- type: latheRecipe + id: ClothingHeadHatBeretSecurity + result: ClothingHeadHatBeretSecurity + completetime: 2 + materials: + Cloth: 100 + +- type: latheRecipe + id: ClothingHeadHatBeretSeniorPhysician + result: ClothingHeadHatBeretSeniorPhysician + completetime: 2 + materials: + Cloth: 100 + +- type: latheRecipe + id: ClothingHeadHatCentcom + result: ClothingHeadHatCentcom + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 + +- type: latheRecipe + id: ClothingHeadHatCentcomcap + result: ClothingHeadHatCentcomcap + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 + +- type: latheRecipe + id: ClothingHeadHatSyndie + result: ClothingHeadHatSyndie + completetime: 2 + materials: + Cloth: 100 + +- type: latheRecipe + id: ClothingHeadHatSyndieMAA + result: ClothingHeadHatSyndieMAA + completetime: 2 + materials: + Cloth: 100 + +- type: latheRecipe + id: ClothingHeadPyjamaSyndicateBlack + result: ClothingHeadPyjamaSyndicateBlack + completetime: 2 + materials: + Cloth: 100 + +- type: latheRecipe + id: ClothingHeadPyjamaSyndicatePink + result: ClothingHeadPyjamaSyndicatePink + completetime: 2 + materials: + Cloth: 100 + +- type: latheRecipe + id: ClothingHeadPyjamaSyndicateRed + result: ClothingHeadPyjamaSyndicateRed + completetime: 2 + materials: + Cloth: 100 -- 2.51.2