From 3b6ab67a8b196395054e9cdca76883dafb3edf71 Mon Sep 17 00:00:00 2001 From: Milon Date: Thu, 7 Nov 2024 04:06:34 +0100 Subject: [PATCH 1/3] hell --- .../Objects/Weapons/Guns/Shotguns/shotguns.yml | 1 + .../Weapons/Guns/Shotguns/enforcer.rsi/meta.json | 10 +++++++++- .../Shotguns/enforcer.rsi/wielded-inhand-left.png | Bin 0 -> 832 bytes .../enforcer.rsi/wielded-inhand-right.png | Bin 0 -> 822 bytes .../Weapons/Guns/Rifles/carbine.rsi/meta.json | 10 +++++++++- .../Rifles/carbine.rsi/wielded-inhand-left.png | Bin 0 -> 832 bytes .../Rifles/carbine.rsi/wielded-inhand-right.png | Bin 0 -> 822 bytes 7 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-right.png diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 862d3369ae6..04794709892 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -10,6 +10,7 @@ sprite: DeltaV/Objects/Weapons/Guns/Shotguns/Adjutant.rsi - type: Item size: Large + sprite: Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi # it just looks good - type: GunRequiresWield - type: Gun fireRate: 1.5 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json index 3df5f2ca034..424cc69c69a 100644 --- a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/27557/commits, backpack sprite by Peptide (copy of bulldog), backpack sling sprite edited by Boaz1111", + "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/27557/commits, backpack sprite by Peptide (copy of bulldog), backpack sling sprite edited by Boaz1111, wielded sprites Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41393/commits/1e56473177d0994d163c9edca3d13d6e5b640cc4, https://github.com/tgstation/tgstation/tree/master/icons/obj/weapons/guns edited by RiceMar1244", "size": { "x": 32, "y": 32 @@ -28,6 +28,14 @@ { "name": "equipped-SUITSTORAGE", "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi/wielded-inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..42926b00f4705985591abade8f839204c0ee50f7 GIT binary patch literal 832 zcmV-G1Hb%~?IK-kY zl?x(T48aBs*CCZE$@+7$>@*?oZxQJ3z324aAA{cqAP9mW2!bF8f_R3k6*V%(Bmn5T zj@#SY(x>Nnh2uRmj4@d@r`$%ynB3Xf!FW8z)zwvQzka_j+wC?0z;PTnj`L`eV49}1 zEUR!~avM13GOsNNf?Uz{_4Py&j`sH?0DS)PRXH(XOh}d3G@Ntkx^8a#%k&G=G$jDI zKfmMfU>7H67jsYkO29CTC}uPo!F62>1_K-)A1B7^^`d@KMw)<0NAz-t=T|)WmPFV0t=t5@E0OZRubZOiE0AU@3dwE+gqEp?t-Nwx*d76zbA_> z%cr0-cL%5-x*fT_wVBygw&ki~U*D`v?xrhEa%DufBj3M!yYkh4)I95tCkTQd2!bF8 zf*=TjAP9nZs#N;_o-rniJOV{!^g8tWeYq-4<-$l<3Jbjep|Gy&QrC5~+ilEdGr4Sk z0Anoj9{~5|H_!7TUqW3?-xKx;!oST$NkEiX$q?N3P8B*PN>hmW61^-Fhv5JGa! z0c3jy2CokQ{PPI-zK_F$-7s9q6Oe~#nlfASO+wT2yhL2DXGEp^GD;ILnM@)tK$d6V z^71n3%Q*+>&7*+sG_}4c|1;d>3thI(PS5Ob1b5nrs|G+QD-7qK7ofYOvE+o z>eWgBaDU^*SKoErwN~9`T6<- z(5O`f0Q~v;FI+cGQ;f&s#1jws4r1Is|?F!OB#jq$=c1E&T2Ke)tH?+AN#O%i8h70})K7;G6>hI-L&Y z`J)Vg{H`+4bzRKPz4cC=g+{F^`hy{Y$uzc>XHSX27!!?JRq(@uSU}#Btk?A^%ZXL< z`+K|Cv>;r&cSy5g=7upQPEU?EE(_L5Qf3eYK@bE%5ClOG1VIo4K@b~A?*Gm!m5NB} z5tvs#e=E(=Xq2f^mAWvZ!Zb}`7)I!<6fTuYFbqRkM$1c76L>DmwcG72sR^jdcS)p* z)al8waNTaK#y%^g>JeB)Jx8UKgD6h1#+H02N8KbycrGp5B0Y+Wo;0 zwrvAIYR!2WB1x4d^LhrNy#hfH#BB3E0xIoAnpt#HWdHzWyzetqiZDPhhqZy$a1-0g!j++Pzc0 zC00r2<~Gd0b!leeJ^BO~V;{RYgCGckAc$Q22dz!Eul~=KA^-pY07*qoM6N<$f{pTo Ap#T5? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json index cac6899c489..18730c2761d 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Polaris at https://github.com/PolarisSS13/Polaris/commit/ff87150c3dfc387c46db7d1c956abf19ddff7819, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111", + "copyright": "Taken from Polaris at https://github.com/PolarisSS13/Polaris/commit/ff87150c3dfc387c46db7d1c956abf19ddff7819, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wielded sprites Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41393/commits/1e56473177d0994d163c9edca3d13d6e5b640cc4, https://github.com/tgstation/tgstation/tree/master/icons/obj/weapons/guns edited by RiceMar1244", "size": { "x": 32, "y": 32 @@ -34,6 +34,14 @@ { "name": "equipped-SUITSTORAGE", "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..42926b00f4705985591abade8f839204c0ee50f7 GIT binary patch literal 832 zcmV-G1Hb%~?IK-kY zl?x(T48aBs*CCZE$@+7$>@*?oZxQJ3z324aAA{cqAP9mW2!bF8f_R3k6*V%(Bmn5T zj@#SY(x>Nnh2uRmj4@d@r`$%ynB3Xf!FW8z)zwvQzka_j+wC?0z;PTnj`L`eV49}1 zEUR!~avM13GOsNNf?Uz{_4Py&j`sH?0DS)PRXH(XOh}d3G@Ntkx^8a#%k&G=G$jDI zKfmMfU>7H67jsYkO29CTC}uPo!F62>1_K-)A1B7^^`d@KMw)<0NAz-t=T|)WmPFV0t=t5@E0OZRubZOiE0AU@3dwE+gqEp?t-Nwx*d76zbA_> z%cr0-cL%5-x*fT_wVBygw&ki~U*D`v?xrhEa%DufBj3M!yYkh4)I95tCkTQd2!bF8 zf*=TjAP9nZs#N;_o-rniJOV{!^g8tWeYq-4<-$l<3Jbjep|Gy&QrC5~+ilEdGr4Sk z0Anoj9{~5|H_!7TUqW3?-xKx;!oST$NkEiX$q?N3P8B*PN>hmW61^-Fhv5JGa! z0c3jy2CokQ{PPI-zK_F$-7s9q6Oe~#nlfASO+wT2yhL2DXGEp^GD;ILnM@)tK$d6V z^71n3%Q*+>&7*+sG_}4c|1;d>3thI(PS5Ob1b5nrs|G+QD-7qK7ofYOvE+o z>eWgBaDU^*SKoErwN~9`T6<- z(5O`f0Q~v;FI+cGQ;f&s#1jws4r1Is|?F!OB#jq$=c1E&T2Ke)tH?+AN#O%i8h70})K7;G6>hI-L&Y z`J)Vg{H`+4bzRKPz4cC=g+{F^`hy{Y$uzc>XHSX27!!?JRq(@uSU}#Btk?A^%ZXL< z`+K|Cv>;r&cSy5g=7upQPEU?EE(_L5Qf3eYK@bE%5ClOG1VIo4K@b~A?*Gm!m5NB} z5tvs#e=E(=Xq2f^mAWvZ!Zb}`7)I!<6fTuYFbqRkM$1c76L>DmwcG72sR^jdcS)p* z)al8waNTaK#y%^g>JeB)Jx8UKgD6h1#+H02N8KbycrGp5B0Y+Wo;0 zwrvAIYR!2WB1x4d^LhrNy#hfH#BB3E0xIoAnpt#HWdHzWyzetqiZDPhhqZy$a1-0g!j++Pzc0 zC00r2<~Gd0b!leeJ^BO~V;{RYgCGckAc$Q22dz!Eul~=KA^-pY07*qoM6N<$f{pTo Ap#T5? literal 0 HcmV?d00001 From ceaa452530265d82fda0f82addc28c383c8ba16c Mon Sep 17 00:00:00 2001 From: Milon Date: Thu, 7 Nov 2024 04:11:29 +0100 Subject: [PATCH 2/3] why the fuck do i even bother --- .../Guns/Rifles/carbinenogl.rsi/meta.json | 58 ++++++++++-------- .../carbinenogl.rsi/wielded-inhand-left.png | Bin 0 -> 832 bytes .../carbinenogl.rsi/wielded-inhand-right.png | Bin 0 -> 822 bytes 3 files changed, 33 insertions(+), 25 deletions(-) create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/wielded-inhand-right.png diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/meta.json index 013ebbce3f2..b57507c99c6 100644 --- a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/meta.json @@ -1,35 +1,43 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Polaris at https://github.com/PolarisSS13/Polaris/commit/ff87150c3dfc387c46db7d1c956abf19ddff7819, backpack sprite by Peptide. Modified by TJohnson.", + "copyright": "Taken from Polaris at https://github.com/PolarisSS13/Polaris/commit/ff87150c3dfc387c46db7d1c956abf19ddff7819, backpack sprite by Peptide. Modified by TJohnson. Wielded sprites Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41393/commits/1e56473177d0994d163c9edca3d13d6e5b640cc4, https://github.com/tgstation/tgstation/tree/master/icons/obj/weapons/guns edited by RiceMar1244", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-0" - }, - { - "name": "bolt-open" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-BACKPACK", - "directions": 4 - } + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } ] } diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/wielded-inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..42926b00f4705985591abade8f839204c0ee50f7 GIT binary patch literal 832 zcmV-G1Hb%~?IK-kY zl?x(T48aBs*CCZE$@+7$>@*?oZxQJ3z324aAA{cqAP9mW2!bF8f_R3k6*V%(Bmn5T zj@#SY(x>Nnh2uRmj4@d@r`$%ynB3Xf!FW8z)zwvQzka_j+wC?0z;PTnj`L`eV49}1 zEUR!~avM13GOsNNf?Uz{_4Py&j`sH?0DS)PRXH(XOh}d3G@Ntkx^8a#%k&G=G$jDI zKfmMfU>7H67jsYkO29CTC}uPo!F62>1_K-)A1B7^^`d@KMw)<0NAz-t=T|)WmPFV0t=t5@E0OZRubZOiE0AU@3dwE+gqEp?t-Nwx*d76zbA_> z%cr0-cL%5-x*fT_wVBygw&ki~U*D`v?xrhEa%DufBj3M!yYkh4)I95tCkTQd2!bF8 zf*=TjAP9nZs#N;_o-rniJOV{!^g8tWeYq-4<-$l<3Jbjep|Gy&QrC5~+ilEdGr4Sk z0Anoj9{~5|H_!7TUqW3?-xKx;!oST$NkEiX$q?N3P8B*PN>hmW61^-Fhv5JGa! z0c3jy2CokQ{PPI-zK_F$-7s9q6Oe~#nlfASO+wT2yhL2DXGEp^GD;ILnM@)tK$d6V z^71n3%Q*+>&7*+sG_}4c|1;d>3thI(PS5Ob1b5nrs|G+QD-7qK7ofYOvE+o z>eWgBaDU^*SKoErwN~9`T6<- z(5O`f0Q~v;FI+cGQ;f&s#1jws4r1Is|?F!OB#jq$=c1E&T2Ke)tH?+AN#O%i8h70})K7;G6>hI-L&Y z`J)Vg{H`+4bzRKPz4cC=g+{F^`hy{Y$uzc>XHSX27!!?JRq(@uSU}#Btk?A^%ZXL< z`+K|Cv>;r&cSy5g=7upQPEU?EE(_L5Qf3eYK@bE%5ClOG1VIo4K@b~A?*Gm!m5NB} z5tvs#e=E(=Xq2f^mAWvZ!Zb}`7)I!<6fTuYFbqRkM$1c76L>DmwcG72sR^jdcS)p* z)al8waNTaK#y%^g>JeB)Jx8UKgD6h1#+H02N8KbycrGp5B0Y+Wo;0 zwrvAIYR!2WB1x4d^LhrNy#hfH#BB3E0xIoAnpt#HWdHzWyzetqiZDPhhqZy$a1-0g!j++Pzc0 zC00r2<~Gd0b!leeJ^BO~V;{RYgCGckAc$Q22dz!Eul~=KA^-pY07*qoM6N<$f{pTo Ap#T5? literal 0 HcmV?d00001 From f691bee7dcb841e71f178a1a9f01c433db5b4680 Mon Sep 17 00:00:00 2001 From: Milon Date: Thu, 7 Nov 2024 04:20:10 +0100 Subject: [PATCH 3/3] unfuck upstream files --- .../Weapons/Guns/Rifles/carbine.rsi/meta.json | 10 +--------- .../Rifles/carbine.rsi/wielded-inhand-left.png | Bin 832 -> 0 bytes .../Rifles/carbine.rsi/wielded-inhand-right.png | Bin 822 -> 0 bytes 3 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-left.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-right.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json index 18730c2761d..cac6899c489 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Polaris at https://github.com/PolarisSS13/Polaris/commit/ff87150c3dfc387c46db7d1c956abf19ddff7819, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wielded sprites Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41393/commits/1e56473177d0994d163c9edca3d13d6e5b640cc4, https://github.com/tgstation/tgstation/tree/master/icons/obj/weapons/guns edited by RiceMar1244", + "copyright": "Taken from Polaris at https://github.com/PolarisSS13/Polaris/commit/ff87150c3dfc387c46db7d1c956abf19ddff7819, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111", "size": { "x": 32, "y": 32 @@ -34,14 +34,6 @@ { "name": "equipped-SUITSTORAGE", "directions": 4 - }, - { - "name": "wielded-inhand-left", - "directions": 4 - }, - { - "name": "wielded-inhand-right", - "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-left.png deleted file mode 100644 index 42926b00f4705985591abade8f839204c0ee50f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 832 zcmV-G1Hb%~?IK-kY zl?x(T48aBs*CCZE$@+7$>@*?oZxQJ3z324aAA{cqAP9mW2!bF8f_R3k6*V%(Bmn5T zj@#SY(x>Nnh2uRmj4@d@r`$%ynB3Xf!FW8z)zwvQzka_j+wC?0z;PTnj`L`eV49}1 zEUR!~avM13GOsNNf?Uz{_4Py&j`sH?0DS)PRXH(XOh}d3G@Ntkx^8a#%k&G=G$jDI zKfmMfU>7H67jsYkO29CTC}uPo!F62>1_K-)A1B7^^`d@KMw)<0NAz-t=T|)WmPFV0t=t5@E0OZRubZOiE0AU@3dwE+gqEp?t-Nwx*d76zbA_> z%cr0-cL%5-x*fT_wVBygw&ki~U*D`v?xrhEa%DufBj3M!yYkh4)I95tCkTQd2!bF8 zf*=TjAP9nZs#N;_o-rniJOV{!^g8tWeYq-4<-$l<3Jbjep|Gy&QrC5~+ilEdGr4Sk z0Anoj9{~5|H_!7TUqW3?-xKx;!oST$NkEiX$q?N3P8B*PN>hmW61^-Fhv5JGa! z0c3jy2CokQ{PPI-zK_F$-7s9q6Oe~#nlfASO+wT2yhL2DXGEp^GD;ILnM@)tK$d6V z^71n3%Q*+>&7*+sG_}4c|1;d>3thI(PS5Ob1b5nrs|G+QD-7qK7ofYOvE+o z>eWgBaDU^*SKoErwN~9`T6<- z(5O`f0Q~v;FI+cGQ;f&s#1jws4r1Is|?F!OB#jq$=c1E&T2Ke)tH?+AN#O%i8h70})K7;G6>hI-L&Y z`J)Vg{H`+4bzRKPz4cC=g+{F^`hy{Y$uzc>XHSX27!!?JRq(@uSU}#Btk?A^%ZXL< z`+K|Cv>;r&cSy5g=7upQPEU?EE(_L5Qf3eYK@bE%5ClOG1VIo4K@b~A?*Gm!m5NB} z5tvs#e=E(=Xq2f^mAWvZ!Zb}`7)I!<6fTuYFbqRkM$1c76L>DmwcG72sR^jdcS)p* z)al8waNTaK#y%^g>JeB)Jx8UKgD6h1#+H02N8KbycrGp5B0Y+Wo;0 zwrvAIYR!2WB1x4d^LhrNy#hfH#BB3E0xIoAnpt#HWdHzWyzetqiZDPhhqZy$a1-0g!j++Pzc0 zC00r2<~Gd0b!leeJ^BO~V;{RYgCGckAc$Q22dz!Eul~=KA^-pY07*qoM6N<$f{pTo Ap#T5?