From 6d10ca9efa9646476942ce26a4a25625bb9e98a5 Mon Sep 17 00:00:00 2001 From: necromanceranne <40847847+necromanceranne@users.noreply.github.com> Date: Sun, 10 Jan 2021 05:43:33 +1100 Subject: [PATCH 1/2] Fixes missing sprites on the steelwood bokkens, fixes further problems with crafting bokken parts --- .../recipes/recipes_weapon_and_ammo.dm | 6 +++--- icons/mob/clothing/belt.dmi | Bin 23894 -> 23894 bytes icons/mob/inhands/weapons/swords_lefthand.dmi | Bin 29789 -> 29790 bytes .../mob/inhands/weapons/swords_righthand.dmi | Bin 34404 -> 34405 bytes icons/obj/smith.dmi | Bin 16866 -> 16866 bytes 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm index dae685b08f..6786f0c0f7 100644 --- a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm +++ b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm @@ -85,7 +85,7 @@ subcategory = CAT_MELEE /datum/crafting_recipe/bokken_steelwood - name = "Training Bokken" + name = "Training Steelwood Bokken" result = /obj/item/melee/bokken/steelwood tools = list(TOOL_SCREWDRIVER) reqs = list(/obj/item/bokken_steelblade = 1, @@ -294,7 +294,7 @@ category = CAT_WEAPONRY subcategory = CAT_WEAPON -/datum/crafting_recipe/ishotgun +/datum/crafting_recipe/ishotgun name = "Improvised Shotgun" result = /obj/item/gun/ballistic/revolver/doublebarrel/improvised reqs = list(/obj/item/pipe = 2, // putting a large amount of meaningless timegates by forcing people to turn base resources into upgraded resources kinda sucks @@ -510,7 +510,7 @@ category = CAT_WEAPONRY subcategory = CAT_PARTS -/datum/crafting_recipe/wakibokken_blade +/datum/crafting_recipe/wakibokken_steelblade name = "Training Wakizashi Ironwood Bokken Blade" result = /obj/item/wakibokken_steelblade tools = list(/obj/item/hatchet, TOOL_WELDER) diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi index c1404cb044e78b60630bba7aa6bba581f66947b5..adcd7b64e10598b46a1518e1ecb857ef7cf2939c 100644 GIT binary patch delta 583 zcmV-N0=WIwx&hX@0gzS-EmN9A)%Bi!hbEC=8GjX1c7e>!+=TUm{`&*$3Z0nSe=|K$Ys-Ewg9x5`An@}a zOd^gREvG=vim3IFv$J&r97q%uQ5Mw|s;^blRz=;Y)3`kL3jrVKogUrl(OW%wBci7& zDu0A6U|HG%mc=b#S>6Jc1)g`crh4ZFiW;69C@Ohwps44$fh;;ADU?Peg}jKQ&=ipr zLL!o;Cr3;jlAYxpbR=t}&WX6A7qlGY-Ihy^NG+x;qS4s_-cWX_1v@R+YQYz)aB`70_)T ze2YFLO!CLXk(56ujtgkQrg7BC#ZL%r?IOsz%4lxbm;sk|%)sgo^4M3ckkVcX6+ZprZ%k|26cbd3e4z V_fL=2U!iQ^PaCm&_p`qOms(8l7*GHJ delta 583 zcmV-N0=WIwx&hX@0gzS-EK?dK)%Bi!ho+HW8Gi*ixj<%TZomJiHj`^}Z+7NpTWxxD zU7z1xQihCXXD%|1(L=_IYSTJSW@oOe&7NVzx8EONSLnpt{+sE6T3hye8AR~82LeC; zK^AfJXfp?LRz$6bl$@;_$bm#r5oJ+bq54`yZB^8bI*rR?zYy?&-s#b;9=+A0HzInf zqJKiz0+yvMU|HM(mgOyAS>SnBYpQo{ps3-wfufS<28w!~8_1#~l0s=jQpk%)3QZA7 zAtWMcdU8bWknAk)pm(xH>YRu>I-t!#-fgL*h}0q{5sl6c@QSiaE!b(nRtp}$4n2&c zVyS=H&|mHI9>(Yt-~bs2L@eVN1A|xMO@9~$#U1g6)lFf_B0Rz1lzvaB()ST|tjO4c zT^+gZgipNkl#-oyS)RxgicdKZHt1!q2Oy^cM{J!1FLTbj46KL~ZDEa|2B;0*DQ2e+ zK4k^B2ckKG9qPb9ojkuMgT{j$R`87N3OW{!eqA_a4ek+gzbZjf@A8@xI!46+FO&8G zBY*fTZnZ!bxN#(B3JJNJYvrDe9?}RSP@RE>S~aL0BSDJ|`W(F6e2@~9b#4je3h1^E zzD6GyS^kiCC*_Zc_XRXz(>Utn;xj^9y9jcw657-w^Jp z^F`oOT}uQ|Q=KnzJ~`@(qI%r_ZAmJ?^1KZkG}8*Zs|v|DY~g#nyuevm0zRoWO$~Tt z)&g!#8>A-;QCm}q(>SzZLYY=0*Zci5=<#*=Lr{W`7-V-t!LvCiu^$)BYJZRLrvbG) zj}O%y>uIhm?#iaCD+;zl6?U-4Mp|(KG@kf}<=HZM5ULDp2UEk&BJ+rrw_>dDZ>0Ve z#63;QfxW%DpZ87^n$XK6W_JcD%E}Hf_^)KiiY6&d-Tf|ynA|MS>3sHfd(t>UXocdP zu4|+XtgvY{@-s;3yZZU&9U@sR{QLu%-+c$l!v(huPw^}H_*#?o=O+FO$)oWdAU&-^ Iv!DXKain9JCjbBd delta 309 zcmV-50m}Z~=mFj60gxmCbFn2{0e=>#gM${RpN~B3gbqIN6y7jtSOGZRwl`=Y8+fvL zZ@vh8s%wb=YO3=^$|pyCQB#lmzb!}wSf00mLuOiGcU2)7hb?@MmlrrIOTZ_Url|ps z%v!*$X@j(cA!=(XaTlJ?O8&mg7m+UJ{hWFfWi^ABWx_Z=t?7u+^H#joV!YfaXloA@sPo9~Gg^3h(i Hp#r^em?4)A diff --git a/icons/mob/inhands/weapons/swords_righthand.dmi b/icons/mob/inhands/weapons/swords_righthand.dmi index 9f59dbed064dbc3cf897dc13334dd80de1f0c6b0..50b0064de5604dca1a1616bff0c139fc4e9d1ccd 100644 GIT binary patch delta 308 zcmV-40n7g6i~{A10+1vDa3{AZLMR#~ye_-y!fE-Y{uc0XW^dH)tUnnAyNL zUj)9?wL}25)VY)M#Zh;P>T&Oe^f6DkS5uhp*}K0%v6jI8$w!8t}}l z1>Bo9NKY7|wx$xF)6j|uWm=6~ACGg;)9dn^padT=%I=1O7jshLI4zph5r5%N1L|;@ z9;!Rm(_C5HmrYk!6zs<;>|oE0wBi%cc;X+IXUpVCs4}n}ObrK%%p+Rfim@VKBbgec z9NE&(clH;W(1dn#m)#kpC@VX{;J<(+&ooJC>TYv6#^mO7P1mcZ+mpr-LMs&S^;jcq zU_DK%kzYVc-$l4L~^R%;` G0>*<7(V8d# delta 307 zcmV-30nGm8i~{700+1vDaj_*_0e=hB!9feu^CJ&Cp@$DVg*QwZRsc@7?G0MU24*(z z%@=_$buAGZsI95Q=QOlpLYY=0*T>@=^z^FyCMLm0jIz6-;KiJjI8F;@b$>+o(||f$ zribc|^)y!&_a)O66$SgT3Om?yBdz!ZG@kg!rP(rh5~>Vr2UEkrB9k*K#)^P#WNMId zWJ5pS*^nXIEWv!`vK=ag5eZ% From d7d342cc7561393a5b49168583105b413f699937 Mon Sep 17 00:00:00 2001 From: necromanceranne <40847847+necromanceranne@users.noreply.github.com> Date: Sun, 10 Jan 2021 05:48:27 +1100 Subject: [PATCH 2/2] Back sprites as well --- icons/mob/clothing/back.dmi | Bin 106411 -> 106411 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index caa901a9fd294ee76a4c85ffe289e53822cd7311..2afd1b510bad492429a8a6e9527965035a006474 100644 GIT binary patch delta 1309 zcmV+&1>*XvzXq$n29P>`OK;;g5P;A2uMl>xauGT9?p}Ookwp=pyFC;=3nOYIPDF9E zB<07y@4;3qCzd%*ksv^TZ)QjiIWK)q{`mgq^Uvhz$MbxP&J){YldOJwn9p`p2Ayn@ z$K`yck!l@||M&m_lTGpo4XWU{1Jyiyn$JpdKG`Iz`K)r#qE9w|Np=;^qHqDK=|DA6 zkoSigtq{vAG3cTskbtr1gT_EAioReFZTQ43cw*Db`K&|(hh&p1)8%`)!rWt}F#pGv zf-V5Xz4M0uu)UTniH)^nY0}c;+0r^)rrCVva7VVBR%PqEEZh3SyWBFBVq06LQetV9 zuFk?c3QC_vvg;;)l;NEf-PsmPQeZ@^N7XwD2N8U_Fd|m7DaqE;?AP;YWa;Q<6qOt| zD6@vPChR~pfB*F)hvTOML1{Emt|Eu9$9Pm0g9X@<4PiX!souy!Sxr?appM%P>{gI+ z2i9Xe=e}+ZIx%b6$q%A35X7)P#NE+A01HtpVB4_+Bg6}C8iC7>SYGtb#&>mseLz9D z8pA^UULArK#4R77s<=`bY>n6H^+g&y{#;M^CuLx%g+Nnjbu}&?*6BK3-_)iN%yjv1 zSq-FF`tI+4wY{#$vpAOM#9U7bohOzzz25ig#FQOvM=M3qkUmxEIENgI|Nr7 z@IKD&AfOZX5{_H2xz~gy{t_=#zks0dypVv~c37|BoqV+iTM|OsvQ(mU zY~zQ2U9hYHQW{%Xr-W9P2LkU!+?I}$IB~DC5IAc<1$TEq<8}8dD!2jz8Xxm{jTrv@ z=XXJCj;=oB!a}+;;9F?H<^in0{{{{%yZD9j9fB*kEku2~750p0bm0V#afBD97cAOR zCm0tTu|*4U2P=)OxSA_^)fj>Oj#LBt(RRLnP5D3wmQql&@c|`AZ#l?e&9)KjTUQQ$ z^=Q>WaH-g0E*lfE#oTuYl1hGT_GE`bZAUr zpqzLFqe5KS( zy}0D_0zpl6x;MleLV1Yxk?%&VSJm8H!!2z-^tN*>7;~M#+_FLwPhhV+sBps_ul%o` zw&-#Vt~6BZcnMh_BU>ZJ%NGjA3d-qqGf_;Fh5`PbW^#KIOSaazERMm~lyS#AV717DuF(r8%u}!pG zQ$nZDEPiV68UM=CIhqQrR|@jpLC_9C@Wwj?cdXFj-f5wh4HX7(aR<6w-NW9aIs0-C zE6{AfqqDdZR2`-yTiBhI|a8p1p#oH?%IJr delta 1309 zcmV+&1>*XvzXq$n29P>`&2Hm341mwcQy4Q>XHlog%v^HVMF)!lJF|zyo()>2E!MK= zk>vcm{T>pxP8vr{7cB}D_(+PPM3MC8T_|Fxe!Z(4Y#AJ5bHTr}?ZT=aWscn$Ic+E&61ClVn%nED9H(nhsPG z1$lp{(F(D=5`!*E0tpz4K4=W2qUZ|-k;5l$!4pm|=d%(G9Fk44OqcKF3UiN@!u%gw z3c3IkkIn`EVS6oE5*usD(xj!wH%seunP&5u!yVajT9vKuvTW-Qd%0yQ#kRIgrNq)I zUA+nKC@B3Vl3h1{p$zY==*+fQk^&=QJ*wVOIEdiWff2EqO-Z(%X1~7eMwX6#Mp?;m zgEDJqYr+mx^Y>p*ayY&_5R^s}$1{^74pLT0!BPtD(3I%zIT#BR9@xNpF}oE! zxdZDl{^q_q2c4L;?Bp9!83bH;o`WFq!8I-XlR#fzs;ulS6$ChvBol$>z z(PNZ-RS63GBew7dTT=Y&pV5-C?<62?;0OJJn(Kt#u?R^?JFM66PQKcMEeWA*St?OF zw(-q>E?Cz7D2=VGPeLnu2LkU!+?I}WIB}=45Cm&L1!s3a<5l-7DmVfI8Xxj`jTrv@ z=XXJ4j;=oB!ZNxu;9F?H<^ilA{ss;$yZC|f9fB*kEks?q6?Tko=)wsu;|MQIFIcpt zPB1JuVv82y0ahAYaWz-;sxbol9jONPBX_=kO~pV6mQql&@c|`UZ#l?e&9)Kvtt*GW zdbH{wI8!%9UQc^GGtAw^**{7wY6G;LynI&#HKF59gAKVdeGxx@ z7w3FlASgixe<|h=%0sk|d^cdds^;bzZfWzOx1D3bkn05ImKB=#1NO>;3OB;>%Kz$V zi!RsTN<+1dmyngAT89o)li%U^)iJ|JRl)2hY=1x-SMi6oGT^nar5>?)Wx(rr7@9*~ z^rjXhrr~plq(U9BcYmWP*axU8@z+p)A3(5;HJ3g>Ro!@bmuCUIB0BkYOi3O`Y!fZl zl+fuTi=P^M#=o(2j;0dpm4du?5VS)O-0=><9V@hWbXuroLxllc+<`7v_ptY9&c58k z3N#z==q&C8Rfj3b*0-A1FIPi9t^|RM*OL6(_9oC4osW-n-wb_DzW;nmo_;(F&;J9c T+@j{kJm+eII|a8p1p#oHlTLT2