From 9fb41da59dd35e8d04174bb9bcaddac6d87d2306 Mon Sep 17 00:00:00 2001 From: nmajask Date: Mon, 9 Oct 2023 11:22:56 -0400 Subject: [PATCH] Adds flannel jackets (#20765) * Added flannel jackets * Better desc Turns out lumberjacks don't wear flannel jackets * Added the jackets to maint fluff pool * Moves the jackets to the winterdrobe --- .../Inventories/winterdrobe.yml | 3 + .../Entities/Clothing/OuterClothing/misc.yml | 102 ++++++++++++++++++ .../Markers/Spawners/Random/maintenance.yml | 3 + .../equipped-OUTERCLOTHING-lines.png | Bin 0 -> 619 bytes .../equipped-OUTERCLOTHING.png | Bin 0 -> 703 bytes .../Misc/flannel_jacket.rsi/icon-lines.png | Bin 0 -> 294 bytes .../Misc/flannel_jacket.rsi/icon.png | Bin 0 -> 302 bytes .../flannel_jacket.rsi/inhand-left-lines.png | Bin 0 -> 197 bytes .../Misc/flannel_jacket.rsi/inhand-left.png | Bin 0 -> 276 bytes .../flannel_jacket.rsi/inhand-right-lines.png | Bin 0 -> 200 bytes .../Misc/flannel_jacket.rsi/inhand-right.png | Bin 0 -> 285 bytes .../Misc/flannel_jacket.rsi/meta.json | 41 +++++++ 12 files changed, 149 insertions(+) create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/equipped-OUTERCLOTHING-lines.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/icon-lines.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/inhand-left-lines.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/inhand-right-lines.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml index 11e992adfb..94d9e64703 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml @@ -10,6 +10,9 @@ ClothingNeckScarfStripedOrange: 3 ClothingNeckScarfStripedPurple: 3 ClothingOuterWinterCoat: 6 + ClothingOuterFlannelRed: 2 + ClothingOuterFlannelBlue: 2 + ClothingOuterFlannelGreen: 2 ClothingShoesBootsWinter: 6 ClothingOuterCoatBomber: 3 ClothingHeadHatSantahat: 2 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml index bc7c46327f..0b2e6f5edc 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml @@ -255,3 +255,105 @@ sprite: Clothing/OuterClothing/Misc/hospitalgown.rsi - type: Clothing sprite: Clothing/OuterClothing/Misc/hospitalgown.rsi + +- type: entity + parent: ClothingOuterBase + id: ClothingOuterFlannelRed + name: red flannel jacket + description: An old fashioned red flannel jacket for space autumn. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Misc/flannel_jacket.rsi + layers: + - state: icon + color: "#670a09" + - state: icon-lines + color: "#000000" + - type: Item + inhandVisuals: + left: + - state: inhand-left + color: "#670a09" + - state: inhand-left-lines + color: "#000000" + right: + - state: inhand-right + color: "#670a09" + - state: inhand-right-lines + color: "#000000" + - type: Clothing + sprite: Clothing/OuterClothing/Misc/flannel_jacket.rsi + clothingVisuals: + outerClothing: + - state: equipped-OUTERCLOTHING + color: "#670a09" + - state: equipped-OUTERCLOTHING-lines + color: "#000000" + +- type: entity + parent: ClothingOuterBase + id: ClothingOuterFlannelBlue + name: blue flannel jacket + description: An old fashioned blue flannel jacket for space autumn. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Misc/flannel_jacket.rsi + layers: + - state: icon + color: "#3232a6" + - state: icon-lines + color: "#000000" + - type: Item + inhandVisuals: + left: + - state: inhand-left + color: "#3232a6" + - state: inhand-left-lines + color: "#000000" + right: + - state: inhand-right + color: "#3232a6" + - state: inhand-right-lines + color: "#000000" + - type: Clothing + sprite: Clothing/OuterClothing/Misc/flannel_jacket.rsi + clothingVisuals: + outerClothing: + - state: equipped-OUTERCLOTHING + color: "#3232a6" + - state: equipped-OUTERCLOTHING-lines + color: "#000000" + +- type: entity + parent: ClothingOuterBase + id: ClothingOuterFlannelGreen + name: green flannel jacket + description: An old fashioned green flannel jacket for space autumn. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Misc/flannel_jacket.rsi + layers: + - state: icon + color: "#164d0f" + - state: icon-lines + color: "#000000" + - type: Item + inhandVisuals: + left: + - state: inhand-left + color: "#164d0f" + - state: inhand-left-lines + color: "#000000" + right: + - state: inhand-right + color: "#164d0f" + - state: inhand-right-lines + color: "#000000" + - type: Clothing + sprite: Clothing/OuterClothing/Misc/flannel_jacket.rsi + clothingVisuals: + outerClothing: + - state: equipped-OUTERCLOTHING + color: "#164d0f" + - state: equipped-OUTERCLOTHING-lines + color: "#000000" \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 3884e81d72..1d61ca9c7d 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -99,6 +99,9 @@ - ClothingOuterCoatPirate - ClothingOuterHoodieBlack - ClothingOuterHoodieGrey + - ClothingOuterFlannelRed + - ClothingOuterFlannelBlue + - ClothingOuterFlannelGreen - ClothingOuterVestHazard - ClothingShoesBootsJack - ClothingShoesBootsLaceup diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/equipped-OUTERCLOTHING-lines.png b/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/equipped-OUTERCLOTHING-lines.png new file mode 100644 index 0000000000000000000000000000000000000000..44a2ebae5c2d5274959edd2083440f46095e2f7b GIT binary patch literal 619 zcmV-x0+juUP)Px%B}qggd5MD<5Gpla&2ZQCCrI`pGha&Yf=kxIst{?Lf%R~_Kqr=V`Ib7m>vvk)NYK=zyxJe|#PmOD7{yHT5DVg!IRZG5WO(kP%liKv{<}$muGQ z8hN=+Q=mCu@MtGk%>ZQ`ij<>9-t##xb`Ah-P%{9OhZ36s(Vz~9-2;--MN-`ZvK)jQ z1ENlXxlV($H%+O7@3dE+htQ@Hc*)gR% zSrvGkZ`r?G3D7;@Px%c}YY;RCt{2nmumgFc5`DL5eK`s9}JVF6k3UK2DCXC&^)Q2wNuz8v-d)Ov4i> z)i_*6KOBlQ*YE>h7Z(G0tY}41VIo4LAXzvrHk(E>!1H0htH9Y_s3ncc0M=0 z&K#kB`}bwB{Ub+QYYhMZ#+YB%>DmXFv4jb}J^%nBo{yDMKkb?^|32QZsq36=13#=iF*e;OIvu!CU2O3|M=knGbx#V0C{VM!F5e{}s!etrI_kD9ZohH{-M1;QYi+u=%`cs2W(Pz(q8Ikk3@Cz~* z)Nk9r%nmX|JN{Mp?W@?}YH~HJKq;;+3Fe-KYy)oXF}V9jKn$oIKyAc;+5yx?45%GI zZNz}u0n|nes2xCU#DLlX)aLFDV1EvW`)wr)B4XGY56b|*NP%`|1{jJIM8w9^bsYfw zY|U|N6OtYQe`~7ix@@%o9Q?tDF>y%F0oK|gwE$e4b6~AazW?r%V3Gk_wxUWfwOtkq z+W;y)P)bc!i(MLH3@D`_wJ3wV3_ia<{pQt)d9F1=^y lYlrdN+Ww^=2!bFK;v1Q$cOT0^3Mv2q002ovPDHLkV1iC3I!*up literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/icon-lines.png b/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/icon-lines.png new file mode 100644 index 0000000000000000000000000000000000000000..0936bc709f3e8ecdaef23a73dff4b2b06d99d608 GIT binary patch literal 294 zcmV+>0oneEP)Px#;7LS5R9J=WltB)IAP`0WG+omry%3%UPh!ub7qUxx0lGngH0jJljA_c-5a0*? zd}V+}qtWrq$Nfblkj5JmuQ z9Se!e_hTY;43w2~322jG4V0Bj63E7V28_33S(!8eBI=B{tO+iGvSKy?MyEEADvD2% zO@PsT@H>4V!X}_RPi;W@57alH>4chYczOa?jhKiCNX;o{O+byxKxSlnS&uX?Uk-=( s6D-55KD?@dqd47wsuLc;=?OFgZv~v557_vj^#A|>07*qoM6N<$g4;iKnE(I) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1c2cdebf9a77e2b2b8a00987c23f4304325d8c6c GIT binary patch literal 302 zcmV+}0nz@6P)Px#=t)FDR9J=Wm9Y_nFbqY%bLrhsq@*+(IAdj!j0GF;%ake9cmh(H0C(7e3q=mU z4oQ|iLNY+1P$--olX8aVd-mMlUqdco)7G<`_Hj$bUvmkk#hr5i0FtPxYV?T+qOS*s zrHB-lEyb<1u-1dXF}73 zYzIUHB7&x^4asCINi=P3;u#Gp0aMnxu(WFhB-e1uI_*8D9>Sye9|7@7UHi7tp1XQ? z3pfh(zW@Nd_onN*0r;+GL`2}d-!-&_LgCze0ANaUA6LseApigX07*qoM6N<$f&r6# A3IG5A literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/inhand-left-lines.png b/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/inhand-left-lines.png new file mode 100644 index 0000000000000000000000000000000000000000..4c0d831e910ec21f518cd3275517cdf508f1a859 GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|>OEZ?Ln`LH zz2(T&Y#_iI@ba(!6uG=zD_F&M1?)d{;k%h)Bai)rr}Nc-Y8e`uSFM_NZo_qLoA-O~ zgj}^Se)HzOZ1A*gXdmrtLI$N%dQY#&QxO6)j+dO*N0Ywgeb zrhk01&+aY1eQ(x<>hCv~t*LxnH-GlanSw#trJAmS8{g(yD}{Ikt}R{hqjp|yzn#6( zQpQOp=QpclMov4tEAITM)89^U%v|n+a literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/inhand-right-lines.png b/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/inhand-right-lines.png new file mode 100644 index 0000000000000000000000000000000000000000..e1c100c0e0e8057198192a4d6e17858984ec9c82 GIT binary patch literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|nmk<`Ln`LH zz2(T&Y#_iI@ba&J3jg=rLM}lQtri8}yUn7e^2fF8=Vcb4T80mK_~ahR zz4~W@@+SQMa8PCD^wOO1 zCwFBVRL*|Z@r;`G^jXa7y;WxKQ`cMgUY@>W_Q}*`M#aCcuRe3K>9sh{an^LB{Ts5tkHdV literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/meta.json new file mode 100644 index 0000000000..7b4a51dfa4 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by nmajask (Github) for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-lines" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-lines", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-left-lines", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-right-lines", + "directions": 4 + } + ] +} -- 2.51.2