diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/wizard_coats.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/wizard_coats.yml deleted file mode 100644 index 4296000856..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/wizard_coats.yml +++ /dev/null @@ -1,43 +0,0 @@ -- 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 d4406fefb7..538bd4b6ab 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml @@ -25,6 +25,28 @@ - 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 deleted file mode 100644 index c3182a55e7..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/wizard.yml +++ /dev/null @@ -1,79 +0,0 @@ -- 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 747424be02..691105bcee 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -22,8 +22,6 @@ - CP14ClothingCloakWhiteSyurko - CP14ClothingCloakYellowSyurko - CP14ClothingCloakHaori - - CP14ClothingCloakWizardCoatRed - - CP14ClothingCloakWizardCoatBlue - type: loadout id: CP14ClothingCloakFurcapeBlack @@ -110,16 +108,6 @@ equipment: cloak: CP14ClothingCloakHaori -- type: loadout - id: CP14ClothingCloakWizardCoatRed - equipment: - cloak: CP14ClothingCloakWizardCoatRed - -- type: loadout - id: CP14ClothingCloakWizardCoatBlue - equipment: - cloak: CP14ClothingCloakWizardCoatBlue - # OuterClothing - type: loadoutGroup @@ -271,8 +259,6 @@ - CP14ClothingHeadStrawHat - CP14ClothingHeadKasaHat - CP14ClothingHeadBeretMercenary - - CP14ClothingHeadWizardHatRed - - CP14ClothingHeadWizardHatBlue - type: loadout id: CP14ClothingHeadMetalHeadband @@ -329,16 +315,6 @@ 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 01d466eb49..32a02dde25 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml @@ -299,62 +299,6 @@ 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 deleted file mode 100644 index 0a5a54314d..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/wizard_blue_coat.rsi/equipped-CLOAK.png and /dev/null 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 deleted file mode 100644 index 6e5a9f9d8c..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/wizard_blue_coat.rsi/icon.png and /dev/null 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 deleted file mode 100644 index 40828f3dad..0000000000 --- a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/wizard_blue_coat.rsi/meta.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "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 deleted file mode 100644 index a2d5d3e69d..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/wizard_red_coat.rsi/equipped-CLOAK.png and /dev/null 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 deleted file mode 100644 index 0e410764b4..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/wizard_red_coat.rsi/icon.png and /dev/null 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 deleted file mode 100644 index 40828f3dad..0000000000 --- a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/wizard_red_coat.rsi/meta.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "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 deleted file mode 100644 index 150353e79a..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hat_blue.rsi/equipped-HELMET.png and /dev/null 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 deleted file mode 100644 index a7c3fe316a..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hat_blue.rsi/icon.png and /dev/null 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 deleted file mode 100644 index e3f37a4868..0000000000 --- a/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hat_blue.rsi/meta.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "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 deleted file mode 100644 index 8c45133c03..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hat_red.rsi/equipped-HELMET.png and /dev/null 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 deleted file mode 100644 index 3754d2a7cd..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hat_red.rsi/icon.png and /dev/null 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 deleted file mode 100644 index e3f37a4868..0000000000 --- a/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hat_red.rsi/meta.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "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 deleted file mode 100644 index c270c269a5..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hood_blue.rsi/equipped-HELMET.png and /dev/null 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 deleted file mode 100644 index 197ac6684e..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hood_blue.rsi/icon.png and /dev/null 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 deleted file mode 100644 index e3f37a4868..0000000000 --- a/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hood_blue.rsi/meta.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "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 deleted file mode 100644 index 5f483be25f..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hood_red.rsi/equipped-HELMET.png and /dev/null 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 deleted file mode 100644 index 93f8790b4e..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hood_red.rsi/icon.png and /dev/null 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 deleted file mode 100644 index e3f37a4868..0000000000 --- a/Resources/Textures/_CP14/Clothing/Head/Roles/General/wizard_hood_red.rsi/meta.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "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 - } - ] -}