From 0b7d22c1686ab2d79004a5e207d1fcf41e29ad9c Mon Sep 17 00:00:00 2001 From: TaralGit <76408146+TaralGit@users.noreply.github.com> Date: Sat, 18 Jun 2022 06:20:16 +0300 Subject: [PATCH] quickfix (#8942) Co-authored-by: and_a --- .../Guns/Battery/laser_gun.rsi/meta.json | 2 +- .../Weapons/Guns/Rifles/carbine.rsi/meta.json | 4 +- .../Weapons/Guns/Rifles/lecter.rsi/base.png | Bin 355 -> 287 bytes .../Weapons/Guns/Rifles/lecter.rsi/icon.png | Bin 377 -> 337 bytes .../Weapons/Guns/Rifles/lecter.rsi/mag-0.png | Bin 174 -> 191 bytes .../Weapons/Guns/Rifles/lecter.rsi/meta.json | 50 +++++++++--------- .../Weapons/Melee/combat_knife.rsi/icon.png | Bin 259 -> 274 bytes .../Weapons/Melee/combat_knife.rsi/meta.json | 2 +- .../Weapons/Melee/kitchen_knife.rsi/icon.png | Bin 319 -> 270 bytes .../Weapons/Melee/kitchen_knife.rsi/meta.json | 46 ++++++++-------- .../Weapons/Melee/machete.rsi/icon.png | Bin 275 -> 252 bytes .../Weapons/Melee/machete.rsi/meta.json | 2 +- .../Weapons/Melee/pickaxe.rsi/meta.json | 38 ++++++------- .../Weapons/Melee/pickaxe.rsi/pickaxe.png | Bin 285 -> 333 bytes 14 files changed, 72 insertions(+), 72 deletions(-) diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json index 033d627581..da85b7e10f 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.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/commits/master?after=edb54f137d6ac4ca06fb76b36dc5c603f92586b8+104&branch=master&path%5B%5D=icons&path%5B%5D=obj&path%5B%5D=gun.dmi&qualified_name=refs%2Fheads%2Fmaster", + "copyright": "Taken from Polaris at https://github.com/PolarisSS13/Polaris/commit/9ded73fb85b9106d6bbf1c9a34d1d2fa27ee0e2e", "size": { "x": 32, "y": 32 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 7b90c1abec..c98adde97d 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": "GNU Affero General Public License version 3", - "copyright": "Taken from The World Server at https://github.com/TheNick5527/The-World-Server/commit/91677c25160ccc0265f84189d2cd1ed44bc39742", + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Polaris at https://github.com/PolarisSS13/Polaris/commit/ff87150c3dfc387c46db7d1c956abf19ddff7819", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/base.png index 02d1e9e24f33e98867757e1f20ac95e10a918bc7..fc6d6f78db702c1e9b4d0d655cb30f5fdc172e04 100644 GIT binary patch delta 238 zcmaFNG@ogL1SbnK0|P^2Nc!=KimLUZ0X`wFK)#xqnz6C5y}iAPii)J9WKU0z-1mvs zffDQ`L4Lsu|G{8s{j%Rcp$VQYjv*Cu&h{SUZ8qR>wVzsZ+)?ttLLLY0T@EL0+bWv8 z?$)=cX~`ro%}cpi_is|;>VxfPx4wvZal3YZ@0m99YG|#!`|tnyyN%2EZ|_pAjh3 zOgQPH^5p4F#@cBj(=VKf=xTN|zUmd3y*6m?i4z)U15E?pbga9*ZBeqi%r)7xr)TE0 zif(wr+_6&Mp})n#>ssE%ocoC{?%J&6`_r59T~50tPwaA(<}yyU9XUe3&E{vWUD#Un wsrQ;d!H)Z{p2o<^3xDz7b^g=Q56^8F?wn?;Nt<1B8|ZQdPgg&ebxsLQ06M6LIRF3v diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/icon.png index da2084c375c12a06d7d03d6dc1d60baa116eb471..9e6d62d34f898639d516196bbd0b0d0cc618d0a4 100644 GIT binary patch delta 289 zcmey#bdhO-1SbnK0|P^2Nc!=KimLVM0X`wFK)#xqnz6C5y}iAPii)J9WKU0zw3LLJ zs= zV6)-qN-G1k3(O)RdJdb-b9FW<8y54PW3YbyAWcO}_YvFQ`bnw3Z%)fi$b7W_Ooqs@ z+^x=O@fU;5S6Q>vB^P*gf$nDTboFyt=akR{0Q6~dCIA2c delta 329 zcmcb}^pk0V1SbbG0|SH0lCEPD6;uaX2>SYGz7_*nZ&DLiw zUC?^UdcN&qQB#%!cYoYruPlzi61B0}bgqo_doSdAQk)fodq=}J%qrHuqnp)D%yahmM&XOR% zV21xtV9qrA3Q$nP)5S5QVoq{`1nUtdMiV>XSqz&uDX(H!J+qQ|l}9n_EJ>LRE;eZf Z2Hi(Y|MjbvOb6;=@O1TaS?83{1OSjgC(Zx> delta 111 zcmdnbxQ=mxTLyoCPlzi61A~!~QDkJKq@<*(s%k+)QVCFqwIs+dnBhMV$Xrkh0t%>m zx;TbZ%t=m=U=3k*Vp>t-T*8><=vu<4$Q~l-E@

n#450tzIj@C&ZP3f#J^W+a(3r%a<;iK4rq5om*C|TIKH_-B?%E-qxa^prEIx z7aAIBVq%hUV$TPlYQB;nzhH*{$ROP7wg^xr-P6S}q+(8T!UFRI7x4g>$HtP2K2Bu~ zV2y|gWSueRV#$UXEQ>T9E+0&4S?3_?>g#CLF1)H~rsxVTi5<%pYb8YN-OLbra9-@? zK+!vK0TUWlH8cVR7*|cqE?f9X^4cQJga=OI3#=Fz-b@n}J-WGNAJ9$)Pgg&ebxsLQ E00$9U(*OVf delta 197 zcmbQl)XX%&tzI#}C&ZP3f#Ln5TXCi3%{_gyS1k+(P3h~OvHR$8k3fF~WnBYPw{K-@ z+kuL>OM?7@8UDjTZCUMApm2((i(^Q|oaBTB)(I*a3p$R48@W8S-pR3mOT&6Gm&Htr zMVbYMF2N1Um_r$}nPxFvyQF3!e5h$kpzjR3sa>yf&V`<43J}$q8`ZE%p=&Ec=s~7y rEGevsfh+bs@bY&MP2fmgV93C**jy-KwfY@vpoI*cu6{1-oD!Mas0+sTX1o;Is{6_-1ERJh| z66u~Ujv*Cuk`opfCAf$OxIE4_mR!WSVgaW?>jKUd3pou`*|-;I36zRCgf=X5_C0b` zAheNt6`!e~un6m$&T}icv_dY5oY8S8b$MD8vVQaVJAJRZPhDl@sSv%gKr>;5OYngM eeajm77#Mofgi6)suV?|<$>8bg=d#Wzp$Pygmsmpp delta 292 zcmV+<0o(qL0>1)~B!3%FOjJd{z`*a~+Fo^co2sEmQBQ-6jxaGcLPJViTwn~OqqqP7 z00DGTPE!Ct=GbNc003!vR9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5; z&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+JAW@TEmet&GbOXA7|1u| z;!G<_%uR)`l@(n5T)@Tx05=9280-kh%m4rYT}ebiR49>SV4x5%q6;XZ@tF+K1f0!WLov&Y>5!7BkIi;(Wms@RMir hMG=EDF5(Mp85kJ12vk^^-PMt1-J delta 213 zcmeyvIGJgJTfJ6*Plzi60|OVosiA$Mp?$#CBd3&1f`SstN*kt#NUEQ|@r+B1TT)BR zI@mI|C!_VUU=C0EaktF()};0T0K*kCMJj0jw>-92^F- zmYX~f7ts6c5Zs`qFsE--^F^LuM}}E`O(7wyQ!`g^omswETjTKhgsXlbtTE|j?Ta)b zieH;?&42yoF7Fb}2Ue}C7*;TaGBTUb;$v&O%QJzopr E077(8y#N3J diff --git a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/meta.json index ae93abf331..069cee5a70 100644 --- a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Taken from goonstation and modified by Taral at https://github.com/goonstation/goonstation/pull/6094/commits/c8b97b970d189e566f63b74c6b453b016a5391c5", + "copyright": "Taken from Baystation12 and modified by Taral at https://github.com/Baystation12/Baystation12/pull/29841/commits/57265cd89e6b66b9a67915172f60bbbeacbeced0", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/pickaxe.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/pickaxe.rsi/meta.json index 483c049a3d..8179728a35 100644 --- a/Resources/Textures/Objects/Weapons/Melee/pickaxe.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/pickaxe.rsi/meta.json @@ -1,22 +1,22 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "inhand-left", - "directions": 4 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/29929/commits/8c0509a4725602d0be2e9a7b29b556a39fb5cca2", + "size": { + "x": 32, + "y": 32 }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "pickaxe" - } - ] + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "pickaxe" + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/pickaxe.rsi/pickaxe.png b/Resources/Textures/Objects/Weapons/Melee/pickaxe.rsi/pickaxe.png index a157fd81f70b7f65ae114b848d90ef812d9619b7..a8fc9a58b0f635939c061bbdd9eb6deb5de55c0f 100644 GIT binary patch delta 317 zcmbQsbe3s?WIZzj1B1(wu46!ou{g-xiSg!1oq8aLv%n*=n1O*?7=#%aX3dcR3fctt zgt!9ft|?Qa!$V^;vI0Xx3yTVi8XDW@EvW15o4k76+V$%%T)NcSPS|2qduUVe(3l1)eUBAr*7ZPVg3LQQ&c5 zZt<64Z@%+?U00|dCv!^n`xVz^tr#n&PciG5bka&Wat{Bb<_qU!Jx zHnp}Fwy!quS{7eQ?|-PZ=Xs53sB+vV*T2noD>cmDetkTruK!$zjJ%o5oA_?6`c;3G z-CPuLc~-qAk+bv*8dN@Pf6WlJmF3~Gd3SaJoyFkk>gTe~DWM4fHK2=i delta 269 zcmV+o0rLLM0-XYo8Gi-<0047(dh`GQ0OUzTK~#90V_+BsqhJ)Ef&BXZ|MawviJq1b z1r$siMpg(6P6yC48ZaE7CS%O-^UgbZ*^fI4Bn9;75(+HXEM->_g7EL?{fDt(AV}~P z$(F2pFNVT@aOMCbRtM-hxH4$!%P?r_%P?HO_=MpW!&wG38GmEA{H-Tv8QkpI7}Sh- ziMIUKxz7w&&LGUVd|)?qk!NlP|q4?Jn`%1LsFmU}9H=NC`B7_nG7{D!{_`iaQ z!+(0E0j!De=bd*9&p%wk?MhlZfSzE~0fWy0x1O9G2zMX=y|UjZ7zLwX&;S4hQ#@&7 TvT>sT0000