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] 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%