From 0ec6913677d64428362fe2b6ed497a640e1764cd Mon Sep 17 00:00:00 2001 From: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Date: Sat, 16 Nov 2024 18:51:52 -0500 Subject: [PATCH 1/3] meow --- .../equipped-INNERCLOTHING.png | Bin 0 -> 1504 bytes .../Jumpsuit/cybersunattorney.rsi/icon.png | Bin 0 -> 496 bytes .../cybersunattorney.rsi/inhand-left.png | Bin 0 -> 597 bytes .../cybersunattorney.rsi/inhand-right.png | Bin 0 -> 586 bytes .../Jumpsuit/cybersunattorney.rsi/meta.json | 26 ++++++++++++++++++ 5 files changed, 26 insertions(+) create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..d87ce6f08e21457e5a2ed5b7c3aa3ec2a30a459b GIT binary patch literal 1504 zcmV<61t0o}P)Px)fJsC_RCt{2nr}!OXB@}BF%^{5OI#!_Zt)Kho<99UUE=Q;XrlPi`olbZDUW#5t6%D_2ct6jeDO zTk%Smq6VrMpf)}0lsv_GVDlYOMH&c{NO6!U5iDZw3JLhXVkY zcF<^saO~iB1?v}NfN=2wUfzPQ*c~`23d<}DFKfy3wD!9e16A?Du+ufAlG?v$(Ei$l3x{mnOt`dMl`MxFqMSE=`CgoU|1P z`qNXB*x#800Ic_b##zHZ$moDS)kG=$Z=`zMbF~qs3s4tjR2zd>- z@?sMMB_nv`GD+fs+Z}!XO7;aFxl9-+8Nrno(l{x(^Z{Tj6vOYc>tgeltDkoic@ZelGK<^aw9xoD>N*m?UDjb3@*ceT(ehfu&_FMS0K-+9{I&RYS%(470k~bq z{b!PYglOX`sWkpWdUhxp1V-1WM~cJcXV!hsVNQ;5EavWt3gE(%v`m$=Qb zVd9*!z6Rr56p6hUR+lDF|Co1e8WMKRW(rfYt?Q zjc$O}1!#?KfYt?QjjZ>8%moSp-&eL2<-_RfZU2!eFS&~(hz(%E0lwd82I7E;vg2+t z1OV7gCP`DB2w{D~En`jU&rqWoAY2;&$XFqgKJ&WbAI2>zRlv0*haPU6m%CJ@PxgS0!rfbrx8F%^N7feb^tYc3PXSz|Q!%@{jc8epqL0AcbE8V8D~g6<25c{BCS|HVgug&_)|W8JFyp2w4g%SSfr8Iiyf(lG!OA|`FVPfuWM`v zb+$%~G0d_!TTEJj9OmgkzQ*B!)#?;u?8}g3HCraRR;v@Y0AU#%`!e+nQ0$8rY6t~= zV3=h9$6tItPW|VwZh+PWXw8WyMnVVE;#v?2`Xn7;K5}*TvJFU|lP_imn65cb5Awd5 zUyCiRqw^~9A1?H7X-F@uVgLXD4rN$LW=%~1DgXcg2mk;800000(o>TF0000cG3mysu3e4y+$Wwk$vS$I zYsJ006$~Ofdu~l}*;isx7n|#)Q6wp0otVbNVCCPxXywkXx83JgN+`@cd3)2gTydSB zOi3>aS1Gm4uH0?0NwMc!ZP@9K_lGq5SY|kX50hV(q#p54c-EefyradMoBNFf|93TH z=$t+DXw!{Kqsi$DzW=PKUwn7fzcmf{>Jk?tq9V?TT+Iv3wLWn4=+pQQtU|hze;$9I kb^{nue5nzhX}-P;T0k}j5QD&_;K?A$)78&qol`;+039XLNdN!< literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..018c6b3199c44ab902fe98b2517ca145266115c8 GIT binary patch literal 597 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zzk0ejhE&XX zdvl{VQ=km{hxHdl3M1Se1vs@Ta&ZPl_h)2vNHxFE-=WH}Xs_<9n3$Nw8!b7MqMD+* zx;TtF+9nyjT9HxBTXcM8)bf8meEa5m-hX-h`1`$|5B_CPf`P0Mm5G<^j~98pd>64R z>5uu{ja$xXhJKuz_4Dkj30z$&K~`2qfnTGH=6$pI>7lfA^2d^^*%v2repKoZJuq#~ zoMN>Z!CvVl8y3##;XAaK`_9fuR;o^KuD+M=dHDCKpykpp8xj@rBQ4_j6YJE|>O<^f z=CSR0#&F=@n>FX6#f+q0$bXp@%s+8Lj@jz+^>%Z=Z(rUX!M8_gakGS%W_pd_}RMTF*G(Vs$gTwP*yvB94^Ve$)?ZhNtO)0KW(e7BtcCcnh`#J=6E zAo4b&*-E}m@5>ryyRhH9&N|_R!tY%S4xeRH?#njky-^Sj+`NzR6q|xN8zaw2U~1q? ejqptK^<~fkvN?bl1TFDpXFs2Ov*vWn zgdI<{xfK_`Y%(hEzdikl5$pA%hgY6FAf`C;?CFPBmb~5=vuwecyFm=mfyW-$a2ExC zZoE@roPKVTz$T64-0SUgnRj^r>E8!~4tyy?Rdwl->hbj;h;_1m(p9>|q@p|}0D+oYR&=FEs}3tj!_iwfvR^RZZ;PK?kaqq9Ua+l{(CsXfoDG}4qLqV^DIn^ z;m5jXHSZUi?caCS|J{aH2i{&4WJuWmNy00wd}{?8!!tHY&45XOFEzq5&DWPf3&`dG UVi33#JQ+lJy85}Sb4q9e0BBSd;s5{u literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi/meta.json new file mode 100644 index 00000000000..e0f7bbd7d96 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by JustanOrange", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 6305edd60b3801e8ea3a373052fe873b3568994c Mon Sep 17 00:00:00 2001 From: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Date: Mon, 18 Nov 2024 10:11:34 -0500 Subject: [PATCH 2/3] meow --- Resources/Changelog/DeltaVChangelog.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 7529c355db4..e8a849abdc4 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -3739,3 +3739,10 @@ id: 683 time: '2024-11-18T02:08:58.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2214 +- author: Lyndomen, SleepyApril + changes: + - message: Normal kill targets now just need to be killed once- but it needs to teach them a lesson that will be remembered + type: Tweak + id: 683 + time: '2024-11-19T02:08:58.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2184 From e5aa95aaf3ce1b74bbb2b6ef754f6b675beb0764 Mon Sep 17 00:00:00 2001 From: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Date: Mon, 18 Nov 2024 10:28:48 -0500 Subject: [PATCH 3/3] Update DeltaVChangelog.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> --- Resources/Changelog/DeltaVChangelog.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index e8a849abdc4..7529c355db4 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -3739,10 +3739,3 @@ id: 683 time: '2024-11-18T02:08:58.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2214 -- author: Lyndomen, SleepyApril - changes: - - message: Normal kill targets now just need to be killed once- but it needs to teach them a lesson that will be remembered - type: Tweak - id: 683 - time: '2024-11-19T02:08:58.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/2184