From 06ae99b50878a76ae7d657334f30bcf426feda0a Mon Sep 17 00:00:00 2001 From: MrFolium Date: Wed, 16 Sep 2026 20:54:05 +0500 Subject: [PATCH 1/2] Revert "Fix punk clothings (#73)" This reverts commit 75191aaf4da6c09d168fe42917720baf7a87f68d. --- Content.Server/Sprite/RandomSpriteSystem.cs | 21 +---- .../Sprite/RandomSpriteComponent.cs | 10 +-- .../_NF/Entities/Clothing/Belt/belts_punk.yml | 56 ++++-------- .../Entities/Clothing/Eyes/glasses_punks.yml | 84 +++++------------- .../_NF/Entities/Clothing/Masks/masks.yml | 37 +++----- .../Entities/Clothing/Shoes/boots_punk.yml | 69 ++++---------- .../Clothing/Belt/punk.rsi/icon_belt_01.png | Bin 226 -> 0 bytes .../Belt/punk.rsi/icon_decor_base_belt_01.png | Bin 190 -> 0 bytes .../_NF/Clothing/Belt/punk.rsi/meta.json | 8 +- .../icon_decor_base_glasses_01.png | Bin 528 -> 629 bytes .../icon_decor_base_glasses_02.png | Bin 853 -> 620 bytes .../Eyes/Glasses/punk_glasses.rsi/meta.json | 6 +- .../Mask/punkhalfmask.rsi/icon-base-mask.png | Bin 446 -> 0 bytes .../Mask/punkhalfmask.rsi/icon-decor-mask.png | Bin 148 -> 0 bytes .../Clothing/Mask/punkhalfmask.rsi/meta.json | 6 -- .../Boots/punk.rsi/icon_base_boots_01.png | Bin 359 -> 0 bytes .../punk.rsi/icon_decor_base_boots_01.png | Bin 295 -> 0 bytes .../punk.rsi/icon_decor_base_boots_02.png | Bin 207 -> 0 bytes .../Clothing/Shoes/Boots/punk.rsi/meta.json | 9 -- 19 files changed, 76 insertions(+), 230 deletions(-) delete mode 100644 Resources/Textures/_NF/Clothing/Belt/punk.rsi/icon_belt_01.png delete mode 100644 Resources/Textures/_NF/Clothing/Belt/punk.rsi/icon_decor_base_belt_01.png delete mode 100644 Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/icon-base-mask.png delete mode 100644 Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/icon-decor-mask.png delete mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/icon_base_boots_01.png delete mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/icon_decor_base_boots_01.png delete mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/icon_decor_base_boots_02.png diff --git a/Content.Server/Sprite/RandomSpriteSystem.cs b/Content.Server/Sprite/RandomSpriteSystem.cs index 8304ee72a1e..28f1e16c9a2 100644 --- a/Content.Server/Sprite/RandomSpriteSystem.cs +++ b/Content.Server/Sprite/RandomSpriteSystem.cs @@ -7,10 +7,10 @@ namespace Content.Server.Sprite; -public sealed class RandomSpriteSystem: SharedRandomSpriteSystem // LuaM del: partial +public sealed partial class RandomSpriteSystem: SharedRandomSpriteSystem { - [Dependency] private readonly IPrototypeManager _prototype = default!; // LuaM add: readonly - [Dependency] private readonly IRobustRandom _random = default!; // LuaM add: readonly + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IRobustRandom _random = default!; public override void Initialize() { @@ -27,15 +27,6 @@ private void OnMapInit(EntityUid uid, RandomSpriteComponent component, MapInitEv if (component.Available.Count == 0) return; - // LuaM start: select mapped colours - Dictionary mappedColors = new(); - foreach (var (key, value) in component.MappedColors) - { - if (_prototype.TryIndex(value, out var palette)) - mappedColors[key] = _random.Pick(palette.Colors.Values); - } - // LuaM end - var groups = new List>>(); if (component.GetAllGroups) { @@ -61,12 +52,6 @@ private void OnMapInit(EntityUid uid, RandomSpriteComponent component, MapInitEv { if (selectedState.Value == $"Inherit") color = previousColor; - // LuaM start: mapped colours - else if (mappedColors.TryGetValue(selectedState.Value, out var mappedColor)) - { - color = mappedColor; - } - // LuaM end Frontier else { color = _random.Pick(_prototype.Index(selectedState.Value).Colors.Values); diff --git a/Content.Shared/Sprite/RandomSpriteComponent.cs b/Content.Shared/Sprite/RandomSpriteComponent.cs index 7b053f5087c..0e9133d1c85 100644 --- a/Content.Shared/Sprite/RandomSpriteComponent.cs +++ b/Content.Shared/Sprite/RandomSpriteComponent.cs @@ -24,12 +24,4 @@ public sealed partial class RandomSpriteComponent : Component /// [ViewVariables(VVAccess.ReadWrite), DataField("selected")] public Dictionary Selected = new(); - // LuaM start: mapped random colours - /// - /// Maps arbitrary strings to palettes. - /// Keys can be used in Available to refer to a mapped colour in multiple layers. - /// - [DataField] - public Dictionary MappedColors = new(); - // LuaM end -} \ No newline at end of file +} diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_punk.yml b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_punk.yml index 11bf927bccb..e3fb2aa1989 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_punk.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_punk.yml @@ -9,57 +9,37 @@ - type: Sprite sprite: _NF/Clothing/Belt/punk.rsi layers: - - state: icon_belt_01 # LuaM base_belt_01 > icon_belt_01 - map: [ "belt_main" ] -# LuaM-comment-start: - # scale: 1.8, 1.8 - # offset: 0,0.1 -# LuaM-comment-end. - - state: icon_decor_base_belt_01 # LuaM decor_base_belt_01 > icon_decor_base_belt_01 - map: [ "belt_decor" ] -# LuaM-comment-start: - # scale: 1.8, 1.8 - # offset: 0,0.1 - # - state: mask_null - # map: [ "belt_overlay" ] - # scale: 1.8, 1.8 - # offset: 0,0.1 -# LuaM-comment-end. + - state: base_belt_01 + map: [ "belt_main" ] + scale: 1.8, 1.8 + offset: 0,0.1 + - state: decor_base_belt_01 + map: [ "belt_decor" ] + scale: 1.8, 1.8 + offset: 0,0.1 + - state: mask_null + map: [ "belt_overlay" ] + scale: 1.8, 1.8 + offset: 0,0.1 - type: Clothing sprite: _NF/Clothing/Belt/punk.rsi clothingVisuals: belt: - state: base_belt_01 - map: [ "clothing_belt_main" ] # LuaM: belt_main > clothing_belt_main + map: [ "belt_main" ] - state: decor_base_belt_01 - map: [ "clothing_belt_decor" ] # LuaM: belt_decor > clothing_belt_decor + map: [ "belt_decor" ] - state: mask_null - map: [ "clothing_belt_overlay" ] # LuaM: belt_overlay > clothing_belt_overlay + map: [ "belt_overlay" ] - type: RandomSprite available: - belt_main: -# base_belt_01: CyberpunkDark # Commented by LuaM -# LuaM-start: - icon_belt_01: Base - clothing_belt_main: - base_belt_01: Base -# LuaM-end. + base_belt_01: CyberpunkDark belt_decor: -# decor_base_belt_01: CyberpunkDark # Commented by LuaM -# belt_overlay: -# LuaM-start: - icon_decor_base_belt_01: Decor - clothing_belt_decor: - decor_base_belt_01: Decor - clothing_belt_overlay: -# LuaM-end. + decor_base_belt_01: CyberpunkDark + belt_overlay: decor_base_belt_02: CyberpunkDark decor_base_belt_03: CyberpunkDark decor_base_belt_04: CyberpunkDark decor_base_belt_05: CyberpunkDark mask_null: "" -# LuaM-start: - mappedColors: - Base: CyberpunkDark - Decor: CyberpunkDark -# LuaM-end. diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses_punks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses_punks.yml index 3564233bbac..d20251478a9 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses_punks.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses_punks.yml @@ -9,47 +9,30 @@ - type: Sprite sprite: _NF/Clothing/Eyes/Glasses/punk_glasses.rsi layers: - - state: icon_base_glasses_01 # LuaM base_glasses_01 > icon_base_glasses_01 + - state: base_glasses_01 map: [ "glasses_main" ] -# LuaM-comment-start: - # scale: 2.5, 2.5 - # offset: 0,-0.6 -# LuaM-comment-end. - - state: icon_decor_base_glasses_01 # LuaM decor_base_glasses_01 > icon_decor_base_glasses_01 + scale: 2.5, 2.5 + offset: 0,-0.6 + - state: decor_base_glasses_01 map: [ "glasses_decor" ] -# LuaM-comment-start: - # scale: 2.5, 2.5 - # offset: 0,-0.6 -# LuaM-comment-end. + scale: 2.5, 2.5 + offset: 0,-0.6 shader: unshaded - type: Clothing sprite: _NF/Clothing/Eyes/Glasses/punk_glasses.rsi clothingVisuals: eyes: - state: base_glasses_01 - map: [ "clothing_glasses_main" ] # LuaM glasses_main > clothing_glasses_main + map: [ "glasses_main" ] - state: decor_base_glasses_01 - map: [ "clothing_glasses_decor" ] # LuaM glasses_decor > clothing_glasses_decor + map: [ "glasses_decor" ] shader: unshaded - type: RandomSprite available: - glasses_main: -# base_glasses_01: CyberpunkDark # Commented by LuaM -# LuaM-start: - icon_base_glasses_01: Base - clothing_glasses_main: - base_glasses_01: Base -# LuaM-end. + base_glasses_01: CyberpunkDark glasses_decor: -# decor_base_glasses_01: CyberpunkDark # Commented by LuaM -# LuaM-start: - icon_decor_base_glasses_01: Decor - clothing_glasses_decor: - decor_base_glasses_01: Decor - mappedColors: - Base: CyberpunkDark - Decor: CyberpunkDark - # LuaM-end + decor_base_glasses_01: CyberpunkDark # HUDs - type: entity @@ -59,56 +42,37 @@ description: How can you see anything in this with all the lights? components: - type: VisionCorrection -# LuaM-comment-start: - # - type: Item - # shape: - # - 0,0,1,0 - # storedOffset: -20,-20 -# LuaM-comment-end. + - type: Item + shape: + - 0,0,1,0 + storedOffset: -20,-20 - type: Sprite sprite: _NF/Clothing/Eyes/Glasses/punk_glasses.rsi layers: - - state: icon_base_glasses_02 # LuaM base_glasses_02 > icon_base_glasses_02 + - state: base_glasses_02 map: [ "infoshades_main" ] -# LuaM-comment-start: - # scale: 2.5, 2.5 - # offset: 0,-0.6 -# LuaM-comment-end. - - state: icon_decor_base_glasses_02 # LuaM decor_base_glasses_02 > icon_decor_base_glasses_02 + scale: 2.5, 2.5 + offset: 0,-0.6 + - state: decor_base_glasses_02 map: [ "infoshades_decor" ] -# LuaM-comment-start: - # scale: 2.5, 2.5 - # offset: 0,-0.6 -# LuaM-comment-end. + scale: 2.5, 2.5 + offset: 0,-0.6 shader: unshaded - type: Clothing sprite: _NF/Clothing/Eyes/Glasses/punk_glasses.rsi clothingVisuals: eyes: - state: base_glasses_02 - map: [ "clothing_infoshades_main" ] # LuaM infoshades_main > clothing_infoshades_main + map: [ "infoshades_main" ] - state: decor_base_glasses_02 - map: [ "clothing_infoshades_decor" ] # LuaM infoshades_decor > clothing_infoshades_decor + map: [ "infoshades_decor" ] shader: unshaded - type: RandomSprite available: - infoshades_main: -# base_glasses_02: CyberpunkNeon # Commented by LuaM -# LuaM-start: - icon_base_glasses_02: Base - clothing_infoshades_main: - base_glasses_02: Base -# LuaM-end. + base_glasses_02: CyberpunkNeon infoshades_decor: -# decor_base_glasses_02: CyberpunkNeon # Commented by LuaM -# LuaM-start: - icon_decor_base_glasses_02: Decor - clothing_infoshades_decor: - decor_base_glasses_02: Decor - mappedColors: - Base: CyberpunkNeon - Decor: CyberpunkNeon - # LuaM-end + decor_base_glasses_02: CyberpunkNeon - type: ShowHealthBars damageContainers: - Inorganic diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml index 58168700935..b8b220cf85a 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml @@ -90,47 +90,30 @@ - type: Sprite sprite: _NF/Clothing/Mask/punkhalfmask.rsi layers: - - state: icon-base-mask # LuaM equipped-MASK > icon-base-mask + - state: equipped-MASK map: [ "mask_main" ] -# LuaM-comment-start: - # scale: 2, 2 - # offset: 0,-0.6 -# LuaM-comment-end. - - state: icon-decor-mask # LuaM decor-equipped-MASK > icon-decor-mask + scale: 2, 2 + offset: 0,-0.6 + - state: decor-equipped-MASK map: [ "mask_decor" ] shader: unshaded -# LuaM-comment-start: - # scale: 2, 2 - # offset: 0,-0.6 -# LuaM-comment-end. + scale: 2, 2 + offset: 0,-0.6 - type: Clothing sprite: _NF/Clothing/Mask/punkhalfmask.rsi clothingVisuals: mask: - state: equipped-MASK - map: [ "clothing_mask_main" ] # LuaM mask_main > clothing_mask_main + map: [ "mask_main" ] - state: decor-equipped-MASK - map: [ "clothing_mask_decor" ] # LuaM mask_decor > clothing_mask_decor + map: [ "mask_decor" ] shader: unshaded - type: RandomSprite available: - mask_main: -# equipped-MASK: CyberpunkDark # Commented by LuaM -# LuaM-start: - icon-base-mask: Base - clothing_mask_main: - equipped-MASK: Base -# LuaM-end + equipped-MASK: CyberpunkDark mask_decor: -# decor-equipped-MASK: CyberpunkNeon # Commented by LuaM -# LuaM-start: - icon-decor-mask: Decor - clothing_mask_decor: - decor-equipped-MASK: Decor - mappedColors: - Base: CyberpunkDark - Decor: CyberpunkNeon -# LuaM-end + decor-equipped-MASK: CyberpunkNeon - type: IdentityBlocker coverage: MOUTH diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots_punk.yml b/Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots_punk.yml index 546b84d7e93..63d90d8c2d5 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots_punk.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots_punk.yml @@ -9,68 +9,35 @@ - type: Sprite sprite: _NF/Clothing/Shoes/Boots/punk.rsi layers: - - state: icon_base_boots_01 # LuaM base_boots_01 > icon_base_boots_01 + - state: base_boots_01 map: [ "boots_main" ] - # LuaM-comment-start: - # scale: 2, 2 - # offset: 0,0.6 - # LuaM-comment-end. - - state: icon_decor_base_boots_01 # LuaM decor_base_boots_01 > icon_decor_base_boots_01 + scale: 2, 2 + offset: 0,0.6 + - state: decor_base_boots_01 map: [ "boots_decor" ] - # LuaM-comment-start: - # scale: 2, 2 - # offset: 0,0.6 - # - state: mask_null - # map: [ "boots_overlay" ] - # scale: 2, 2 - # offset: 0,0.6 - # LuaM-comment-end. + scale: 2, 2 + offset: 0,0.6 + - state: mask_null + map: [ "boots_overlay" ] + scale: 2, 2 + offset: 0,0.6 - type: Clothing sprite: _NF/Clothing/Shoes/Boots/punk.rsi clothingVisuals: shoes: - state: base_boots_01 - map: [ "clothing_boots_main" ] # LuaM: boots_main > clothing_boots_main + map: [ "boots_main" ] - state: mask_null - map: [ "clothing_boots_decor" ] # LuaM: boots_decor > clothing_boots_decor + map: [ "boots_decor" ] - state: mask_null - map: [ "clothing_boots_overlay" ] # LuaM: boots_overlay > clothing_boots_overlay + map: [ "boots_overlay" ] - type: RandomSprite available: -# LuaM-comment-start: -# - boots_main: -# base_boots_01: Cyberpunk -# LuaM-comment-end. - # LuaM-start: - - boots_main: &bootsMain - icon_base_boots_01: Base - clothing_boots_main: &clothingBootsMain - base_boots_01: Base - # LuaM-end. - boots_decor: -# LuaM-comment-start: -# -# decor_base_boots_01: Cyberpunk -# mask_null: "" -# boots_overlay: -# LuaM-comment-end. -# LuaM-start: - icon_decor_base_boots_01: Decor - clothing_boots_decor: - decor_base_boots_01: Decor - clothing_boots_overlay: &bootsOverlay -# LuaM-end. - decor_base_boots_02: Cyberpunk - mask_null: "" -# LuaM-comment-start: - - boots_main: *bootsMain - clothing_boots_main: *clothingBootsMain + - boots_main: + base_boots_01: Cyberpunk boots_decor: + decor_base_boots_01: Cyberpunk mask_null: "" - clothing_boots_decor: + boots_overlay: + decor_base_boots_02: Cyberpunk mask_null: "" - clothing_boots_overlay: *bootsOverlay - mappedColors: - Base: Cyberpunk - Decor: Cyberpunk - # LuaM end diff --git a/Resources/Textures/_NF/Clothing/Belt/punk.rsi/icon_belt_01.png b/Resources/Textures/_NF/Clothing/Belt/punk.rsi/icon_belt_01.png deleted file mode 100644 index 3ea8746735612c8f17d07fa909722e78d2efbbef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|gaUj*T!FN& zuWw~#Wp{V?v17;n|Nmci;o?J}C|gO8UoZoZ|Nnng<%54fksMDK#}JF&w|$O$42m4g zYp?vTuXOB{GMHui{@V$ksGwh;&7RD3PBC4?>y*aHZF7F+=9X3to69^Kia43XU3ZE* z+?DSt2u?^3zA@#)qHnW;ycIswXw;@3o_(qO+n%~4uZj!rWh#RE?o8qSpCLD?k8!*A Tg}d57dl@`k{an^LB{Ts5)#zA_ diff --git a/Resources/Textures/_NF/Clothing/Belt/punk.rsi/icon_decor_base_belt_01.png b/Resources/Textures/_NF/Clothing/Belt/punk.rsi/icon_decor_base_belt_01.png deleted file mode 100644 index f8c52b36b93e798c5c4d42108dd4626d4abef4f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|_yc@GT!C~= zP0iV}XMg?r_5c5W9j+8Bpb%?GkY6wZkpExif*QyqA5Ry@5R2Zo6E+Gl2=F+2{`qfi zed<7_M9JX$+(T7#nh?Z7HBSmr>mdKI;Vst0G5bEe*gdg diff --git a/Resources/Textures/_NF/Clothing/Belt/punk.rsi/meta.json b/Resources/Textures/_NF/Clothing/Belt/punk.rsi/meta.json index f141ed844fc..0e058c9dfe4 100644 --- a/Resources/Textures/_NF/Clothing/Belt/punk.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Belt/punk.rsi/meta.json @@ -1,4 +1,4 @@ -{ +{ "version": 1, "license": "CC-BY-SA-3.0", "copyright": "Sprited by erhardsteinhauer (discord/github)", @@ -42,12 +42,6 @@ { "name": "mask_null", "directions": 4 - }, - { - "name": "icon_belt_01" - }, - { - "name": "icon_decor_base_belt_01" } ] } diff --git a/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/icon_decor_base_glasses_01.png b/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/icon_decor_base_glasses_01.png index 66e95f7fc14e156e31d8f5a4af721fe99a3cb8b0..4da917e00b599160778a2e17914c7073bd9cfd84 100644 GIT binary patch delta 202 zcmbQh@|9)77RGwEByV>Yh5`^|Np-rzz`(#+;1OBOz@VoL!i*J5?aP3I>?NMQuIw+^ z1em1^YBiq50fi(>Tq8=H^K)}k^GX<;i&7IyQd1PlGfOfQ+&z5*!W;R-fr@-RT^vIq z4!^x{kn?~6kMqRfgrYzz!#3D&vGm;9M@-*UcA x=+zmjsV*_aKj-W(T~n97^v`r=28J7P>~AyGp6;5l#{y_FgQu&X%Q~loCIHj?MuY$W delta 100 zcmey$GJ$2o7RDHNPZ!6Kh}O5~Hu5qkaJU2-u6w?v=b=(wV=wE}z$E8S@lK@^7K<=2 zOlX{W)>i7I|E;I@3R1O{?oR*xC$v}2>fxt&exT%Srpr!>&Y^*uwle^Mr>mdKI;Vst E0A-IUpa1{> diff --git a/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/icon_decor_base_glasses_02.png b/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/icon_decor_base_glasses_02.png index 41628fa58d03cc62f6302eb8649f1ccd7bd7efdd..f51d04c7fda033ae2f00c70e219f4cfdd8845239 100644 GIT binary patch delta 229 zcmcc0_J&2VGr-TCmrII^fq{Y7)59eQNGpIa2OE$quB!U7QE?JuJp)^kx4R2N0SL0B zI^6-vaTa()7BevDDT6R$#Zvn+pdfpRr>`sf3pN2}MTHn$DJGzhWQl7;iF1B#Zfaf$ zgL6@8Vo7R>LV0FMhJw4NZ$Nk>pEyvFi>HfYNW|f{mp5`UDDb#ke86tNzs9I#+5Q+T4Gw z^zYe9#t?l6phA21Bk8~H)YZ@1w|(=r2)UKJ7*DJ}D}OCkdV8|(?dyyG?OMCvQoo_t zrN-s1{((g173a?LuCTHfQ8n@@7D}vNbQS zHk22}W+!hge>Gw5`si=`3F42rcZVOAJe~h(dd$T6>ie#@+@CzZ|7*s+?Vqk+YRJF( zH|Vo{=y&g@{Lgot^$h)Y+2n!bvR`+dKRw&SFfFTO`={Amzjs`1_!m^S{&!?G^SW>1 q*X~C!uQ^xW#l`~+K~>aHTytC8F7?@y@M(r`KoXv=elF{r5}E+PjM-5D diff --git a/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/meta.json b/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/meta.json index bb2d2de03a0..8cbba68378a 100644 --- a/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/meta.json @@ -17,11 +17,7 @@ "name": "icon_base_glasses_02" }, { - "name": "icon_decor_base_glasses_02", - "delays": - [ - [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] - ] + "name": "icon_decor_base_glasses_02" }, { "name": "base_glasses_01", diff --git a/Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/icon-base-mask.png b/Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/icon-base-mask.png deleted file mode 100644 index 1cdd889a2c68fd72b5124257741cc7a7bde881a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 446 zcmV;v0YUzWP)Px$cu7P-R9J=WlQE9sFcgMAuU0gveSuWS5){Z62u+j|(D)J*a0t$kiVIk&xPX-s zrHVxTT4-pz#S9V5Kr%a1Y_a*8NbmXm`ECD(k&%)A9rdaaV+0^g(+JSEtx`%o^g0ox zKGmMhJ>yrOyPL>Q7}9uY;C`@e+fQ3iO0irn*DHCRN9P<((-1;HYmJEDoTI8L@;s+3 z%dT#%WjdWwmL*kHsmWyWy%T`9dlnJ2*4<9M_Y_6(VCG{T;5K(S9D4uJ8$uDGC<;Ub zfYa&p(7XTM_dm{k+dy5{%6pG7=0PlkfH8*S@rW^o`#gvU#u&W!)O9`h6bCZ^uvjd* or*;$lYHcV3BO@atBP0KuKb2m{V)r0YO#lD@07*qoM6N<$g1tz|p#T5? diff --git a/Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/icon-decor-mask.png b/Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/icon-decor-mask.png deleted file mode 100644 index 069c8c2c6f9d23a55b05bd00ffc0714fc5ab4975..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}ex5FlArY-_ zFKpy(aNu#i*gV(PHSI*)&1WmtS#A(fdGSwMSG&^)s5@hViRxL~^Jk);?K*c;)Ah(h tF+15Uzvjz6XbTHn{e8CidZ3zftaqJdbG0vD4h5Rb;OXk;vd$@?2>=PEGvWXM diff --git a/Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/meta.json b/Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/meta.json index 4b2c1db9d0e..f2b65a4a1e3 100644 --- a/Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/meta.json @@ -15,12 +15,6 @@ "name": "decor-equipped-MASK", "directions": 4 }, - { - "name": "icon-base-mask" - }, - { - "name": "icon-decor-mask" - }, { "name": "inhand-right", "directions": 4 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/icon_base_boots_01.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/icon_base_boots_01.png deleted file mode 100644 index 614a60c1f931b1a625c1e113294d8403fe9c4a1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 359 zcmV-t0hs=YP)Px$AxT6*R9J=WlrfHmAP|M$zia6k?6?Ib7a?9`_8^4H3s6(eEl5n@B5Wn`S9BMP zZI&-F2v2>(a}?-wI-Smc=hb?HQYr(0lo9~I%%^K=n)kly_0eKZMA;Zq=FALZOfjr! zT5CutOW{X`mI9a=LWt8^?YuUx(UgGq{uM%iF{bP=gaBrSloCe`0IapQ&umHncu#?u zi}|+Oy=JW~+Eowyx(SJ>yu-ce-h88`JuZNV^4?${?a_GC=6OC9aaF*N<}t={EX$IW zQf0i-VvJcSm5C@TrSjDmaGL-TPx#;Ymb6R9J=Wl);SyAq++TthSZuf}=Z`M%;+S$zAwJ7o4UN=dc=fR)J(EnIsoK z2_X!aZ_5S zPIJ!9IT5*tU|E)SPDD^jL9G=4yeHzY05hA+?5?=py2sa10VB+8s002ovPDHLkV1f_SgBJh* diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/icon_decor_base_boots_02.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/icon_decor_base_boots_02.png deleted file mode 100644 index 70c1e326e431452a2df40d10fca0ec4eb26cdf0a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}ot`d^ArY-_ zuN>rTR^(xQ5dK0d@1bGyUSFG3?*7Olo|h&cb*|?M`xkeQeUXOHR0#(c7qc0Wvm*bg zTAY+gUb0*L}Rk2;|&Y#bl zcmDp!R8lEDDbnlbj%!iY--M=@CfNPfvC7t0Qc~Z`Fum2o?Muz>bfBXcJYD@<);T3K F0RTF0QE31G diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/meta.json b/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/meta.json index 2b295d59c5b..63a5c0b80af 100644 --- a/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/meta.json @@ -30,15 +30,6 @@ { "name": "inhand-left", "directions": 4 - }, - { - "name": "icon_base_boots_01" - }, - { - "name": "icon_decor_base_boots_01" - }, - { - "name": "icon_decor_base_boots_02" } ] } From 948d942c4a33bc2304c5a1dd3900b83c3ec579f3 Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Fri, 14 Mar 2025 10:58:04 -0400 Subject: [PATCH 2/2] Mapped colours in RandomSprite, fix ThreadsChoom inventory sizing. (#3052) * Mapped colours in RandomSprite * sprites for boots, glasses, mask * belt --------- Co-authored-by: steinhauer.erhard --- Content.Client/Sprite/RandomSpriteSystem.cs | 2 +- Content.Server/Sprite/RandomSpriteSystem.cs | 15 ++++++ .../Sprite/RandomSpriteComponent.cs | 9 ++++ .../_NF/Entities/Clothing/Belt/belts_punk.yml | 31 ++++++------ .../Entities/Clothing/Eyes/glasses_punks.yml | 46 ++++++++++-------- .../_NF/Entities/Clothing/Masks/masks.yml | 23 +++++---- .../Entities/Clothing/Shoes/boots_punk.yml | 43 +++++++++------- .../Clothing/Belt/punk.rsi/icon_belt_01.png | Bin 0 -> 375 bytes .../Belt/punk.rsi/icon_decor_base_belt_01.png | Bin 0 -> 211 bytes .../_NF/Clothing/Belt/punk.rsi/meta.json | 6 +++ .../icon_decor_base_glasses_01.png | Bin 629 -> 528 bytes .../icon_decor_base_glasses_02.png | Bin 620 -> 853 bytes .../Eyes/Glasses/punk_glasses.rsi/meta.json | 6 ++- .../Mask/punkhalfmask.rsi/icon-base-mask.png | Bin 0 -> 446 bytes .../Mask/punkhalfmask.rsi/icon-decor-mask.png | Bin 0 -> 148 bytes .../Clothing/Mask/punkhalfmask.rsi/meta.json | 6 +++ .../Boots/punk.rsi/icon_base_boots_01.png | Bin 0 -> 359 bytes .../punk.rsi/icon_decor_base_boots_01.png | Bin 0 -> 295 bytes .../punk.rsi/icon_decor_base_boots_02.png | Bin 0 -> 207 bytes .../Clothing/Shoes/Boots/punk.rsi/meta.json | 9 ++++ 20 files changed, 130 insertions(+), 66 deletions(-) create mode 100644 Resources/Textures/_NF/Clothing/Belt/punk.rsi/icon_belt_01.png create mode 100644 Resources/Textures/_NF/Clothing/Belt/punk.rsi/icon_decor_base_belt_01.png create mode 100644 Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/icon-base-mask.png create mode 100644 Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/icon-decor-mask.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/icon_base_boots_01.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/icon_decor_base_boots_01.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/icon_decor_base_boots_02.png diff --git a/Content.Client/Sprite/RandomSpriteSystem.cs b/Content.Client/Sprite/RandomSpriteSystem.cs index dca1ef8be69..107b31fd994 100644 --- a/Content.Client/Sprite/RandomSpriteSystem.cs +++ b/Content.Client/Sprite/RandomSpriteSystem.cs @@ -71,7 +71,7 @@ private void UpdateSpriteComponentAppearance(EntityUid uid, RandomSpriteComponen { if (layer.Key is not { } strKey || !int.TryParse(strKey, out index)) { - Log.Error($"Invalid key `{layer.Key}` for entity with random sprite {ToPrettyString(uid)}"); + // Log.Error($"Invalid key `{layer.Key}` for entity with random sprite {ToPrettyString(uid)}"); // Frontier: spammy continue; } } diff --git a/Content.Server/Sprite/RandomSpriteSystem.cs b/Content.Server/Sprite/RandomSpriteSystem.cs index 28f1e16c9a2..4d91cf163b4 100644 --- a/Content.Server/Sprite/RandomSpriteSystem.cs +++ b/Content.Server/Sprite/RandomSpriteSystem.cs @@ -27,6 +27,15 @@ private void OnMapInit(EntityUid uid, RandomSpriteComponent component, MapInitEv if (component.Available.Count == 0) return; + // Frontier: select mapped colours + Dictionary mappedColors = new(); + foreach (var (key, value) in component.MappedColors) + { + if (_prototype.TryIndex(value, out var palette)) + mappedColors[key] = _random.Pick(palette.Colors.Values); + } + // End Frontier: select mapped colours + var groups = new List>>(); if (component.GetAllGroups) { @@ -52,6 +61,12 @@ private void OnMapInit(EntityUid uid, RandomSpriteComponent component, MapInitEv { if (selectedState.Value == $"Inherit") color = previousColor; + // Frontier: mapped colours + else if (mappedColors.TryGetValue(selectedState.Value, out var mappedColor)) + { + color = mappedColor; + } + // End Frontier else { color = _random.Pick(_prototype.Index(selectedState.Value).Colors.Values); diff --git a/Content.Shared/Sprite/RandomSpriteComponent.cs b/Content.Shared/Sprite/RandomSpriteComponent.cs index 0e9133d1c85..49d47d9d279 100644 --- a/Content.Shared/Sprite/RandomSpriteComponent.cs +++ b/Content.Shared/Sprite/RandomSpriteComponent.cs @@ -24,4 +24,13 @@ public sealed partial class RandomSpriteComponent : Component /// [ViewVariables(VVAccess.ReadWrite), DataField("selected")] public Dictionary Selected = new(); + + // Frontier: mapped random colours + /// + /// Maps arbitrary strings to palettes. + /// Keys can be used in Available to refer to a mapped colour in multiple layers. + /// + [DataField] + public Dictionary MappedColors = new(); + // End Frontier } diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_punk.yml b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_punk.yml index e3fb2aa1989..5a9943e24cf 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_punk.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_punk.yml @@ -9,37 +9,36 @@ - type: Sprite sprite: _NF/Clothing/Belt/punk.rsi layers: - - state: base_belt_01 + - state: icon_belt_01 map: [ "belt_main" ] - scale: 1.8, 1.8 - offset: 0,0.1 - - state: decor_base_belt_01 + - state: icon_decor_base_belt_01 map: [ "belt_decor" ] - scale: 1.8, 1.8 - offset: 0,0.1 - - state: mask_null - map: [ "belt_overlay" ] - scale: 1.8, 1.8 - offset: 0,0.1 - type: Clothing sprite: _NF/Clothing/Belt/punk.rsi clothingVisuals: belt: - state: base_belt_01 - map: [ "belt_main" ] + map: [ "clothing_belt_main" ] - state: decor_base_belt_01 - map: [ "belt_decor" ] + map: [ "clothing_belt_decor" ] - state: mask_null - map: [ "belt_overlay" ] + map: [ "clothing_belt_overlay" ] - type: RandomSprite available: - belt_main: - base_belt_01: CyberpunkDark + icon_belt_01: Base + clothing_belt_main: + base_belt_01: Base belt_decor: - decor_base_belt_01: CyberpunkDark - belt_overlay: + icon_decor_base_belt_01: Decor + clothing_belt_decor: + decor_base_belt_01: Decor + clothing_belt_overlay: decor_base_belt_02: CyberpunkDark decor_base_belt_03: CyberpunkDark decor_base_belt_04: CyberpunkDark decor_base_belt_05: CyberpunkDark mask_null: "" + mappedColors: + Base: CyberpunkDark + Decor: CyberpunkDark diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses_punks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses_punks.yml index d20251478a9..3db05b6e2d4 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses_punks.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses_punks.yml @@ -9,30 +9,33 @@ - type: Sprite sprite: _NF/Clothing/Eyes/Glasses/punk_glasses.rsi layers: - - state: base_glasses_01 + - state: icon_base_glasses_01 map: [ "glasses_main" ] - scale: 2.5, 2.5 - offset: 0,-0.6 - - state: decor_base_glasses_01 + - state: icon_decor_base_glasses_01 map: [ "glasses_decor" ] - scale: 2.5, 2.5 - offset: 0,-0.6 shader: unshaded - type: Clothing sprite: _NF/Clothing/Eyes/Glasses/punk_glasses.rsi clothingVisuals: eyes: - state: base_glasses_01 - map: [ "glasses_main" ] + map: [ "clothing_glasses_main" ] - state: decor_base_glasses_01 - map: [ "glasses_decor" ] + map: [ "clothing_glasses_decor" ] shader: unshaded - type: RandomSprite available: - glasses_main: - base_glasses_01: CyberpunkDark + icon_base_glasses_01: Base + clothing_glasses_main: + base_glasses_01: Base glasses_decor: - decor_base_glasses_01: CyberpunkDark + icon_decor_base_glasses_01: Decor + clothing_glasses_decor: + decor_base_glasses_01: Decor + mappedColors: + Base: CyberpunkDark + Decor: CyberpunkDark # HUDs - type: entity @@ -49,30 +52,33 @@ - type: Sprite sprite: _NF/Clothing/Eyes/Glasses/punk_glasses.rsi layers: - - state: base_glasses_02 + - state: icon_base_glasses_02 map: [ "infoshades_main" ] - scale: 2.5, 2.5 - offset: 0,-0.6 - - state: decor_base_glasses_02 + - state: icon_decor_base_glasses_02 map: [ "infoshades_decor" ] - scale: 2.5, 2.5 - offset: 0,-0.6 shader: unshaded - type: Clothing sprite: _NF/Clothing/Eyes/Glasses/punk_glasses.rsi clothingVisuals: eyes: - state: base_glasses_02 - map: [ "infoshades_main" ] + map: [ "clothing_infoshades_main" ] - state: decor_base_glasses_02 - map: [ "infoshades_decor" ] + map: [ "clothing_infoshades_decor" ] shader: unshaded - type: RandomSprite available: - infoshades_main: - base_glasses_02: CyberpunkNeon + icon_base_glasses_02: Base + clothing_infoshades_main: + base_glasses_02: Base infoshades_decor: - decor_base_glasses_02: CyberpunkNeon + icon_decor_base_glasses_02: Decor + clothing_infoshades_decor: + decor_base_glasses_02: Decor + mappedColors: + Base: CyberpunkNeon + Decor: CyberpunkNeon - type: ShowHealthBars damageContainers: - Inorganic diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml index b8b220cf85a..099492296d3 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml @@ -90,30 +90,33 @@ - type: Sprite sprite: _NF/Clothing/Mask/punkhalfmask.rsi layers: - - state: equipped-MASK + - state: icon-base-mask map: [ "mask_main" ] - scale: 2, 2 - offset: 0,-0.6 - - state: decor-equipped-MASK + - state: icon-decor-mask map: [ "mask_decor" ] shader: unshaded - scale: 2, 2 - offset: 0,-0.6 - type: Clothing sprite: _NF/Clothing/Mask/punkhalfmask.rsi clothingVisuals: mask: - state: equipped-MASK - map: [ "mask_main" ] + map: [ "clothing_mask_main" ] - state: decor-equipped-MASK - map: [ "mask_decor" ] + map: [ "clothing_mask_decor" ] shader: unshaded - type: RandomSprite available: - mask_main: - equipped-MASK: CyberpunkDark + icon-base-mask: Base + clothing_mask_main: + equipped-MASK: Base mask_decor: - decor-equipped-MASK: CyberpunkNeon + icon-decor-mask: Decor + clothing_mask_decor: + decor-equipped-MASK: Decor + mappedColors: + Base: CyberpunkDark + Decor: CyberpunkNeon - type: IdentityBlocker coverage: MOUTH diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots_punk.yml b/Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots_punk.yml index 63d90d8c2d5..467fc1c2ecc 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots_punk.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots_punk.yml @@ -9,35 +9,42 @@ - type: Sprite sprite: _NF/Clothing/Shoes/Boots/punk.rsi layers: - - state: base_boots_01 + - state: icon_base_boots_01 map: [ "boots_main" ] - scale: 2, 2 - offset: 0,0.6 - - state: decor_base_boots_01 + - state: icon_decor_base_boots_01 map: [ "boots_decor" ] - scale: 2, 2 - offset: 0,0.6 - - state: mask_null - map: [ "boots_overlay" ] - scale: 2, 2 - offset: 0,0.6 - type: Clothing sprite: _NF/Clothing/Shoes/Boots/punk.rsi clothingVisuals: shoes: - state: base_boots_01 - map: [ "boots_main" ] + map: [ "clothing_boots_main" ] - state: mask_null - map: [ "boots_decor" ] + map: [ "clothing_boots_decor" ] - state: mask_null - map: [ "boots_overlay" ] + map: [ "clothing_boots_overlay" ] - type: RandomSprite available: - - boots_main: - base_boots_01: Cyberpunk + # decor present + - boots_main: &bootsMain + icon_base_boots_01: Base + clothing_boots_main: &clothingBootsMain + base_boots_01: Base boots_decor: - decor_base_boots_01: Cyberpunk - mask_null: "" - boots_overlay: + icon_decor_base_boots_01: Decor + clothing_boots_decor: + decor_base_boots_01: Decor + clothing_boots_overlay: &bootsOverlay decor_base_boots_02: Cyberpunk mask_null: "" + # decor absent + - boots_main: *bootsMain + clothing_boots_main: *clothingBootsMain + boots_decor: + mask_null: "" + clothing_boots_decor: + mask_null: "" + clothing_boots_overlay: *bootsOverlay + mappedColors: + Base: Cyberpunk + Decor: Cyberpunk diff --git a/Resources/Textures/_NF/Clothing/Belt/punk.rsi/icon_belt_01.png b/Resources/Textures/_NF/Clothing/Belt/punk.rsi/icon_belt_01.png new file mode 100644 index 0000000000000000000000000000000000000000..ca7739de7769b3f4a997a9743181fb871124a5cf GIT binary patch literal 375 zcmV--0f_#IP)Px$F-b&0R9J=Wl);I_FbqZiE?Z6-$Oznl3Q`5Wq#Ji2kkdf=@m^x%*~vH#46_XQ z9fPC)_=*Dz27|$;5MxX+#`NmB-#v$zIhh&E3|A%2&UXm_01-h|i$sq|j4{pg3}$|M z_UCK}GpA{q5JG^6zHP)p^Y5AEK4)|RA86D zwrv1_5JG7puf#cbCvqhm01oThgOiBB%s@l{0Pj8OMwq!gcg~gPL{#4M-XnzYG^b0T z9{g7%OB{))YBL--S%LQ+L{x(FRTPnjwbZC;S2)mUAd|0-Uz42*k@8qWD<`}Xwbu3o;&vg8kV5i`WyT3e?BmXA9Kk=Et zgPGyTs*OgQEF(IneTe;gE+DS_)ETC=TcbY*$^G2Ip_tNcKJDJDrn5p5HGvLe@O1Ta JS?83{1OVLlP&WVo literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Belt/punk.rsi/meta.json b/Resources/Textures/_NF/Clothing/Belt/punk.rsi/meta.json index 0e058c9dfe4..02d2d5a0ef9 100644 --- a/Resources/Textures/_NF/Clothing/Belt/punk.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Belt/punk.rsi/meta.json @@ -42,6 +42,12 @@ { "name": "mask_null", "directions": 4 + }, + { + "name": "icon_belt_01" + }, + { + "name": "icon_decor_base_belt_01" } ] } diff --git a/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/icon_decor_base_glasses_01.png b/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/icon_decor_base_glasses_01.png index 4da917e00b599160778a2e17914c7073bd9cfd84..66e95f7fc14e156e31d8f5a4af721fe99a3cb8b0 100644 GIT binary patch delta 100 zcmey$GJ$2o7RDHNPZ!6Kh}O5~Hu5qkaJU2-u6w?v=b=(wV=wE}z$E8S@lK@^7K<=2 zOlX{W)>i7I|E;I@3R1O{?oR*xC$v}2>fxt&exT%Srpr!>&Y^*uwle^Mr>mdKI;Vst E0A-IUpa1{> delta 202 zcmbQh@|9)77RGwEByV>Yh5`^|Np-rzz`(#+;1OBOz@VoL!i*J5?aP3I>?NMQuIw+^ z1em1^YBiq50fi(>Tq8=H^K)}k^GX<;i&7IyQd1PlGfOfQ+&z5*!W;R-fr@-RT^vIq z4!^x{kn?~6kMqRfgrYzz!#3D&vGm;9M@-*UcA x=+zmjsV*_aKj-W(T~n97^v`r=28J7P>~AyGp6;5l#{y_FgQu&X%Q~loCIHj?MuY$W diff --git a/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/icon_decor_base_glasses_02.png b/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/icon_decor_base_glasses_02.png index f51d04c7fda033ae2f00c70e219f4cfdd8845239..41628fa58d03cc62f6302eb8649f1ccd7bd7efdd 100644 GIT binary patch delta 464 zcmaFEa+OW7Gr-TCmrII^fq{Y7)59f*fq}6B$X4KB1Cr8f)<4~-IEk^IvB%TJF{EP7 z+v|pTha3c0FF1M~WnHndc-kDZ;~u`;rs5vnv(}gxnHdVc_WV%I8+ZHD_M0~iU4TYl zg3~wtlpK0mRJs56qStNzs9I#+5Q+T4Gw z^zYe9#t?l6phA21Bk8~H)YZ@1w|(=r2)UKJ7*DJ}D}OCkdV8|(?dyyG?OMCvQoo_t zrN-s1{((g173a?LuCTHfQ8n@@7D}vNbQS zHk22}W+!hge>Gw5`si=`3F42rcZVOAJe~h(dd$T6>ie#@+@CzZ|7*s+?Vqk+YRJF( zH|Vo{=y&g@{Lgot^$h)Y+2n!bvR`+dKRw&SFfFTO`={Amzjs`1_!m^S{&!?G^SW>1 q*X~C!uQ^xW#l`~+K~>aHTytC8F7?@y@M(r`KoXv=elF{r5}E+PjM-5D delta 229 zcmcc0_J&2VGr-TCmrII^fq{Y7)59eQNGpIa2OE$quB!U7QE?JuJp)^kx4R2N0SL0B zI^6-vaTa()7BevDDT6R$#Zvn+pdfpRr>`sf3pN2}MTHn$DJGzhWQl7;iF1B#Zfaf$ zgL6@8Vo7R>LV0FMhJw4NZ$Nk>pEyvFi>HfYNW|f{mp5`UDDb#ke86Px$cu7P-R9J=WlQE9sFcgMAuU0gveSuWS5){Z62u+j|(D)J*a0t$kiVIk&xPX-s zrHVxTT4-pz#S9V5Kr%a1Y_a*8NbmXm`ECD(k&%)A9rdaaV+0^g(+JSEtx`%o^g0ox zKGmMhJ>yrOyPL>Q7}9uY;C`@e+fQ3iO0irn*DHCRN9P<((-1;HYmJEDoTI8L@;s+3 z%dT#%WjdWwmL*kHsmWyWy%T`9dlnJ2*4<9M_Y_6(VCG{T;5K(S9D4uJ8$uDGC<;Ub zfYa&p(7XTM_dm{k+dy5{%6pG7=0PlkfH8*S@rW^o`#gvU#u&W!)O9`h6bCZ^uvjd* or*;$lYHcV3BO@atBP0KuKb2m{V)r0YO#lD@07*qoM6N<$g1tz|p#T5? literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/icon-decor-mask.png b/Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/icon-decor-mask.png new file mode 100644 index 0000000000000000000000000000000000000000..069c8c2c6f9d23a55b05bd00ffc0714fc5ab4975 GIT binary patch literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}ex5FlArY-_ zFKpy(aNu#i*gV(PHSI*)&1WmtS#A(fdGSwMSG&^)s5@hViRxL~^Jk);?K*c;)Ah(h tF+15Uzvjz6XbTHn{e8CidZ3zftaqJdbG0vD4h5Rb;OXk;vd$@?2>=PEGvWXM literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/meta.json b/Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/meta.json index f2b65a4a1e3..4b2c1db9d0e 100644 --- a/Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/meta.json @@ -15,6 +15,12 @@ "name": "decor-equipped-MASK", "directions": 4 }, + { + "name": "icon-base-mask" + }, + { + "name": "icon-decor-mask" + }, { "name": "inhand-right", "directions": 4 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/icon_base_boots_01.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/icon_base_boots_01.png new file mode 100644 index 0000000000000000000000000000000000000000..614a60c1f931b1a625c1e113294d8403fe9c4a1c GIT binary patch literal 359 zcmV-t0hs=YP)Px$AxT6*R9J=WlrfHmAP|M$zia6k?6?Ib7a?9`_8^4H3s6(eEl5n@B5Wn`S9BMP zZI&-F2v2>(a}?-wI-Smc=hb?HQYr(0lo9~I%%^K=n)kly_0eKZMA;Zq=FALZOfjr! zT5CutOW{X`mI9a=LWt8^?YuUx(UgGq{uM%iF{bP=gaBrSloCe`0IapQ&umHncu#?u zi}|+Oy=JW~+Eowyx(SJ>yu-ce-h88`JuZNV^4?${?a_GC=6OC9aaF*N<}t={EX$IW zQf0i-VvJcSm5C@TrSjDmaGL-TPx#;Ymb6R9J=Wl);SyAq++TthSZuf}=Z`M%;+S$zAwJ7o4UN=dc=fR)J(EnIsoK z2_X!aZ_5S zPIJ!9IT5*tU|E)SPDD^jL9G=4yeHzY05hA+?5?=py2sa10VB+8s002ovPDHLkV1f_SgBJh* literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/icon_decor_base_boots_02.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/icon_decor_base_boots_02.png new file mode 100644 index 0000000000000000000000000000000000000000..70c1e326e431452a2df40d10fca0ec4eb26cdf0a GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}ot`d^ArY-_ zuN>rTR^(xQ5dK0d@1bGyUSFG3?*7Olo|h&cb*|?M`xkeQeUXOHR0#(c7qc0Wvm*bg zTAY+gUb0*L}Rk2;|&Y#bl zcmDp!R8lEDDbnlbj%!iY--M=@CfNPfvC7t0Qc~Z`Fum2o?Muz>bfBXcJYD@<);T3K F0RTF0QE31G literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/meta.json b/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/meta.json index 63a5c0b80af..2b295d59c5b 100644 --- a/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/meta.json @@ -30,6 +30,15 @@ { "name": "inhand-left", "directions": 4 + }, + { + "name": "icon_base_boots_01" + }, + { + "name": "icon_decor_base_boots_01" + }, + { + "name": "icon_decor_base_boots_02" } ] }