From a346d75e4160da39f39ca178d6eac2bfa5ce6dc7 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Fri, 29 Sep 2023 16:09:10 +0200 Subject: [PATCH 1/5] Wizard robe eva --- .../Prototypes/Entities/Clothing/OuterClothing/misc.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml index 4c14f478192..270d96bc678 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml @@ -161,7 +161,7 @@ # Is this wizard wearing a fanny pack??? - type: entity - parent: ClothingOuterBase + parent: ClothingOuterEVASuitBase # DeltaV - Make real wizard robes EVA graded id: ClothingOuterWizardViolet name: violet wizard robes description: A bizarre gem-encrusted violet robe that radiates magical energies. @@ -172,7 +172,7 @@ sprite: Clothing/OuterClothing/Misc/violetwizard.rsi - type: entity - parent: ClothingOuterBase + parent: ClothingOuterEVASuitBase # DeltaV - Make real wizard robes EVA graded id: ClothingOuterWizard name: wizard robes description: A bizarre gem-encrusted blue robe that radiates magical energies. @@ -183,7 +183,7 @@ sprite: Clothing/OuterClothing/Misc/wizard.rsi - type: entity - parent: ClothingOuterBase + parent: ClothingOuterEVASuitBase # DeltaV - Make real wizard robes EVA graded id: ClothingOuterWizardRed name: red wizard robes description: Strange-looking, red, hat-wear that most certainly belongs to a real magic user. From 027cae17b461fed195d8eab3740df1cffe2fabcd Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Fri, 29 Sep 2023 16:10:09 +0200 Subject: [PATCH 2/5] a --- .../Prototypes/Entities/Clothing/OuterClothing/misc.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml index 270d96bc678..58ae237b9ab 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml @@ -161,7 +161,7 @@ # Is this wizard wearing a fanny pack??? - type: entity - parent: ClothingOuterEVASuitBase # DeltaV - Make real wizard robes EVA graded + parent: ClothingOuterEVASuitBase # DeltaV - Make real wizard robes EVA id: ClothingOuterWizardViolet name: violet wizard robes description: A bizarre gem-encrusted violet robe that radiates magical energies. @@ -172,7 +172,7 @@ sprite: Clothing/OuterClothing/Misc/violetwizard.rsi - type: entity - parent: ClothingOuterEVASuitBase # DeltaV - Make real wizard robes EVA graded + parent: ClothingOuterEVASuitBase # DeltaV - Make real wizard robes EVA id: ClothingOuterWizard name: wizard robes description: A bizarre gem-encrusted blue robe that radiates magical energies. @@ -183,7 +183,7 @@ sprite: Clothing/OuterClothing/Misc/wizard.rsi - type: entity - parent: ClothingOuterEVASuitBase # DeltaV - Make real wizard robes EVA graded + parent: ClothingOuterEVASuitBase # DeltaV - Make real wizard robes EVA id: ClothingOuterWizardRed name: red wizard robes description: Strange-looking, red, hat-wear that most certainly belongs to a real magic user. From 63502295783984dcae60358f2744583574837ab0 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Fri, 29 Sep 2023 16:19:56 +0200 Subject: [PATCH 3/5] there's a wizard hardsuit by the way --- Resources/Prototypes/Entities/Clothing/Head/hats.yml | 12 +++++++++--- .../Entities/Clothing/OuterClothing/misc.yml | 6 +++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index c2ecf0f9466..3ee528c65f4 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -337,7 +337,7 @@ sprite: Clothing/Head/Hats/plaguedoctor.rsi - type: entity - parent: ClothingHeadBase + parent: ClothingHeadEVAHelmetBase # DeltaV - Make real wizard clothes space proof id: ClothingHeadHatRedwizard name: red wizard hat description: Strange-looking red hat-wear that most certainly belongs to a real magic user. @@ -346,6 +346,9 @@ sprite: Clothing/Head/Hats/redwizard.rsi - type: Clothing sprite: Clothing/Head/Hats/redwizard.rsi + - type: Tag + tags: + - WhitelistChameleon - type: entity parent: ClothingHeadBase @@ -437,7 +440,7 @@ accent: RussianAccent - type: entity - parent: ClothingHeadBase + parent: ClothingHeadEVAHelmetBase # DeltaV - Make real wizard clothes space proof id: ClothingHeadHatVioletwizard name: violet wizard hat description: "Strange-looking violet hat-wear that most certainly belongs to a real magic user." @@ -446,6 +449,9 @@ sprite: Clothing/Head/Hats/violetwizard.rsi - type: Clothing sprite: Clothing/Head/Hats/violetwizard.rsi + - type: Tag + tags: + - WhitelistChameleon - type: entity parent: ClothingHeadBase @@ -481,7 +487,7 @@ sprite: Clothing/Head/Hats/wizard_fake.rsi - type: entity - parent: ClothingHeadBase + parent: ClothingHeadEVAHelmetBase # DeltaV - Make real wizard clothes space proof id: ClothingHeadHatWizard name: wizard hat description: Strange-looking blue hat-wear that most certainly belongs to a powerful magic user. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml index 58ae237b9ab..c19560ab1e4 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml @@ -161,7 +161,7 @@ # Is this wizard wearing a fanny pack??? - type: entity - parent: ClothingOuterEVASuitBase # DeltaV - Make real wizard robes EVA + parent: ClothingOuterEVASuitBase # DeltaV - Make real wizard clothes space proof id: ClothingOuterWizardViolet name: violet wizard robes description: A bizarre gem-encrusted violet robe that radiates magical energies. @@ -172,7 +172,7 @@ sprite: Clothing/OuterClothing/Misc/violetwizard.rsi - type: entity - parent: ClothingOuterEVASuitBase # DeltaV - Make real wizard robes EVA + parent: ClothingOuterEVASuitBase # DeltaV - Make real wizard clothes space proof id: ClothingOuterWizard name: wizard robes description: A bizarre gem-encrusted blue robe that radiates magical energies. @@ -183,7 +183,7 @@ sprite: Clothing/OuterClothing/Misc/wizard.rsi - type: entity - parent: ClothingOuterEVASuitBase # DeltaV - Make real wizard robes EVA + parent: ClothingOuterEVASuitBase # DeltaV - Make real wizard clothes space proof id: ClothingOuterWizardRed name: red wizard robes description: Strange-looking, red, hat-wear that most certainly belongs to a real magic user. From f07d84f27cfe30e652b10d4048aef52557e6a650 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Fri, 29 Sep 2023 16:22:08 +0200 Subject: [PATCH 4/5] dupe --- Resources/Prototypes/Entities/Clothing/Head/hats.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 3ee528c65f4..332a04dc0d2 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -346,9 +346,6 @@ sprite: Clothing/Head/Hats/redwizard.rsi - type: Clothing sprite: Clothing/Head/Hats/redwizard.rsi - - type: Tag - tags: - - WhitelistChameleon - type: entity parent: ClothingHeadBase @@ -449,9 +446,6 @@ sprite: Clothing/Head/Hats/violetwizard.rsi - type: Clothing sprite: Clothing/Head/Hats/violetwizard.rsi - - type: Tag - tags: - - WhitelistChameleon - type: entity parent: ClothingHeadBase From e6cd87ac0b4949345b13a23ae147d44d858d17b8 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Sat, 30 Sep 2023 13:09:41 +0200 Subject: [PATCH 5/5] remove baldness --- .../Entities/Clothing/Head/hats.yml | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 332a04dc0d2..70e6902e667 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -337,7 +337,7 @@ sprite: Clothing/Head/Hats/plaguedoctor.rsi - type: entity - parent: ClothingHeadEVAHelmetBase # DeltaV - Make real wizard clothes space proof + parent: ClothingHeadBase id: ClothingHeadHatRedwizard name: red wizard hat description: Strange-looking red hat-wear that most certainly belongs to a real magic user. @@ -346,6 +346,11 @@ sprite: Clothing/Head/Hats/redwizard.rsi - type: Clothing sprite: Clothing/Head/Hats/redwizard.rsi + - type: PressureProtection # DeltaV - Make real wizard clothes space proof + highPressureMultiplier: 0.6 + lowPressureMultiplier: 1000 + - type: TemperatureProtection + coefficient: 0.2 - type: entity parent: ClothingHeadBase @@ -437,7 +442,7 @@ accent: RussianAccent - type: entity - parent: ClothingHeadEVAHelmetBase # DeltaV - Make real wizard clothes space proof + parent: ClothingHeadBase id: ClothingHeadHatVioletwizard name: violet wizard hat description: "Strange-looking violet hat-wear that most certainly belongs to a real magic user." @@ -446,6 +451,11 @@ sprite: Clothing/Head/Hats/violetwizard.rsi - type: Clothing sprite: Clothing/Head/Hats/violetwizard.rsi + - type: PressureProtection # DeltaV - Make real wizard clothes space proof + highPressureMultiplier: 0.6 + lowPressureMultiplier: 1000 + - type: TemperatureProtection + coefficient: 0.2 - type: entity parent: ClothingHeadBase @@ -481,7 +491,7 @@ sprite: Clothing/Head/Hats/wizard_fake.rsi - type: entity - parent: ClothingHeadEVAHelmetBase # DeltaV - Make real wizard clothes space proof + parent: ClothingHeadBase id: ClothingHeadHatWizard name: wizard hat description: Strange-looking blue hat-wear that most certainly belongs to a powerful magic user. @@ -495,6 +505,11 @@ - ClothMade - HamsterWearable - WhitelistChameleon + - type: PressureProtection # DeltaV - Make real wizard clothes space proof + highPressureMultiplier: 0.6 + lowPressureMultiplier: 1000 + - type: TemperatureProtection + coefficient: 0.2 - type: entity parent: ClothingHeadBase