From c454503bfba5de288c9f104f4a86216f2cf4dd31 Mon Sep 17 00:00:00 2001 From: Averi Date: Tue, 16 Dec 2025 22:15:09 +0300 Subject: [PATCH] Festive lights now fit around your body (#4972) * add sprites and YML + JSON changes * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Update theater.yml * Update Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Averi * Update Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> * Update cargo_vending.yml --------- Signed-off-by: Averi Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> --- .../Prototypes/Catalog/Cargo/cargo_vending.yml | 2 +- .../VendingMachines/Inventories/theater.yml | 2 +- .../_DV/Entities/Clothing/Head/hats.yml | 4 ++++ .../Hats/festive_lights.rsi/equipped-NECK.png | Bin 0 -> 371 bytes .../festive_lights.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 371 bytes .../Head/Hats/festive_lights.rsi/meta.json | 8 ++++++++ 6 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/_DV/Clothing/Head/Hats/festive_lights.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_DV/Clothing/Head/Hats/festive_lights.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index ec393d24766..c6782bfb8ce 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -42,7 +42,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockAutoDrobeFilled - cost: 3100 # DeltaV + cost: 3200 # DeltaV category: cargoproduct-category-name-service group: market diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index 57e38a01f76..56b6243d8d8 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -130,7 +130,7 @@ ClothingHeadHatReindeer: 2 ClothingHeadHatCandyCane: 2 ClothingHeadHatStar: 2 - ClothingHeadHatFestiveLights: 2 + ClothingHeadHatFestiveLights: 4 ClothingHeadHatElf: 4 ClothingUniformElf: 2 ClothingUniformJumpskirtElf: 2 diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_DV/Entities/Clothing/Head/hats.yml index 2429eccf5a5..16dcb4f54fe 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Head/hats.yml @@ -339,6 +339,10 @@ sprite: _DV/Clothing/Head/Hats/festive_lights.rsi - type: Clothing sprite: _DV/Clothing/Head/Hats/festive_lights.rsi + slots: + - HEAD + - NECK + - OUTERCLOTHING - type: entity parent: ClothingHeadBase diff --git a/Resources/Textures/_DV/Clothing/Head/Hats/festive_lights.rsi/equipped-NECK.png b/Resources/Textures/_DV/Clothing/Head/Hats/festive_lights.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..48b41e2351c8849711e11b54bd663d48f47b1261 GIT binary patch literal 371 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4IG{>jv*CsZ*LvsZE_H3eP~>mI`88Yymfcc!Wahidv?a#1{Cv0iOzG6+cWR>aKMQNE zD&v3k%kcjX={;2!_Fhk1@%~(_c{R^+_y5=0<#a!s(98~q-CVkG+tEkj4nNnK+ZwK4 zv|`?zr&W8K7=hMj1>APO%bS9FLmRJD;cStx4UWtpQ!+JU8E0qr_8z%oR0}fJ)78&q Iol`;+0Q+;73;+NC literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Clothing/Head/Hats/festive_lights.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_DV/Clothing/Head/Hats/festive_lights.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..48b41e2351c8849711e11b54bd663d48f47b1261 GIT binary patch literal 371 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4IG{>jv*CsZ*LvsZE_H3eP~>mI`88Yymfcc!Wahidv?a#1{Cv0iOzG6+cWR>aKMQNE zD&v3k%kcjX={;2!_Fhk1@%~(_c{R^+_y5=0<#a!s(98~q-CVkG+tEkj4nNnK+ZwK4 zv|`?zr&W8K7=hMj1>APO%bS9FLmRJD;cStx4UWtpQ!+JU8E0qr_8z%oR0}fJ)78&q Iol`;+0Q+;73;+NC literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Clothing/Head/Hats/festive_lights.rsi/meta.json b/Resources/Textures/_DV/Clothing/Head/Hats/festive_lights.rsi/meta.json index 4232f50e788..32a78a7396f 100644 --- a/Resources/Textures/_DV/Clothing/Head/Hats/festive_lights.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/Head/Hats/festive_lights.rsi/meta.json @@ -14,6 +14,14 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, { "name": "inhand-left", "directions": 4