From: lzk <124214523+lzk228@users.noreply.github.com> Date: Sun, 7 Jan 2024 20:37:56 +0000 (+0100) Subject: Red racoon suit (#22862) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=ee21939066ef2b8d206480cb84e686c5bbccf36f;p=space-station-14.git Red racoon suit (#22862) * comit * :do_not_litter: :panda_face: * stupid * stupid x2 * fix tests * Update cargo_vending.yml --- 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 0000000000..69e81b97a7 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/icon.png new file mode 100644 index 0000000000..be8beea144 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/inhand-left.png new file mode 100644 index 0000000000..4ad9c515a9 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/inhand-right.png new file mode 100644 index 0000000000..4ad9c515a9 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/meta.json new file mode 100644 index 0000000000..c07c7a857a --- /dev/null +++ b/Resources/Textures/Clothing/Head/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-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..d4d1011105 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/equipped-OUTERCLOTHING.png differ 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 0000000000..25e2613b95 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/inhand-left.png new file mode 100644 index 0000000000..c160a2e526 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/inhand-right.png new file mode 100644 index 0000000000..28625bfe48 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/inhand-right.png differ 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 + } + ] +}