From f9627a811c2808f162e7b69b286b8f0cb6127bfe Mon Sep 17 00:00:00 2001 From: ps3moira <113228053+ps3moira@users.noreply.github.com> Date: Fri, 15 Dec 2023 01:55:17 -0800 Subject: [PATCH 01/12] Elf Hat --- .../DeltaV/Entities/Clothing/Head/hats.yml | 10 +++++++ .../Head/Hats/elfcap.rsi/equipped-HELMET.png | Bin 0 -> 1040 bytes .../Head/Hats/elfhat.rsi/equipped-HELMET.png | Bin 0 -> 1076 bytes .../Clothing/Head/Hats/elfhat.rsi/icon.png | Bin 0 -> 612 bytes .../Head/Hats/elfhat.rsi/inhand-left.png | Bin 0 -> 967 bytes .../Head/Hats/elfhat.rsi/inhand-right.png | Bin 0 -> 974 bytes .../Clothing/Head/Hats/elfhat.rsi/meta.json | 26 ++++++++++++++++++ 7 files changed, 36 insertions(+) create mode 100644 Resources/Textures/DeltaV/Clothing/Head/Hats/elfcap.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/DeltaV/Clothing/Head/Hats/elfhat.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/DeltaV/Clothing/Head/Hats/elfhat.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Head/Hats/elfhat.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Head/Hats/elfhat.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Head/Hats/elfhat.rsi/meta.json diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml index 22167ae0385..6c853c77187 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml @@ -210,3 +210,13 @@ tags: - HamsterWearable +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatElfCap + name: elf hat + description: A green and red striped cap with pointy ears and a bell on the end. + components: + - type: Sprite + sprite: DeltaV/Clothing/Head/Hats/elfhat.rsi + - type: Clothing + sprite: DeltaV/Clothing/Head/Hats/elfhat.rsi \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/elfcap.rsi/equipped-HELMET.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/elfcap.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..97ee5a1e3e6c1d9e0bb94e6a974a6d5b09ea233e GIT binary patch literal 1040 zcmV+r1n>KaP)$*7d@qN7b{)ND%>ERB90k)jkV7sZW30_l|0o6 zT2a`@A%ip|D5zl*Ivgaanv_{@U#jI>MwL8_z831>Z(%JNLOj;2-_J5o|0flXPqC4R52#C}E$i^S^lxPLO zQl>xv00LY|L_t(|obA~$XcJKw2k`%CQp6jI6$35NoE$-lwWLD>g-(JF;udJ>>>|Xe zlZ(*JL68o~m^DI15r@#Zg9Q~Mh)TeuUJEH+o1rbiE1$!8F?UwMa}mW(9iFK$oE!T?<(+CWt9A(?c9SD z+z0x3|4$9HvLW#v_R+ZmG`8%%How2J0RZq|q>ZVWG%8omoOCHCr+h!9cGDvwA|fIp zA|fK9e@@@$0&!FK{W1BquJ(Lz(0QSb#*Qmy{K`dWqwZ~_?O+?5qN)ih@oa1#3h0IgOl^oj^|ac~9zcNUuU^N=S7-oE;X zYj<8KeFbWztW3?Mp)GyFCG*QqwQRrN4Aq3tCqqZO9Z1{h1~%6Yk;`OIT%W^Abr!W! zR@q@it(29O>MV-ubI4^fXs#XlYB}2NsEYm}ZtC)VBl3NW^t>49dC4v2z3&E1a*O$H zPB6cxu27;ZS1%+uHW)tWSK)W}|5aT?L_|bHL_|bHL_|ac0N(()*)WkFhVKpl0000< KMNUMnLSTXiI@$*7d@qN7b{)ND%>ERB90k)jkV7sZW30_l|0o6 zT2a`@A%ip|D5zl*Ivgaanv_{@U#jI>MwL8_z831>Z(%JNLOj;2-_J5o|0flXPqC4R52#C}E$i^S^lxPLO zQl>xv00MwXL_t(|ob8&iYZGA@#(zq%l`Dk?x|Bc;ibGHeF3zRY5~WaZDCl1xM3?B$ z!A^E-m4GR@xTcUns7Ng;;+{rlQli4pFucUPkCZ%gvsJC|}pyOy`h z`r>3FMd;OUdAk6i^#fl}&RDX(IN7c~9Cx5lt#j}DVeAFyrw=e+s>Q4S_4O-(;|@5E zBdz^Caa~VZ`+MRzj+n7D>*CZeXDq4Mwp46e${9<_87s7YDyWI<^_vV0rT(b2>w40d z*^1@iJN4h*y-oK7*Z>qtHRfU}ewTsM{2qnAnYPX;FjE;uKe3%VN_zK!)4c!ZBXyP# z=3!UIj%YMnr`r4mvH$?f7xuYw^%B*~!)I;f?5Hed6aWwiR*f@@N5=0BC*^w26DxzKt6rP<0gwA1Xjn6e6RIYfXY%<1|^F(=LSB%xEAfS u4pJ6BNM031Q4~c{6h%=KMNt$*NtWNFbwTKY8C0nDqq! literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/elfhat.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/elfhat.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c201b084d2c61a79927ae3c8fdf8767918fb4ddd GIT binary patch literal 612 zcmV-q0-ODbP)Px%9!W$&R9J=Wl|N_`Q5?rVk!Q(+#u9WmI;c=8k#sRGZr;$LgB6bs4jnpVDY3I1 zy6WP7ZW%I&*hL8G*5N7^x-?rb92D##SE!cs3Muj69Ikiy(_ZdQ3Od{ee#5=@d%xfJ z{eJJggOrq%e@rII!7z-_IbGA-)_ni_{j1MI@l;if6mTQbBP6k|X)eIhuH;U^vx@GG zB_Xi@KXE}yw0xe2*(@(>0$+?j9~Y4{c|l4PA;^pVQp<5TZg){cj&_oOB&a||*W9Bu z$xa!z*5Sl)0#k&bxb6A1=1J6wL=^y-RJ%-%Z-%1SI=DwQayJ5$U7pnrgrnyVI z5`Z(yxzcB+OfdgxVfK0j04PGR`XL)68MUWXul%dOZ!-62mfHufW3?f&1r=R$iv!=j zh)ZOlxZQ=BIBENYR={l3gB={LNi65;()*k^4h1QBb8yPX&9D5Nc^CP}jTJD;{)XV& z`T5Z4A2iExf^#svP|J*NB8;&uFdKFEMQsJ}`o6z0&RxL80aaBsR`Rg|dL5gIsT_ON zL!OlHU5v`mK*#Ma0DIL#tQEuc*Z;MEiK!gDjvWLA283M3_en~uhe%3^5Q5g`uSj3p zwu!rYi1;0wjk??G*xX%Q41|Qy?RqV+z8FE}=9ZTuZ$hMl*{HieCU0c`N~Kch!D=>} y8Gz}t)1dzko;{Cs6|WVuQFr6sfRvP!|AIf##pdpGC#7Hj0000$*7d@qN7b{)ND%>ERB90k)jkV7sZW30_l|0o6 zT2a`@A%ip|D5zl*Ivgaanv_{@U#jI>MwL8_z831>Z(%JNLOj;2-_J5o|0flXPqC4R52#C}E$i^S^lxPLO zQl>xv00I+9L_t(|obB4dYtvvD2JojcT*ueTJlaA7V}r3VC?Z}xj4@$scoE!TXTb_G zci6%G1yc~rz_W)4J$NWV$0p)+hey65MpYMIY zl=kojAR;0nA|fIpBGPJhb3umrxk3#p+N>$b+RW_cf|xZmdK)mP=znR(tSMQ3a&vSx zz_Hr`^fzl6hQz-C(RFEa;#u+6NjX`J=?Ze}wjA8Mi`z#I)+xq{&5DSn&=z>OI! zr7Swiu^(Os04xIn0DD~@X6sm%UcAy(G60~YE6B0iq8it*`1Draxp$A=BKZ6XGb^i! z>&0_+UVjGw_`R>#yEBz3CoOG35woTwx_h0jkNd4-G*5!e>*&f!a!Ge!^CT#Bx;}O% z&(4pF%t@ks0|1~kSH^r}8atQ2{TDffu(s=3eyMfk5D^g(5fKp)5fKsPWLT5kLF;54 z#pf~@*)UyLhLP(gScV}RrrY;^{pyuWH$dBTIPPWB004v!zR39anD&uY81`iC`Qq<` zE%%ReE6+Xx0QOU6X)n(6JejB{sB#5)G#?4Wo$*7d@qN7b{)ND%>ERB90k)jkV7sZW30_l|0o6 zT2a`@A%ip|D5zl*Ivgaanv_{@U#jI>MwL8_z831>Z(%JNLOj;2-_J5o|0flXPqC4R52#C}E$i^S^lxPLO zQl>xv00J6GL_t(|obB1MOB+!f2k@^Y)W`+FKo=A6AQ%uu2pzg+kdVS*(IMdCEJPRE zp^KBFDID|yojatEQG}M#e?Sg#4+;^Cqab+df$$va*++7xiQG#r_50b9yZ7Gr_wu;F z{Qx2&A|fIpA|fIHz|7{n7<7g(JgbhG&3R#^wT^+qxG7dz6Fuh+8sxVrQCF>um8|$Y|8li$yTi<0q5{QX{bmlR`Q}>PyBxB`d{GW>>N82 wS1Pj%MAsWopN(TKH~q5P&M&%nBKj}g0jvGs6XB!t&j0`b07*qoM6N<$g3#~2I{*Lx literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/elfhat.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Head/Hats/elfhat.rsi/meta.json new file mode 100644 index 00000000000..9c018ea80c7 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Head/Hats/elfhat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by ps3moira.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From e3a0542f9fe354d7aaf79acc21fa07b6720bf531 Mon Sep 17 00:00:00 2001 From: ps3moira <113228053+ps3moira@users.noreply.github.com> Date: Fri, 15 Dec 2023 02:05:55 -0800 Subject: [PATCH 02/12] Update hats.yml --- Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml index 6c853c77187..8b77e5a0da3 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml @@ -212,7 +212,7 @@ - type: entity parent: ClothingHeadBase - id: ClothingHeadHatElfCap + id: ClothingHeadHatElfHat name: elf hat description: A green and red striped cap with pointy ears and a bell on the end. components: From 53dec23235e704f6e0fa3f3e6794a3f0c9f2e7f1 Mon Sep 17 00:00:00 2001 From: ps3moira <113228053+ps3moira@users.noreply.github.com> Date: Fri, 15 Dec 2023 02:07:13 -0800 Subject: [PATCH 03/12] Removed Duplicate Folder --- .../Head/Hats/elfcap.rsi/equipped-HELMET.png | Bin 1040 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Textures/DeltaV/Clothing/Head/Hats/elfcap.rsi/equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/elfcap.rsi/equipped-HELMET.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/elfcap.rsi/equipped-HELMET.png deleted file mode 100644 index 97ee5a1e3e6c1d9e0bb94e6a974a6d5b09ea233e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1040 zcmV+r1n>KaP)$*7d@qN7b{)ND%>ERB90k)jkV7sZW30_l|0o6 zT2a`@A%ip|D5zl*Ivgaanv_{@U#jI>MwL8_z831>Z(%JNLOj;2-_J5o|0flXPqC4R52#C}E$i^S^lxPLO zQl>xv00LY|L_t(|obA~$XcJKw2k`%CQp6jI6$35NoE$-lwWLD>g-(JF;udJ>>>|Xe zlZ(*JL68o~m^DI15r@#Zg9Q~Mh)TeuUJEH+o1rbiE1$!8F?UwMa}mW(9iFK$oE!T?<(+CWt9A(?c9SD z+z0x3|4$9HvLW#v_R+ZmG`8%%How2J0RZq|q>ZVWG%8omoOCHCr+h!9cGDvwA|fIp zA|fK9e@@@$0&!FK{W1BquJ(Lz(0QSb#*Qmy{K`dWqwZ~_?O+?5qN)ih@oa1#3h0IgOl^oj^|ac~9zcNUuU^N=S7-oE;X zYj<8KeFbWztW3?Mp)GyFCG*QqwQRrN4Aq3tCqqZO9Z1{h1~%6Yk;`OIT%W^Abr!W! zR@q@it(29O>MV-ubI4^fXs#XlYB}2NsEYm}ZtC)VBl3NW^t>49dC4v2z3&E1a*O$H zPB6cxu27;ZS1%+uHW)tWSK)W}|5aT?L_|bHL_|bHL_|ac0N(()*)WkFhVKpl0000< KMNUMnLSTXiI@ Date: Fri, 15 Dec 2023 02:36:57 -0800 Subject: [PATCH 04/12] Added Elf Shoes --- .../DeltaV/Entities/Clothing/Shoes/misc.yml | 11 ++++++++ .../Shoes/Misc/elfshoes.rsi/equipped-FEET.png | Bin 0 -> 674 bytes .../Clothing/Shoes/Misc/elfshoes.rsi/icon.png | Bin 0 -> 304 bytes .../Shoes/Misc/elfshoes.rsi/inhand-left.png | Bin 0 -> 229 bytes .../Shoes/Misc/elfshoes.rsi/inhand-right.png | Bin 0 -> 231 bytes .../Shoes/Misc/elfshoes.rsi/meta.json | 26 ++++++++++++++++++ 6 files changed, 37 insertions(+) create mode 100644 Resources/Textures/DeltaV/Clothing/Shoes/Misc/elfshoes.rsi/equipped-FEET.png create mode 100644 Resources/Textures/DeltaV/Clothing/Shoes/Misc/elfshoes.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Shoes/Misc/elfshoes.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Shoes/Misc/elfshoes.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Shoes/Misc/elfshoes.rsi/meta.json diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/misc.yml index acee4da64f9..62858dbbf34 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/misc.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/misc.yml @@ -8,3 +8,14 @@ sprite: DeltaV/Clothing/Shoes/Misc/whiteleather.rsi - type: Clothing sprite: DeltaV/Clothing/Shoes/Misc/whiteleather.rsi + +- type: entity + parent: ClothingShoesBaseButcherable + id: ClothingShoesMiscElf + name: elf shoes + description: Little elf shoes with jingly bells. Jingle, jingle, jingle! + components: + - type: Sprite + sprite: DeltaV/Clothing/Shoes/Misc/elfshoes.rsi + - type: Clothing + sprite: DeltaV/Clothing/Shoes/Misc/elfshoes.rsi diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Misc/elfshoes.rsi/equipped-FEET.png b/Resources/Textures/DeltaV/Clothing/Shoes/Misc/elfshoes.rsi/equipped-FEET.png new file mode 100644 index 0000000000000000000000000000000000000000..b8f92d6ebf59fe3d2ae56bf3d7e6365c12f4018d GIT binary patch literal 674 zcmV;T0$u%yP)}P8Khj^YiyX9Dd_lU<> zMJ^Ga5GObtkoZ>UipOt)%N~CT=7rn>;1@lmau+LI%qrXUjJ_7?;N&QyLf!Zps{ z|L19IGt*x8a2gnVb=}WNAh-`S8?O6%>blJ{An*cQn;n0Za+>=lz0uKP$3SEUxV-6T z$^me-3yeQoGM8IYfRa83^pt1? zh{)Wu0002(NklzU5)^kDF{_8cE^W-h)*&QIR-URpYwUXZ}fD!22tD z%PCLo<(T)gq4NU(0000000000zz37=O;>#ZF4-YACf#?seybBy-KK6U*9-)LO{uJJzqexaxWmo^pf0vT;$vOv2Ug8%>k07*qo IM6N<$f?5Px#>PbXFR9J=Wk|7VmFc5{`5|RnrGDA`nSOf?ZW(G5jLhc{oCsAlLW(u(hEGUrB zWP&BAA}-C^WOPd=F!!muUVHELT7Y2~hGCdL<8|3|NtX%$X35zDfM5lsYp>mw8ZGvo zi0gIDTzi>W*`P=*8dIE-F80HHkxx{E`FYr+oy!WVmw`8~8K zl6D7bXK={FbNN#59j@I=Bc0Wq}Kn*tnRjmvHPAA#Sb!vf#HDsi=_Gm_3>wQ-}8UTX86X=z_37< YpZjKDWXkRykh>W?UHx3vIVCg!0Ef<3kpKVy literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Misc/elfshoes.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Shoes/Misc/elfshoes.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..953bcbeb2c6e8584c4cd61a367da9a21cbb33754 GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|7J9lkhE&XX zduuoEAp-%13(PwmZnm(l$jqGCC_AH}Nijo0QFsHh)0(Cqt%sO2Thu~0_guddxoPd@ z+q*e{+8O@cs54%f^|LDEsM6C2G0U@$7K zn*IM~M6ODjRkUySG41+W_mudizpHb&|C$|S4gYcA~zz4QHNqxsvetM%** b4e=itX3YtVba*$HAEd_9)z4*}Q$iB}?6qDM literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Misc/elfshoes.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Shoes/Misc/elfshoes.rsi/meta.json new file mode 100644 index 00000000000..3e77f6cc354 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Shoes/Misc/elfshoes.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified sprite by ps3moira and taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From ee003d9235e5b178f619a9c813aa23fa84d04791 Mon Sep 17 00:00:00 2001 From: ps3moira <113228053+ps3moira@users.noreply.github.com> Date: Fri, 15 Dec 2023 02:52:34 -0800 Subject: [PATCH 05/12] Added Jingle to the Shoes --- .../DeltaV/Entities/Clothing/Shoes/misc.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/misc.yml index 62858dbbf34..2195f7fda5a 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/misc.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/misc.yml @@ -15,7 +15,10 @@ name: elf shoes description: Little elf shoes with jingly bells. Jingle, jingle, jingle! components: - - type: Sprite - sprite: DeltaV/Clothing/Shoes/Misc/elfshoes.rsi - - type: Clothing - sprite: DeltaV/Clothing/Shoes/Misc/elfshoes.rsi + - type: Sprite + sprite: DeltaV/Clothing/Shoes/Misc/elfshoes.rsi + - type: Clothing + sprite: DeltaV/Clothing/Shoes/Misc/elfshoes.rsi + - type: FootstepModifier + footstepSoundCollection: + collection: FootstepJester From c9b6cce2e5adf5c6d745306aec722c201ca0d4f9 Mon Sep 17 00:00:00 2001 From: ps3moira <113228053+ps3moira@users.noreply.github.com> Date: Fri, 15 Dec 2023 03:37:59 -0800 Subject: [PATCH 06/12] Added Place Holder Sprites and Prototypes --- .../Entities/Clothing/Uniforms/jumpsuits.yml | 11 +++++++ .../elf.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 984 bytes .../Uniforms/Jumpsuit/elf.rsi/icon.png | Bin 0 -> 445 bytes .../Uniforms/Jumpsuit/elf.rsi/inhand-left.png | Bin 0 -> 374 bytes .../Jumpsuit/elf.rsi/inhand-right.png | Bin 0 -> 377 bytes .../Uniforms/Jumpsuit/elf.rsi/meta.json | 30 ++++++++++++++++++ 6 files changed, 41 insertions(+) create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/elf.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/elf.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/elf.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/elf.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/elf.rsi/meta.json diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml index 5d7f045e770..fa057f088e5 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -232,3 +232,14 @@ sprite: DeltaV/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitElf + name: elf jumpsuit + description: A sharp and professional jumpsuit worn by Santa's highest-trained little helpers. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/elf.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/elf.rsi diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/elf.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/elf.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..1898556f04034e6bea20cc12ac6a8df9712dfc94 GIT binary patch literal 984 zcmV;}11J26P)Px&l1W5CRCt{2n!k$^K@`WoIrNA}&RxD2F7=~LZl>h)+{XPKTRy~K}-7NsX$$sux!&rG2bPU4{GggIcVO?n#EOda3?9SoD7g(IZ#QRDFpL|V- zjC{W+TB{&GZwuiItW+k|1(;?5xf7)Ri&z>18V`PYubXw-`zlBwbbC^RA3i<5RJaOs zokq*_$phfihZ;=vUIZ&$$$%u&(5LYjZ@M=COoJjf1#yu9d1E^Z0C-&aiaWV!b{Z9n zky5Zy5Del)e#`QuproKOgIS1+(m8-KFVY9oWL(UX6Ey=x+5uEpQifBg%vDn_YX@+G zP#kcAuqx~w@ap|F-=U*fx4pwj7x6j(06x6EIAgGPINKky*JH;3N}LftDfufo;D10n zAZ-QGh8+ZtLjp~lzXXGHEo)|sW(AE#qtR$I8jVJy(ZofyU3NJY*tprv=iS|WK9WA{ zE2W#Sue)2-O8{nn8Ygu{7OXkS()s6J5BH9a;%Sfo{KivcrKbOJ6uT2ThT+m`P!O&Y z*f&D*PTmXjVJ0nc6>&Wy?We3DKHR;MU0pBGqbu`flR-2dSTN$Vmq%<$fD$Tl8eI$(2c z4V6*}x8M24X}>^?tpblm%k(xbndnhC%-PMl&F&G3q_FHClns+{H%Em*+h=7;jMAg5 zV?f#pq>Xk!+6tsilh&wd!P^O$z`NLZH~30Z?tEjKW|C0+l%{YsI-rk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0(2Ka=yn$OhUEiCMQ%>1>brTqrO%W7&snXJs`kAM_=NswRge=uN>@@94e z3UL;AL>4nJ@ErzW#^d=bQh>ob!#_>)37J5AXeUfNwo3G7vE<9y~yC{>gTe~ HDWM4fY=?~c literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/elf.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/elf.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ce0f6982b568452fae84e3decc437e31b673ce93 GIT binary patch literal 377 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0(2Ka=yn$OhUEiCMQ%>1>brTqrO%W7&snXJs`kAM_=NswRge=uN>@@94e z3UL;AL>4nJ@ErzW#^d=bQhK$z~QoT+u#5GVjIE=Hou&(cL(SD zMT(EPx3(|*r>yDGIH5^|BVTZWjn~ERrh03cZkZ|FDnIk!veE)A<9Q}WK6tz~bD8SC zR^)E_LFHObt*s3QmYnym@VN23$(x^1zLS61`|Ox14yk@EoeeKPAC&$WcSG0ilGcOj zhxd!_zTuiLC;cM7(R@SZmpk#Ej$ADwOB^buD_pzCto&hZcM*4ztnE(Lpjj2}{(BhS zzv$%Mea*Fy>Gm!SKY>>-8hejhRVA=&?Auo$edC%d=e!@2_ltk2V_=^aZ5&ao8v*ns NgQu&X%Q~loCII6wlg$7C literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/elf.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/elf.rsi/meta.json new file mode 100644 index 00000000000..83adb08f693 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/elf.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified sprite by ps3moira and taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 189f88e1636e0f5f354a5befdadf344ef07c1dcf Mon Sep 17 00:00:00 2001 From: ps3moira <113228053+ps3moira@users.noreply.github.com> Date: Fri, 15 Dec 2023 03:40:34 -0800 Subject: [PATCH 07/12] Removed Monkey's Eligibility to wear clothes (they don't fit and are too big) --- .../DeltaV/Clothing/Uniforms/Jumpsuit/elf.rsi/meta.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/elf.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/elf.rsi/meta.json index 83adb08f693..09fdd4942ab 100644 --- a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/elf.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/elf.rsi/meta.json @@ -14,10 +14,6 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 From 5dbec93c8b0d4e1a20c4df38455edf06da1c95e7 Mon Sep 17 00:00:00 2001 From: ps3moira <113228053+ps3moira@users.noreply.github.com> Date: Fri, 15 Dec 2023 16:17:00 -0800 Subject: [PATCH 08/12] Added Ginger-Bomb Man --- .../Objects/Weapons/Bombs/gingerbreadc4.yml | 63 ++++++++++++++++++ .../Weapons/Bombs/gingerbreadc4.rsi/icon.png | Bin 0 -> 473 bytes .../Bombs/gingerbreadc4.rsi/inhand-left.png | Bin 0 -> 257 bytes .../Bombs/gingerbreadc4.rsi/inhand-right.png | Bin 0 -> 262 bytes .../Weapons/Bombs/gingerbreadc4.rsi/meta.json | 31 +++++++++ .../Bombs/gingerbreadc4.rsi/primed.png | Bin 0 -> 566 bytes 6 files changed, 94 insertions(+) create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Bombs/gingerbreadc4.yml create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Bombs/gingerbreadc4.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Bombs/gingerbreadc4.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Bombs/gingerbreadc4.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Bombs/gingerbreadc4.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Bombs/gingerbreadc4.rsi/primed.png diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Bombs/gingerbreadc4.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Bombs/gingerbreadc4.yml new file mode 100644 index 00000000000..2d7077bd7a5 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Bombs/gingerbreadc4.yml @@ -0,0 +1,63 @@ +- type: entity + name: ginger-bomb man + description: Used to put holes in walls for naughty children. + parent: BaseItem + id: GingerBreadC4 + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Bombs/gingerbreadc4.rsi + state: icon + scale: 0.7, 0.7 + layers: + - state: icon + map: ["base"] + - type: Item + sprite: DeltaV/Objects/Weapons/Bombs/gingerbreadc4.rsi + size: 10 + - type: OnUseTimerTrigger + delay: 10 + delayOptions: [10, 30, 60, 120, 300] + initialBeepDelay: 0 + beepSound: /Audio/Machines/Nuke/general_beep.ogg + startOnStick: true + canToggleStartOnStick: true + - type: TriggerOnSignal + - type: DeviceLinkSink + ports: + - Trigger + - type: Sticky + stickDelay: 5 + unstickDelay: 5 + stickPopupStart: comp-sticky-start-stick-bomb + stickPopupSuccess: comp-sticky-success-stick-bomb + unstickPopupStart: comp-sticky-start-unstick-bomb + unstickPopupSuccess: comp-sticky-success-unstick-bomb + blacklist: # can't stick it to other items + components: + - Item + - type: Explosive # Powerful explosion in a very small radius. Doesn't break underplating. + explosionType: DemolitionCharge + totalIntensity: 60 + intensitySlope: 5 + maxIntensity: 30 + canCreateVacuum: false + - type: ExplodeOnTrigger + - type: Damageable + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:ExplodeBehavior + - type: StickyVisualizer + - type: Appearance + - type: GenericVisualizer + visuals: + enum.Trigger.TriggerVisuals.VisualState: + base: + Primed: { state: primed } + Unprimed: { state: complete } diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Bombs/gingerbreadc4.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Bombs/gingerbreadc4.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..87bc299be102cdb2dba59e64a7f4c68d50e087f7 GIT binary patch literal 473 zcmV;~0Ve*5P)Px$lSxEDR9J;$U>F4>9WaujxG384Ke|}o(&HqVLAC>mqAmaHs)=EUU%vHWJY+z0W#nq9ic@~~@!PbkjIdS1=*2HN*^g)kpaWQeLunmAk^@4L8yH@^{fJW9 z!5s18?MITc9x}k13vfAtfq{YHa(Nbp7$tz{L9c)C2 P00000NkvXXu0mjf@%hNs literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Bombs/gingerbreadc4.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Bombs/gingerbreadc4.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..bf4dc7d602c06f129bb9fe8790aa80dd7d83b5a3 GIT binary patch literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|c6+)whE&XX zdrOgz$xxv6;r1AYMn|QcT&v7)u$-4YF^^&MK2CLpQ2!4xOpT5Vue+l*uQTwy`JsN* zD_{4XSrdUK071k0J?o}xcrIL<+!vEQwe-P;kGKCW{Q7N1%yDzQbLqir&3>;s|Mvbg zwQG%&M8xJ!Tb|zc;(od4+QSIYL1G|ET;PlKzx#t|OIu*DbU%as6PTPh^y||ull1JxUjJ_-1 zXEb|#Rp{^ErR;v!)jKDjp8Y6Q>Qi BWu^cC literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Bombs/gingerbreadc4.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Bombs/gingerbreadc4.rsi/meta.json new file mode 100644 index 00000000000..23a5ebed66b --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Bombs/gingerbreadc4.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by ps3moira", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "primed", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Bombs/gingerbreadc4.rsi/primed.png b/Resources/Textures/DeltaV/Objects/Weapons/Bombs/gingerbreadc4.rsi/primed.png new file mode 100644 index 0000000000000000000000000000000000000000..b4b255ded967b71c13ba71500b1a04ba225415a1 GIT binary patch literal 566 zcmV-60?GY}P)Px$@JU2LRA_3h2o}bgLEr&>DDb-I@*2#ySPe0 za1(J8>L!(r4qZeC9UM|2LaI0#hjMK$f7(lXcLBX;x#YdP`5o^i&)oq^N=pA(D^VUc zDh0%lP7hr*|nu5XEOoB=BrH>FYBsTX+#f@>f|OB=Ehv z5!D6_N`wd})g1x=MprLf_{;?$dfZP?t!#Z9ZUF!iM>|~J$6Nr@vQgA@Dpu5Vn3m0D zAaU^{n_#)toWw5An$k^>H-By-S$gJ~5Flnr6wRNR5ahn8?hvnE-`L(*pZt&Rf$%JX z41TBw1buSA*o5wlO$rVGYKX4TY z8w3Ch8g*YxhD7n1O^{r>%_c0)TXFN1l$4Z|l>VrG0VXxa_>}jDbpQYW07*qoM6N<$ Ef<$!r#{d8T literal 0 HcmV?d00001 From ddfff90fbaead9669ccd6933bfc8d65576b7d229 Mon Sep 17 00:00:00 2001 From: ps3moira <113228053+ps3moira@users.noreply.github.com> Date: Fri, 15 Dec 2023 16:26:26 -0800 Subject: [PATCH 09/12] Parented C4 and decreased Item Size --- .../DeltaV/Entities/Objects/Weapons/Bombs/gingerbreadc4.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Bombs/gingerbreadc4.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Bombs/gingerbreadc4.yml index 2d7077bd7a5..2b01baaceaf 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Bombs/gingerbreadc4.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Bombs/gingerbreadc4.yml @@ -1,7 +1,7 @@ - type: entity name: ginger-bomb man description: Used to put holes in walls for naughty children. - parent: BaseItem + parent: C4 id: GingerBreadC4 components: - type: Sprite @@ -13,7 +13,7 @@ map: ["base"] - type: Item sprite: DeltaV/Objects/Weapons/Bombs/gingerbreadc4.rsi - size: 10 + size: 5 - type: OnUseTimerTrigger delay: 10 delayOptions: [10, 30, 60, 120, 300] From 71178766cddca18c0af2697ea9368723fc7e9bf3 Mon Sep 17 00:00:00 2001 From: ps3moira <113228053+ps3moira@users.noreply.github.com> Date: Fri, 15 Dec 2023 16:43:52 -0800 Subject: [PATCH 10/12] Removed Duplicate Fields --- .../Objects/Weapons/Bombs/gingerbreadc4.yml | 42 +------------------ 1 file changed, 1 insertion(+), 41 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Bombs/gingerbreadc4.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Bombs/gingerbreadc4.yml index 2b01baaceaf..afc1ca15a62 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Bombs/gingerbreadc4.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Bombs/gingerbreadc4.yml @@ -20,44 +20,4 @@ initialBeepDelay: 0 beepSound: /Audio/Machines/Nuke/general_beep.ogg startOnStick: true - canToggleStartOnStick: true - - type: TriggerOnSignal - - type: DeviceLinkSink - ports: - - Trigger - - type: Sticky - stickDelay: 5 - unstickDelay: 5 - stickPopupStart: comp-sticky-start-stick-bomb - stickPopupSuccess: comp-sticky-success-stick-bomb - unstickPopupStart: comp-sticky-start-unstick-bomb - unstickPopupSuccess: comp-sticky-success-unstick-bomb - blacklist: # can't stick it to other items - components: - - Item - - type: Explosive # Powerful explosion in a very small radius. Doesn't break underplating. - explosionType: DemolitionCharge - totalIntensity: 60 - intensitySlope: 5 - maxIntensity: 30 - canCreateVacuum: false - - type: ExplodeOnTrigger - - type: Damageable - damageContainer: Inorganic - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 50 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - !type:ExplodeBehavior - - type: StickyVisualizer - - type: Appearance - - type: GenericVisualizer - visuals: - enum.Trigger.TriggerVisuals.VisualState: - base: - Primed: { state: primed } - Unprimed: { state: complete } + canToggleStartOnStick: true \ No newline at end of file From 18e50903ceb8ba6e29507353a4d631dfd631ee3e Mon Sep 17 00:00:00 2001 From: ps3moira <113228053+ps3moira@users.noreply.github.com> Date: Fri, 15 Dec 2023 18:40:38 -0800 Subject: [PATCH 11/12] Added Bauble Hand Grenade --- .../Objects/Weapons/Throwable/grenades.yml | 26 +++++++++++++++++ .../baublegrenade.rsi/equipped-BELT.png | Bin 0 -> 602 bytes .../Grenades/baublegrenade.rsi/icon.png | Bin 0 -> 385 bytes .../Grenades/baublegrenade.rsi/meta.json | 27 ++++++++++++++++++ .../Grenades/baublegrenade.rsi/primed.png | Bin 0 -> 915 bytes 5 files changed, 53 insertions(+) create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Throwable/grenades.yml create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Grenades/baublegrenade.rsi/equipped-BELT.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Grenades/baublegrenade.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Grenades/baublegrenade.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Grenades/baublegrenade.rsi/primed.png diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Throwable/grenades.yml new file mode 100644 index 00000000000..9bfed7e0d5c --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Throwable/grenades.yml @@ -0,0 +1,26 @@ +- type: entity + name: bauble grenade + description: A nice little trinket to hang on the tree, or throw at your enemies. + parent: ExGrenade + id: BaubleGrenade + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Grenades/baublegrenade.rsi + layers: + - state: icon + map: ["base"] + - type: Item + sprite: DeltaV/Objects/Weapons/Grenades/baublegrenade.rsi + size: 5 + - type: OnUseTimerTrigger + delayOptions: [10, 30, 60, 120, 300] + initialBeepDelay: 0 + beepSound: /Audio/Effects/Footsteps/jesterstep2.ogg + beepInterval: .5 # 2 beeps total (at 0 and 2) + - type: Appearance + - type: GenericVisualizer + visuals: + enum.Trigger.TriggerVisuals.VisualState: + base: + Primed: { state: primed } + Unprimed: { state: complete } \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Grenades/baublegrenade.rsi/equipped-BELT.png b/Resources/Textures/DeltaV/Objects/Weapons/Grenades/baublegrenade.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..89b60bba1b784d4e68a27de1a660663fb64b0b17 GIT binary patch literal 602 zcmV-g0;T9=|KLcrbIX7F)6Ct z|K{nW#zwvFEg@)la^1H+2<$+)e;v4ddu3>K<`sIG>@;4+HXd146 zt;zrZ0H;YrK~#90?b@LY!ax`W;2(lPqPqe?f#?9;qZ5#u1&ye{umuhalXQflvGBLh z-|tw)uQXVk8@^w0a;st ow0*$TvbF-VeF3%t008in7pTTD)^fIgL;wH)07*qoM6N<$f}iRc@Bjb+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Grenades/baublegrenade.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Grenades/baublegrenade.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b6639ce1679f9b210072ff7eade5b1b6a6e2cf4d GIT binary patch literal 385 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<)}AhoArY;~ z2@ z-oB(8`=(8|>lGt!Y_{gi@@2u53 z%%;B(Xi&8|ZR5xW!p}ST3U;2+@?$&y;5^UF&^bIH@cY!(PCibtB+(+x*TxagVq4Vh zDx?w|dO?Z;zJ)G2qpHb!;E}AjLm9`$h79(a-PIEl^ZzkgNZSe?dhs&%e&8uKr-nB! z88g*S95~RR(J?_-NwagplS$mR>M=hKH7facJ>}s^nZkTgT<^h_hLF?l2Q`2pl_0_c a3}SiBx*ol*+mC@^%HZkh=d#Wzp$Pze_ncP% literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Grenades/baublegrenade.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Grenades/baublegrenade.rsi/meta.json new file mode 100644 index 00000000000..fcd51cc7972 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Grenades/baublegrenade.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by ps3moira", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "primed", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Grenades/baublegrenade.rsi/primed.png b/Resources/Textures/DeltaV/Objects/Weapons/Grenades/baublegrenade.rsi/primed.png new file mode 100644 index 0000000000000000000000000000000000000000..8856e5c11ef2c520de9c92ed55ff44c055bcc8e5 GIT binary patch literal 915 zcmV;E18n?>P)8*Zo??#@}85Jh#7P93r6sT zAZ>(*5K1c79-EqqQ*(XZQK#!|zwTB0-oLA5*>n}uH3<(Z+wp{D8se*-t$9nhLuHc7 z!iU09M+OwW(t4`Q&zjR^e%I{GB*r12dm8CqochHo0Xz25 zjQ{`v;Ymb6RA_g;p&`LrqNr#HYP^FCgf65lg9;QIZOHfZO!3~=I~{yKi!Z)+@8^Bq_kEuC01k)4 zVI+T9Xyh*ojj{B%i$^gDr~H%7OlOQ4WePaqALs-epPe*5zpH}`F%VApCssnTwz*gaEWY zMA{4CFp8k8_$~hSLP%2tsVCZb6L|ERrQfaK37t2AR-3Z)(*zGNd Date: Sat, 16 Dec 2023 15:12:50 -0800 Subject: [PATCH 12/12] Added Candy Cane themed Sub Machine Gun --- .../Objects/Weapons/Guns/SMGs/smgs.yml | 16 ++++++ .../Clothing/Head/Hats/elfhat.rsi/meta.json | 4 +- .../Guns/SMGs/candycanec20.rsi/base.png | Bin 0 -> 624 bytes .../Guns/SMGs/candycanec20.rsi/bolt-open.png | Bin 0 -> 627 bytes .../candycanec20.rsi/equipped-BACKPACK.png | Bin 0 -> 1081 bytes .../Guns/SMGs/candycanec20.rsi/icon.png | Bin 0 -> 714 bytes .../SMGs/candycanec20.rsi/inhand-left.png | Bin 0 -> 691 bytes .../SMGs/candycanec20.rsi/inhand-right.png | Bin 0 -> 699 bytes .../Guns/SMGs/candycanec20.rsi/mag-0.png | Bin 0 -> 221 bytes .../Guns/SMGs/candycanec20.rsi/mag-1.png | Bin 0 -> 223 bytes .../Guns/SMGs/candycanec20.rsi/mag-2.png | Bin 0 -> 237 bytes .../Guns/SMGs/candycanec20.rsi/mag-3.png | Bin 0 -> 240 bytes .../Guns/SMGs/candycanec20.rsi/mag-4.png | Bin 0 -> 224 bytes .../Guns/SMGs/candycanec20.rsi/mag-5.png | Bin 0 -> 209 bytes .../Guns/SMGs/candycanec20.rsi/meta.json | 53 ++++++++++++++++++ .../Guns/SMGs/candycanec20.rsi/suppressor.png | Bin 0 -> 180 bytes 16 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/base.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/bolt-open.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/mag-0.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/mag-1.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/mag-2.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/mag-3.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/mag-4.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/mag-5.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/suppressor.png diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index e9122ff47fb..bcc20297596 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -45,3 +45,19 @@ steps: 1 zeroVisible: true - type: Appearance + +- type: entity + name: CC-20 sub machine gun + parent: WeaponSubMachineGunC20r + id: WeaponSubMachineGunCandyCaneC20r + description: Spread some holiday cheer with the "Candy-Cane-20" sub machine gun. Uses .35 auto ammo. + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/elfhat.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Head/Hats/elfhat.rsi/meta.json index 9c018ea80c7..a27bab79bd2 100644 --- a/Resources/Textures/DeltaV/Clothing/Head/Hats/elfhat.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/Head/Hats/elfhat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC0-1.0", - "copyright": "Original work by ps3moira.", + "license": "CC-BY-SA-3.0", + "copyright": "Made by ps3moira", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/base.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..2317fb3c7006696ac7c7835785c4a9932d1bd78b GIT binary patch literal 624 zcmV-$0+0QPP)Px%DoI2^R9J=Wlrd`)VHn4MM_$8S$q8>MB-~KY45oDmG*erUY(lpV!EeyT!L3f2 zf=f3C7r%i7>0~E|P!Q?h6~Wek4VFSf0;Ml_Aqnxy>(JiW%hkpf2Z#Gj&-2`S&;S2$ z&%Kb4kdSZ-<||UqSET+Iy~J%_TwYlK+=z+&x-xFs#{gJZo6!L7>ywEM<||U0GDRkv z2B6m+k;$fcaDR>uTW;iRVCYfR(c87QvGQtGZ#_MVXc!A?GdfqC0-*H52Vl-L`8pg% z;l`8 zlCQhEzqEwc*=2owU2kk`L`=kXKnlV4(FiHd9|iGHopId%#+Nsz0L&Cja>c1@bAUW> zaB#rD`+;rm#Y~0FOE`FFo8670|<1VFF*ll{6f+-nYAn9|Skc>oO%h;J%I*|sTIR#<=8YW-=D2sggD zDpCd}Lh*oADVd#~{%di##Z_Ea%AnQKk^DEB_>LqbBqSvK-~0kr(E5XBWaA?M0000< KMNUMnLSTYN!6G35 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/bolt-open.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/bolt-open.png new file mode 100644 index 0000000000000000000000000000000000000000..fc071fdd2a51b8a7ff74871f1ac2af38c2e4f3e6 GIT binary patch literal 627 zcmV-(0*w8MP)Px%ElET{R9J=Wl(B0QaTLctM}CG}$rXN~kZ?m#JDA2HkS?}`noa4}A-FhqaS&Xb zG6k1xf-Zu8fCTAeCx=iFaqx;@t6&15(2#)i#0!@gBR>awr`M}VTO1tjGu`{~?tQu3PQjX4EiJ^4JfK)x(hLdHm@ z;{fz~Ba-PjS1vE`YRd}bdWKdjrrNG{w6(`swRLAdprI8v=2WII1Hj^gF#rpR1e>-E zz`B%t7!G;9GML&;LdN{>#iasoU%&I4I!PQr%dRHX#p|;Gq#q3^83ql<2_%&agQquL z7MBWBO&sUTJqvev8K=0zwQskn)oK9~p&gJyur6h&(9r(Df%}Q~&kg~Y%O%JZW+uh} z^FXuNWZ-Eepx+zO9gneGH)NpUIOKGl(i`E&9woyFogHU?yRUW4Syk0n z86l8DuxZ=W?Z9KnQ(U)gjaEwq;@>F3I}#BQ5fSl!^Ajr(?(JS>pk4p~ N002ovPDHLkV1o1pA1VL< literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/equipped-BACKPACK.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..3d3ae985add6bdc0eef760e8e29ce471de1251c8 GIT binary patch literal 1081 zcmV-91jhS`P)Px&^GQTORCt{2nonrkRvgE_o{h0fGI*gR&3eGNrI6bVe zlXodJu)9w^6?R#{#}W!z4@sbxT}Ccu6m}5_6l&RB-E|%a0>gsIxWTmicJQ8~WLUCd zOKr0Exmi5veSd%S)ARd1Kq8SyBoc|_6!7TcMFN1r+9C~lPsl$x!IEc;0HA&C8m!bV zZa$3QcBA2H-^d&=ec?O-z^gz0^v$Vr`L2{R#il!QQsX9V`1!@Z+q9zCgMHg0btWK2iEYxD1@yilhnR*2OC$ejN);9 zscf1dVSJ2*F`r8z#=^M%;9$&GjCp$I(9sf+e^IYvZg$r9nlhJX6k}nGO-0e#>tN}p zD1dJC6Y;p`EEp;S?2-4|__;hIQQfb8cKML;v#}Te;I3hWR#ny0D-b!ZAbaF*1rYge z;oIpIJi)ohfe9r=p#@Fzq~%z`*ON&~aE_{B;MTKefqqIeMNT66BJFQ*jvwlEPmvdR z&VZmJZ>OXv#D0uG-#@7Mf`5x2d3A!P8lYvfw6na7r%OwL6g)d6MIit%-@NIi{c$3G z6i*qj{JaVPc(ol|+KX@h<=-a}Zndz}Zli2jy@&&Vc<;q(@YInha#Av5^lKtPA`^ho z7x2`9-4POrL?V$$Boc{4B9Zt=rpU=l$Ms!PSX-n_ zkq@NTbyKvYD73dR4r41eyt05Wwqn@Z7>9lPtRJopxHsLzie=$zU3VM$-e9G6v0_;$ zTbAosM+Y3;eGxmf?=wd=x^0{~I^a<|fp1=XI0{|9GkxJarM^9T$k;?Yj#X84ywA}A zjb;;f4I=~q-+%EpzWk^#v`{~&=sG?Bt&Zl;am?pZXzg_XbepA(X4COrM+ZDM&EB~i zb@MGg+1f&p_ph$&$z8`)i99Y9O>=tK)N+QH3X~Od{xzp$bi9{liNF)-;|B-(H(P7JRc(v(L00000NkvXXu0mjfeJ>4Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..913dedf43d3c0f63bfe2fb92268e07a9417cc3b5 GIT binary patch literal 714 zcmV;*0yX`KP)Px%gh@m}R9J=Wl|N_`VHk&>m@_0LSNuvL;fA1|U|NSrGqr`7K`3 zdp{05JUl%9f$@xx;~62(<1Xc24^Gcc00ozct(@We+k1Qf6Z4}Ipzz|L?*-!-A%ntC zI1&J$UbP5E0$jg3#;4VSYp-o6mDS|hQrS2AEGAbU?71|26Z4}oniv8g`J@HFSTM+T zv+0UoPn&(S2@1axCnpnp`~2NWs+Tx`a!_nK*%VEaw5oC?5Wr})&De2J_(@JC`kFXR zax#IQE6B#w6t&6*i;IhLd3o7oqN@jlqVUVI5K4Q=j+@3Y`;DLccy$QCXgo+XF?8k_ zKnHeqb}(y4sOn~yNyk9FYH{Zz`%Vgt1~=ZrCN;v5ivTo@V@mn6$2MkUpGTz;DyRlDXo*;}joD%!AIDwn%^pmUPx%ZAnByRCt{2+A(X}Koke?ziZi8pcpO)WHe|N_8{ogDGjt)+O8sFrgZU|F`oJv zJeSN_+b;3atr;@5_RuLqVnINQz=tYv9mJ`Q4VEmQXj9&AlVzRmy?fZhdjKJX5JCtc zgb?yi>-$XfeI`_{`Ap?vl5=1v-6W6&-(gL3SQ9FfpgaL%#}Po5gy-+g$|tt^-0*r2 zJWK&VX%cFw0K;m*uv*|@T4}TLv{wx#01wkV5h^H8z&uHCe#2n8I!ss3ldz2rYpw-3 zPZE58jeM;imtjN2eru_KDd#x8&=3W2o`h}iFoo&r`Sr-Q1&{@ASZ$?yRg%SJK4aoC z%uZ)y+v4-P7>3ox!)#IN)cQUXrmG_gV!Zv-#)rGRhFn*EN3O3zEfwH1CVa+3Pt$NV z=^_eZ?B5UalRW+S>d|k4ydK%M*uNhj3Syj1y69-41w|D(m7d zlkM||83&LxRfe~Jx=lPx5e2_sSgpdflvlv6vjIh9@H|ZOcdZ&;@8RTUw^Z_#Ct%mv zfFd$@`Hu4&hIx|Y_s5PSm{z{9l_y}=*?=N4_$Y{Re4$~=`J?;uB*B#P(oNOcIPx%bxA})RCt{2+A(k1Koke?zmp3B$wj&d3FN^ug27U!PAO8GrR{2E?36B9GlnTs zKLB%;nYHZ_mTv8kv4Npe2Lcl6El8Y@t;~8 z$n&z>afWWY!T^5n`TI+R_9=xAT_I5-6QF~ij^{YJV(3em<(@aftQLYm+m;nP@k+e} zDg2e|jO7Cjmn$9o>yHIo4u=K+xSXr55TWby!sUO;T<^1OS?bf9Im~JSlff*gmPLC2 zaQfke(hCmnnwXB~IPaBFV+=0mYVqcI)fK|ff$Kfj7{ht5jOloe!@Fis89H8Ip#olY zY-N6V26cUndZ~mOV;Ff}PyxHBZCOgkF__I@93Nx){3|}6{S3#{v2EozPVS#{QZ0Zj zA9EZ><@N8J5JCtcgb+dqA%qY@@@1XY^Dao#9$)Oh{%>Lv@KEsEo*UT2?}eHNQ6>W! zYLRzrTfN6G*hi+S)Qgb9kL=Q1P9bZF5^y;j8ht54!v}pSadO2l9nWL?@ax#d zoWk1g?BcvYl0JM|tL7B4miQHjlBN%z#J`wR$Rw+&`tUJ!Zcd>E6qk=ZrVqbrPN4;u h>)ekJLI@#bm3wHiHIrg$?|}dS002ovPDHLkV1kPbL5%+}rLn2y} z6C_v{Cy4Yk1sZU<9n_FWIMCsHVO`j(|Ffmst*^eqK$wz{LkC6~&LO&&o7jcBrysTA%o(fJNBuqU2n2M_x5^z+p&^lVaj!IAZ=2I7JQ1_mj18&7l7gjS#v O89ZJ6T-G@yGywo_YEWbV literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/mag-1.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..0ebcc01905ce0bfd6096c8561950373e62f502fa GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Gd*1#Ln2y} z6C_v{Cy4Yk1sZU<9n_HMIj}D5)&H%pumAu5>+9?NVJjZgFE*L@f6JzB!PyJu$eyof zt+s13H{WO6kx^i@XXnScjm{HhKD@KWJmPBbUB)jZEOCclJmgTTnbgl$n^;ruLHJHl zw!Si(T%j48rM29urJRdun7BFF*x1_G+3gK&tiH6q%52nd54ijs;tB?4hP5Jg$Bwo) Rx&s}_;OXk;vd$@?2>?xYRKx%P literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/mag-2.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..d02d471945d800e43d391a0f3ba7b20dd8bb0b9b GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}%ROBjLn2y} z6C_v{Cy4Yk1sZU<9n_HMIj}D5)&H%pumAu5>+9?NVJjZgFE*L@f6JzB!PyJu$eyof zt+s31Qrg5L6%@o%$doQ&!7@|w+}Wz;P}{4r4R1Qk&G#91WE2?f+4*s4B# g^{WQrq67wp=dISqP71to20EF+)78&qol`;+0HZ%&Q~&?~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/mag-3.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/mag-3.png new file mode 100644 index 0000000000000000000000000000000000000000..b85d54a74abef50014cb6f613c907bc6de0c2edd GIT binary patch literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}t2|vCLn2y} z6C_v{Cy4Yk1sZU<9n_HMIj}D5)&H%pumAu5>+9?NVJjZgFE*L@f6JzB!PyJu$eyof zt+s31Qrg5L6%@o%$doQ&!7@|w+}Wz;P+Q*ykbG4OOPu^cr$=Xd-}5L*&Ed(+9?NVJjZgFE*L@f6JzB!PyJu$eyof zt+s31Qrg5L6%@o%$doQ&!7@|w+}Wz;P+Q*ykbG4OOPu^gWfcx7mf|C`rSD6w+1n$L zcW?K(4-X!wx4F0P3pgt1BFR+D!pzJZs;ka<;^xOc(>Fg}7?}rgNDKo*i@CkoghjW` Q0$s`A>FVdQ&MBb@0I{c47XSbN literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/mag-5.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/mag-5.png new file mode 100644 index 0000000000000000000000000000000000000000..76262a3672f55534b1c58338d9ff4486c229f059 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}-JULvArY;~ z2@i^c)*Z=?j_4W1suoVyL7n@A{zhzUm;Oqr+WY5>L zR@=30DQ)7B3JT&WWJ;H?V3{d-?rc?asI6}UNWQ9tB~G6A)PxPIr~cAUKkmGBg2E~F z4HFW8prYV|@ZrVI@h`-gPV_BUcHSLmAM0WUHim{14$@j2VKqQ!F?hQAxvXZSC#tBO@avB_$0E47wWr3jyUgN`m}?8U91S z)l(rxKruy67srr_ImrnU%NhbtdI-8UoK!u+>Du7CA)sfTp421;hLAMIk1A)jOav-s N@O1TaS?83{1OQB>F>3$- literal 0 HcmV?d00001