From ee21939066ef2b8d206480cb84e686c5bbccf36f Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Sun, 7 Jan 2024 21:37:56 +0100 Subject: [PATCH] Red racoon suit (#22862) * comit * :do_not_litter: :panda_face: * stupid * stupid x2 * fix tests * Update cargo_vending.yml --- .../Catalog/Cargo/cargo_vending.yml | 2 +- .../VendingMachines/Inventories/theater.yml | 2 ++ .../Entities/Clothing/Head/misc.yml | 11 ++++++++ .../OuterClothing/base_clothingouter.yml | 3 -- .../Entities/Clothing/OuterClothing/misc.yml | 13 ++++++++- .../Misc/red_racoon.rsi/equipped-HELMET.png | Bin 0 -> 1046 bytes .../Head/Misc/red_racoon.rsi/icon.png | Bin 0 -> 440 bytes .../Head/Misc/red_racoon.rsi/inhand-left.png | Bin 0 -> 847 bytes .../Head/Misc/red_racoon.rsi/inhand-right.png | Bin 0 -> 847 bytes .../Head/Misc/red_racoon.rsi/meta.json | 26 ++++++++++++++++++ .../red_racoon.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 2201 bytes .../Misc/red_racoon.rsi/icon.png | Bin 0 -> 899 bytes .../Misc/red_racoon.rsi/inhand-left.png | Bin 0 -> 820 bytes .../Misc/red_racoon.rsi/inhand-right.png | Bin 0 -> 838 bytes .../Misc/red_racoon.rsi/meta.json | 26 ++++++++++++++++++ 15 files changed, 78 insertions(+), 5 deletions(-) create mode 100644 Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/meta.json create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index 52676943d0..092f3be215 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -33,7 +33,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockClothesFilled - cost: 4650 + cost: 4670 category: Service group: market diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index d4dd657027..a2e835a28b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -27,6 +27,8 @@ ClothingHeadHatPumpkin: 2 ClothingHeadHatShrineMaidenWig: 2 ClothingOuterSuitShrineMaiden: 2 + ClothingHeadHatRedRacoon: 2 + ClothingOuterRedRacoon: 2 Gohei: 2 ClothingHeadPaperSack: 2 ClothingHeadPaperSackSmile: 2 diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index 645c47f9bf..7b93e83cd9 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -213,3 +213,14 @@ sprite: Clothing/Head/Misc/squiddy.rsi - type: IngestionBlocker - type: IdentityBlocker + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatRedRacoon + name: red racoon hat + description: Fluffy hat of red racoon! + components: + - type: Sprite + sprite: Clothing/Head/Misc/red_racoon.rsi + - type: Clothing + sprite: Clothing/Head/Misc/red_racoon.rsi diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml index 38c1fa1126..82df2c21e8 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml @@ -133,6 +133,3 @@ components: - type: Item size: Huge - - type: Clothing - slots: - - outerClothing diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml index 1a5688b6a7..2e54fcd247 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml @@ -362,4 +362,15 @@ - state: equipped-OUTERCLOTHING-lines color: "#000000" - type: TemperatureProtection - coefficient: 0.3 \ No newline at end of file + coefficient: 0.3 + +- type: entity + parent: ClothingOuterBase + id: ClothingOuterRedRacoon + name: red racoon suit + description: Fluffy suit of red racoon! + components: + - type: Sprite + sprite: Clothing/OuterClothing/Misc/red_racoon.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Misc/red_racoon.rsi diff --git a/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..69e81b97a70fb2098857160a35a9a4095354c2ae GIT binary patch literal 1046 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 b00;m8000000Mb*F00000NkvXXu0mjfR3ki= literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..25e2613b951f9ff898c6a40df27c054989fb7c74 GIT binary patch literal 899 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 QlK=n!07*qoM6N<$f={A?Z2$lO literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/meta.json new file mode 100644 index 0000000000..b20ea0277f --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by netwy(583844759429316618)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} -- 2.51.2