From bf273cffdd0dea6dac52c86bbfd7bbb691037157 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Sat, 25 Jul 2020 16:18:26 -0500 Subject: [PATCH] burnt bokken backsprite, wound tweak --- code/game/objects/items/weaponry.dm | 4 ++-- icons/mob/clothing/back.dmi | Bin 107651 -> 107651 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index c80a34be8b..ff7ed17711 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -268,7 +268,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 item_flags = ITEM_CAN_PARRY block_parry_data = /datum/block_parry_data/bokken bare_wound_bonus = 15 // having your leg smacked by a wooden stick is probably not great for it if it's naked - wound_bonus = -5 + wound_bonus = 0 /datum/block_parry_data/bokken // fucked up parry data, emphasizing quicker, shorter parries parry_stamina_cost = 9 // be wise about when you parry, though, else you won't be able to fight enough to make it count @@ -301,7 +301,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 damtype = BRUTE attack_verb = list("bashed", "smashed", "attacked") bare_wound_bonus = 15 - wound_bonus = -5 + wound_bonus = 0 else force += 2 damtype = STAMINA diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index de10ef5c9269cc8470feca770999f59f20accc1d..ae8e6221c6fd0a04f34326dd7fd224cd8cc570fc 100644 GIT binary patch delta 834 zcmV-I1HJr%$p(YT2C(V@e|gb6D_Eu)f))e{AE2tZQW|WHm+8$}-Z}nU&afwCV5x;b zb9wAxnyokKCf!`srV-41zCKUCX_mhGdugxi#Y=lDT{6#H>xuCCE**d0De!?^J7a&c zo9xRp$G6XHj3p;(;@xozHusv)#IOFD>SqvCe|l#U5ZXB(O)C{@ zWr^4k$Da(bbyOL_qZ!HdMvQLcTEEJ*W_NP6QP6-#r@&gaajg?ra0(Mza1aw(a269< zavWW6{G5v?&+k6HeE4v}WnWc-n)-;X{9sFp-~BUMQfZw8q&@SfUr^?p&>I#Z zsUpYq8s5uSJJ^yC+LomfrDGdE?1E(-htk-}S`)OgJP`OG;&yZ#eTkccmB3jeD!98N z8ZUHTP{9=#(fC}=YsB#HKfeolVRZG73k%)OfN!A%n+LE0fBzd8T6XaZd~q}aH-g0E}P4+#oTuYl1hFY5*#|iPO#(=l!Zbt4cR*P zdv@_db3nG>e|;gFZggl&VW6CO1e4L-w=_$$bdzRjHf?v5>%E@e@xm~7Z`?)bxYJ-m zu1sIV-FwdG1%jGuSg(jVgmQ?sgYQO@7u8%{!!>O_^tN*>7!RGm+_FLw&qFUfs6e}T zNc+{(4qdLnm4<2^uLLVYwGJJqCck0h7pDaiRRy!3f3f`mZCu6kWo5u?VP`yH^U8qN zaW^zWUi79G#Fz0yf~3%#us46*DA)(6D)DzjA3$)7HJ3g>Rb5G->oW&l5S>i{bCSnN z*-Ym&Cv^He;pYa1@vjq|qq+Eap|0*71nm$6Z@fcr$3iRaofc}@Y+wXeH=yf>Ti9DP zXJ2k%F9n(ncyt!`g5trHWb11^=$DJGpB8jL#_KEb_jB_7=VS8t<7xRH$S75f6&qy{ MgA)a}69oZqpCFx=asU7T delta 834 zcmV-I1HJr%$p(YT2C(V@f2*Q*R@K0sA*r8L+YFVmZ|ymS1yoMBJOz)}l= z=JMFXG+S@dO}e?NO(U53e0`pN(=2`W_tIY3i zH`$kIj&GmY7)wsz&!>nCS^jTqg?wSJXr&F%f`Vuz>D}l2{RB(4k zG+yYwpn@wfqVc(!*NEZYe|{JA!szND7Z$pm0pCIkHVWmO4Rye#BNS#2u_Ow&H58=v89`_B&Dy946cOHs=E&SV}?7 z#s`!fz2zW>HQPq8Z(TY3)uUB|;8L;0TsD_si@EO*B$fO)Bsg@2onXl$C<}#P8nSin z_w3?_=74O$fBQl<-RRJm!azCm2qvSuZ)uih=_bw6Y})Q9*Lyv`DrQLqnCRpRf6K7imDYc73&s=AUu*JlpAAUc}@<|L1k zvYF0lPU!S`!p{v1<6kE_M|1J{Za~)$x3ITp z&c58jFA6jp@aQb=1;v9Y$=26;&@UHVKP~8hjMrD<@8{(E&&TBP$J6pZf1*`eGulb7 MgA)a}69oZqpGJ|a3IG5A