diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/wizard_coats.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/wizard_coats.yml new file mode 100644 index 0000000000..4296000856 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/wizard_coats.yml @@ -0,0 +1,43 @@ +- type: entity + parent: CP14ClothingCloakBase + id: CP14ClothingCloakWizardCoatRed + name: red wizard coat + description: Clothes that wizards usually wear. I cast RIREBALL! + components: + - type: Sprite + sprite: _CP14/Clothing/Cloak/Roles/General/wizard_red_coat.rsi + - type: Clothing + sprite: _CP14/Clothing/Cloak/Roles/General/wizard_red_coat.rsi + - type: ToggleableClothing + clothingPrototype: CP14ClothingHeadWizardHoodRed + requiredSlot: + - cloak + slot: head + - type: ContainerContainer + containers: + toggleable-clothing: !type:ContainerSlot {} + - type: PhysicalComposition + materialComposition: + CP14Cloth: 30 + +- type: entity + parent: CP14ClothingCloakBase + id: CP14ClothingCloakWizardCoatBlue + name: blue wizard coat + description: Clothes that wizards usually wear. Look what happens when I cast a spell I don't know + components: + - type: Sprite + sprite: _CP14/Clothing/Cloak/Roles/General/wizard_blue_coat.rsi + - type: Clothing + sprite: _CP14/Clothing/Cloak/Roles/General/wizard_blue_coat.rsi + - type: ToggleableClothing + clothingPrototype: CP14ClothingHeadWizardHoodBlue + requiredSlot: + - cloak + slot: head + - type: ContainerContainer + containers: + toggleable-clothing: !type:ContainerSlot {} + - type: PhysicalComposition + materialComposition: + CP14Cloth: 30 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml index 538bd4b6ab..d4406fefb7 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml @@ -25,28 +25,6 @@ - type: Clothing sprite: _CP14/Clothing/Head/Roles/General/metalheadband.rsi -- type: entity - parent: CP14ClothingHeadBase - id: CP14ClothingHeadTriangularHat - name: triangular hat - description: a big, pointy hat for those who like to look smart. - components: - - type: Sprite - sprite: _CP14/Clothing/Head/Roles/General/triangularhat.rsi - - type: Clothing - sprite: _CP14/Clothing/Head/Roles/General/triangularhat.rsi - -- type: entity - parent: CP14ClothingHeadBase - id: CP14ClothingHeadTriangularHatGolden - name: golden triangular hat - description: a big, pointy hat for those who like to look smart. Decorated with a gold hoop. - components: - - type: Sprite - sprite: _CP14/Clothing/Head/Roles/General/triangularhat_golden.rsi - - type: Clothing - sprite: _CP14/Clothing/Head/Roles/General/triangularhat_golden.rsi - - type: entity parent: CP14ClothingHeadBase id: CP14ClothingHeadChristmasHat diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/wizard.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/wizard.yml new file mode 100644 index 0000000000..c3182a55e7 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/wizard.yml @@ -0,0 +1,79 @@ +- type: entity + parent: CP14ClothingHeadBase + id: CP14ClothingHeadTriangularHat + name: triangular hat + description: a big, pointy hat for those who like to look smart. + components: + - type: Sprite + sprite: _CP14/Clothing/Head/Roles/General/triangularhat.rsi + - type: Clothing + sprite: _CP14/Clothing/Head/Roles/General/triangularhat.rsi + +- type: entity + parent: CP14ClothingHeadBase + id: CP14ClothingHeadTriangularHatGolden + name: golden triangular hat + description: a big, pointy hat for those who like to look smart. Decorated with a gold hoop. + components: + - type: Sprite + sprite: _CP14/Clothing/Head/Roles/General/triangularhat_golden.rsi + - type: Clothing + sprite: _CP14/Clothing/Head/Roles/General/triangularhat_golden.rsi + +- type: entity + parent: CP14ClothingHeadBase + id: CP14ClothingHeadWizardHatRed + name: red wizard hat + description: a pointy hat for those who like to look like wizard. Decorated with a gold hoop. + components: + - type: Sprite + sprite: _CP14/Clothing/Head/Roles/General/wizard_hat_red.rsi + - type: Clothing + sprite: _CP14/Clothing/Head/Roles/General/wizard_hat_red.rsi + - type: PhysicalComposition + materialComposition: + CP14Cloth: 20 + +- type: entity + parent: CP14ClothingHeadBase + id: CP14ClothingHeadWizardHoodRed + name: red wizard hood + categories: [ HideSpawnMenu ] + description: a covering hood for those who like to look like a cool pyromancer. + components: + - type: Sprite + sprite: _CP14/Clothing/Head/Roles/General/wizard_hood_red.rsi + - type: Clothing + sprite: _CP14/Clothing/Head/Roles/General/wizard_hood_red.rsi + - type: HideLayerClothing + slots: + - Hair + +- type: entity + parent: CP14ClothingHeadBase + id: CP14ClothingHeadWizardHatBlue + name: blue wizard hat + description: a pointy hat for those who like to look like cool wizard. Decorated with a iron hoop. + components: + - type: Sprite + sprite: _CP14/Clothing/Head/Roles/General/wizard_hat_blue.rsi + - type: Clothing + sprite: _CP14/Clothing/Head/Roles/General/wizard_hat_blue.rsi + - type: PhysicalComposition + materialComposition: + CP14Cloth: 20 + +- type: entity + parent: CP14ClothingHeadBase + id: CP14ClothingHeadWizardHoodBlue + name: blue wizard hood + categories: [ HideSpawnMenu ] + description: i think we're on the path of a snowgrave now. + components: + - type: Sprite + sprite: _CP14/Clothing/Head/Roles/General/wizard_hood_blue.rsi + - type: Clothing + sprite: _CP14/Clothing/Head/Roles/General/wizard_hood_blue.rsi + - type: HideLayerClothing + slots: + - Hair \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml index 691105bcee..747424be02 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -22,6 +22,8 @@ - CP14ClothingCloakWhiteSyurko - CP14ClothingCloakYellowSyurko - CP14ClothingCloakHaori + - CP14ClothingCloakWizardCoatRed + - CP14ClothingCloakWizardCoatBlue - type: loadout id: CP14ClothingCloakFurcapeBlack @@ -108,6 +110,16 @@ equipment: cloak: CP14ClothingCloakHaori +- type: loadout + id: CP14ClothingCloakWizardCoatRed + equipment: + cloak: CP14ClothingCloakWizardCoatRed + +- type: loadout + id: CP14ClothingCloakWizardCoatBlue + equipment: + cloak: CP14ClothingCloakWizardCoatBlue + # OuterClothing - type: loadoutGroup @@ -259,6 +271,8 @@ - CP14ClothingHeadStrawHat - CP14ClothingHeadKasaHat - CP14ClothingHeadBeretMercenary + - CP14ClothingHeadWizardHatRed + - CP14ClothingHeadWizardHatBlue - type: loadout id: CP14ClothingHeadMetalHeadband @@ -315,6 +329,16 @@ equipment: head: CP14ClothingHeadBeretMercenary +- type: loadout + id: CP14ClothingHeadWizardHatRed + equipment: + head: CP14ClothingHeadWizardHatRed + +- type: loadout + id: CP14ClothingHeadWizardHatBlue + equipment: + head: CP14ClothingHeadWizardHatBlue + # Pants - type: loadoutGroup diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml index 32a02dde25..01d466eb49 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml @@ -299,6 +299,62 @@ count: 2 result: CP14ClothingHeadFishMask +- type: CP14Recipe + id: CP14ClothingCloakWizardCoatRed + tag: CP14RecipeSewing + craftTime: 2 + category: Clothing + requirements: + - !type:ProtoIdResource + protoId: CP14String + - !type:ProtoIdResource + protoId: CP14DyeRed + - !type:StackResource + stack: CP14Cloth + count: 3 + result: CP14ClothingCloakWizardCoatRed + +- type: CP14Recipe + id: CP14ClothingHeadWizardHatRed + tag: CP14RecipeSewing + craftTime: 1 + category: Clothing + requirements: + - !type:ProtoIdResource + protoId: CP14DyeRed + - !type:StackResource + stack: CP14Cloth + count: 2 + result: CP14ClothingHeadWizardHatRed + +- type: CP14Recipe + id: CP14ClothingCloakWizardCoatBlue + tag: CP14RecipeSewing + craftTime: 2 + category: Clothing + requirements: + - !type:ProtoIdResource + protoId: CP14String + - !type:ProtoIdResource + protoId: CP14DyeBlue + - !type:StackResource + stack: CP14Cloth + count: 3 + result: CP14ClothingCloakWizardCoatBlue + +- type: CP14Recipe + id: CP14ClothingHeadWizardHatBlue + tag: CP14RecipeSewing + craftTime: 1 + category: Clothing + requirements: + - !type:ProtoIdResource + protoId: CP14DyeBlue + - !type:StackResource + stack: CP14Cloth + count: 2 + result: CP14ClothingHeadWizardHatBlue + # Misc - type: CP14Recipe diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/wizard_blue_coat.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/wizard_blue_coat.rsi/equipped-CLOAK.png new file mode 100644 index 0000000000..0a5a54314d Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/wizard_blue_coat.rsi/equipped-CLOAK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/wizard_blue_coat.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/wizard_blue_coat.rsi/icon.png new file mode 100644 index 0000000000..6e5a9f9d8c Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/wizard_blue_coat.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/wizard_blue_coat.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/wizard_blue_coat.rsi/meta.json new file mode 100644 index 0000000000..40828f3dad --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/wizard_blue_coat.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by ripmax(MaxGab)", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-CLOAK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/wizard_red_coat.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/wizard_red_coat.rsi/equipped-CLOAK.png new file mode 100644 index 0000000000..a2d5d3e69d Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/wizard_red_coat.rsi/equipped-CLOAK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/wizard_red_coat.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/wizard_red_coat.rsi/icon.png new file mode 100644 index 0000000000..0e410764b4 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/wizard_red_coat.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/wizard_red_coat.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/wizard_red_coat.rsi/meta.json new file mode 100644 index 0000000000..40828f3dad --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/wizard_red_coat.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by ripmax(MaxGab)", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-CLOAK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hat_blue.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hat_blue.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..150353e79a Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hat_blue.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hat_blue.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hat_blue.rsi/icon.png new file mode 100644 index 0000000000..a7c3fe316a Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hat_blue.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hat_blue.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hat_blue.rsi/meta.json new file mode 100644 index 0000000000..e3f37a4868 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hat_blue.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Made by ripmax(MaxGab)", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hat_red.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hat_red.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..8c45133c03 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hat_red.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hat_red.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hat_red.rsi/icon.png new file mode 100644 index 0000000000..3754d2a7cd Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hat_red.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hat_red.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hat_red.rsi/meta.json new file mode 100644 index 0000000000..e3f37a4868 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hat_red.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Made by ripmax(MaxGab)", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hood_blue.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hood_blue.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..c270c269a5 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hood_blue.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hood_blue.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hood_blue.rsi/icon.png new file mode 100644 index 0000000000..197ac6684e Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hood_blue.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hood_blue.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hood_blue.rsi/meta.json new file mode 100644 index 0000000000..e3f37a4868 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hood_blue.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Made by ripmax(MaxGab)", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hood_red.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hood_red.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..5f483be25f Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hood_red.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hood_red.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hood_red.rsi/icon.png new file mode 100644 index 0000000000..93f8790b4e Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hood_red.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hood_red.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hood_red.rsi/meta.json new file mode 100644 index 0000000000..e3f37a4868 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hood_red.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Made by ripmax(MaxGab)", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +}