From a8a9e8e022e1c878e365bc532c7ac191f905e6f0 Mon Sep 17 00:00:00 2001
From: Couls <coul422@gmail.com>
Date: Wed, 10 Jul 2019 21:12:35 -0400
Subject: [PATCH 1/5] Baseball!

---
 .../machinery/computer/HolodeckControl.dm     |   6 ++++
 code/game/objects/items/weapons/weaponry.dm   |  19 +++++++---
 .../mob/living/carbon/human/human_defense.dm  |  33 ++++++++++++++++++
 icons/obj/basketball.dmi                      | Bin 2028 -> 4142 bytes
 sound/weapons/baseball_hit.ogg                | Bin 0 -> 6754 bytes
 5 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 sound/weapons/baseball_hit.ogg

diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm
index 604ac3f02f3..d3edc588e2d 100644
--- a/code/game/machinery/computer/HolodeckControl.dm
+++ b/code/game/machinery/computer/HolodeckControl.dm
@@ -460,6 +460,12 @@
 	desc = "Here's your chance, do your dance at the Space Jam."
 	w_class = WEIGHT_CLASS_BULKY //Stops people from hiding it in their bags/pockets
 
+/obj/item/beach_ball/holoball/baseball
+	icon_state = "baseball"
+	name = "baseball"
+	item_state = "baseball"
+	desc = "Take me out to the ball game."
+
 /obj/structure/holohoop
 	name = "basketball hoop"
 	desc = "Boom, Shakalaka!"
diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index b759139dba6..9bdabbd543d 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -157,6 +157,8 @@
 	icon = 'icons/obj/items.dmi'
 	icon_state = "baseball_bat"
 	item_state = "baseball_bat"
+	var/deflectmode = FALSE // deflect small/medium thrown objects
+	var/lastdeflect
 	force = 10
 	throwforce = 12
 	attack_verb = list("beat", "smacked")
@@ -171,12 +173,18 @@
 
 /obj/item/melee/baseball_bat/attack_self(mob/user)
 	if(!homerun_able)
-		..()
-		return
+		if(!deflectmode && world.time >= lastdeflect)
+			to_chat(user, "<span class='notice'>You prepare to deflect objects thrown at you, You cannot attack during this time.</span>")
+			deflectmode = TRUE
+		else if(deflectmode && world.time >= lastdeflect)
+			to_chat(user, "<span class='notice'>You no longer deflect objects thrown at you, You can attack during this time</span>")
+			deflectmode = FALSE
+		else
+			to_chat(user, "<span class='warning'>You need to wait until you can deflect again. The ability will be ready in [time2text(lastdeflect - world.time, "m:ss")]</span>")
+		return ..()
 	if(homerun_ready)
 		to_chat(user, "<span class='notice'>You're already ready to do a home run!</span>")
-		..()
-		return
+		return ..()
 	to_chat(user, "<span class='warning'>You begin gathering strength...</span>")
 	playsound(get_turf(src), 'sound/magic/lightning_chargeup.ogg', 65, 1)
 	if(do_after(user, 90, target = user))
@@ -185,6 +193,9 @@
 	..()
 
 /obj/item/melee/baseball_bat/attack(mob/living/target, mob/living/user)
+	if(deflectmode)
+		to_chat(user, "<span class='warning'>You cannot attack in deflect mode!</span>")
+		return
 	. = ..()
 	var/atom/throw_target = get_edge_target_turf(target, user.dir)
 	if(homerun_ready)
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index b95920e688b..5dc3710f3b5 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -311,6 +311,39 @@ emp_act
 		throwpower = I.throwforce
 		if(I.thrownby == src) //No throwing stuff at yourself to trigger reactions
 			return ..()
+	if(I.w_class <= WEIGHT_CLASS_NORMAL || istype(I, /obj/item/beach_ball)) // baseball bat deflecting
+		var/obj/item/melee/baseball_bat/B
+		if(l_hand && istype(l_hand, /obj/item/melee/baseball_bat))
+			B = l_hand
+		else if(r_hand && istype(r_hand, /obj/item/melee/baseball_bat))
+			B = r_hand
+		if(B && B.deflectmode)
+			if(prob(10))
+				visible_message("<span class='warning'><b>[src] Deflects the [I] directly back at the thrower! It's a home run!</b></span>", "<span class='warning'><b>You deflects the [I] directly back at the thrower!, It's a home run!</b></span>")
+				playsound(get_turf(src), 'sound/weapons/homerun.ogg', 100, 1)
+				do_attack_animation(I, ATTACK_EFFECT_DISARM)				
+				I.throw_at(I.thrownby, 20, 20, src)
+				B.deflectmode = FALSE
+				if(!istype(I, /obj/item/beach_ball))
+					B.lastdeflect = world.time + 3000
+				return TRUE				
+			else if(prob(30))
+				visible_message("<span class='warning'>[src] swings! And he misses! How embarassing.</span>", "<span class='warning'>You swing! You miss! Oh no!</span>")
+				playsound(get_turf(src), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
+				do_attack_animation(get_step(src,pick(alldirs)), ATTACK_EFFECT_DISARM)			
+				B.deflectmode = FALSE
+				if(!istype(I, /obj/item/beach_ball))
+					B.lastdeflect = world.time + 3000
+				return ..()
+			else
+				visible_message("<span class='warning'>[src] swings and deflects the [I]!</span>", "<span class='warning'>You swing and deflect the [I]!</span>")
+				playsound(get_turf(src), 'sound/weapons/baseball_hit.ogg', 50, 1, -1)
+				do_attack_animation(I, ATTACK_EFFECT_DISARM)					
+				I.throw_at(get_edge_target_turf(src,pick(alldirs)), rand(8,10), 14, src)
+				B.deflectmode = FALSE
+				if(!istype(I, /obj/item/beach_ball))
+					B.lastdeflect = world.time + 3000
+				return TRUE
 	if(check_shields(throwpower, "\the [AM.name]", AM, THROWN_PROJECTILE_ATTACK))
 		hitpush = 0
 		skipcatch = 1
diff --git a/icons/obj/basketball.dmi b/icons/obj/basketball.dmi
index a26c3935719625333067ad098afd3dd50d17c67a..7b34fda1a32c52581e83e72b8d33acb73ef0f305 100644
GIT binary patch
literal 4142
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
bqElvcB0n{`B;ubB0Dz^bjY*}EcjA8m>2me5

literal 2028
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
KMNUMnLSTa3^S31c

diff --git a/sound/weapons/baseball_hit.ogg b/sound/weapons/baseball_hit.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..6530945b6c1bb9e13945b854b20a339d5a6c8f48
GIT binary patch
literal 6754
zcmahsc|4Te_YcM{4TdBYWiUd<mPyLK48lxfZIWfOj%`d*uM%SkNtVH+tW(yCqNqgK
zL$<Lml_DWZp+)`f=zZVs_xsoHe(pSTp0nL^&vNg1Y`nbi5GVBa@Vec=%?7m-RHZm}
zahwheardFH5gf+l>^}&K)Zy6tf5>6Omi%|HCD{~-d+zzd`oI5cT;%$rW(%NNxt%_x
zrK75TKozZ~!DinLexv}8Ku=PL9w2%EqLw-!qGkMj-2cdNaR2$=V`ya00qH}K97R&e
zlu41G!KDmsw@*tOcKa=CH?$Iol2*5Jd4Z&)$QI=p#=9t9>`5U&Y=Jm~GYDFO0iP@l
zspps)t)K^>cnrY#uyJt1e;y_nZ$LHR+ew>N(-De(r?W0iGr>5*0q(sFZL8r!Mszs_
zFw1F~+eY(X-b>S-DJv#KHK{$6puw~hlcL_LwGBiI8pboCEwt99XkG?qB>t=+XJDQZ
z&129eNi#J77VuymB4{rRilt~u7{1*!8BI@dC<TJ@3KSCx6b0Z?RRT~O1i|&~5Us(|
z?N_DSE2Rbbwm5;%a6o*3&pe^XJo&A8s+?0Qa&yjHDph__wK>%{#myne)=tPI7{R+K
z=Ltc4c{&M9#{{N#!fbppA1$_=6N-c&7+6Nr2!F^d-T37(!cYx)?7yZ9owR*Z9QY94
z=X0urCti(fJI`hufEke@32IG||2R2P5-VK5UxAs*na*<(W?(BZJ9Esd!&9#%)M93H
zDBbNdIp}Tx734SxF#z9ePE($fz#mAVGQ5YO#Kr}8&z;N>X#tRYMR*G1ay5XsD}0g}
zmX!c9uMNjtvt;8aY*m|&56yGZIb!VB;wQEAYdy^XvT2!{%z^*QvdOpUWUya-c<g1j
zaTH(QthbD*h`W^foWa_AHGZk+9K#R2@4buC5Aq>1f^k@dKMv=F^!a3C5IFOH9`5n7
zv63Mjs9SkaSf!HUf+Y19%J(`q9|sr8?+NP)p_|}F`zo4nc(T@@qu)o&EF=29y|Z6M
zH4cknrsD)Q{U-x_Z^*OVGsTXr**zY0D<?!isrZjOW!RyCAe+z9y&^mRGe1ec6hYdF
zf~nH4uGNn>Ay7#}bgI*X2$$g);#$N6nCnzGM>@&rf99X9gCds!$^K^}s1`{|C+59e
zI{cq)f`CFn2(!(6v#64@?33&2Q?^;rv=P&@Lzwhy5_-jnb_d9I+N6FhB3_$FuqQjv
z$u2e2u}sp~TEx_UO(O5+7DXZGVCr5}>K;_;v`(^|g}!&25~R<=uE>NpipkSDsd5&n
zNS{=%aC&hzV=nuKQt2iO1ZT6bN5aiB2_<I|iq9m!k5Bc^rWcnm_I2D`sJlJ?|4qTo
z1eb%LP&u;@IWwG`2@U|8-i;Judsq57TFxXy`9+`RpFQ@9=>dm2g#I}+{tf^H3ANuv
zyy%s-7DcjfDg?X=3unT@6aK$p-LGja1{}-JF4!JtN@qo8vcdcE%r?cMyrH9*nWCXi
z#i*QFINBqt6^AwwYM~p@(z$`tV2~ZCD|8#WNjjw4;)9$?H%4hEvjt;TQaE6Tt-R^1
zi)Gdv^PA2AuN{g^XUnpk%wv9~l|TsM1wX<3o)mEoeFOwu6v7FhV$$8aQL`zy4$O?S
zdjjTGjz>2}@p^g(M&WvzD2fSQQL{Pe-4-)BX?+%oAU_&7z|T-o)6)ckD?qP;q^;95
ztr19TF%ugEaY)RBm7&?CsbzPJV2!Y59V0kNSQF?-YYl5_1OYE*LJ%k5>DGj5(o0S9
z$T7l%1c6mUa#@XVpi?I_tVh_dfJz0g#2WHM=D(^4L&peX+JLHM7fQ4vkeq<#(?q8s
zg2P}0(9FVHkBAcpbixRWM4(e$LkSc1#E~I_(_qBdV2tZv#Ixekx`2+`x67)^e^jad
zs9T&*x9GQG8^kiUBUn3Blkrrti<rrfIDths!Bc^j2v;g;WXQOeYC^~$v6svs5yMCh
z4}b`na5`ctlt|2^5*<&uti|+Gsl*J@lmp3WjYMo6q)x3__19Prv8eq7>eL|hT{d}a
z9f(m0^cYvbHx%<aJYZtm4LbsLBAw_8#I^;v9vH0;ICO{XF?P7>&R!w2`n$@+G3~l~
z>n!TT`yEEF55#Kr-zNio6QM-cOzMR9e4Xtv0?~mqvPN)NjQ~cxUX7TNBn+(qm&dZ`
z*WK14m>&f*2sJUlg4rxG(eeEB`=9mdp;Q+jTiIEE`_QA{(AdME=6R$ch|@}uD<-y_
z4|)TGBxyNDRtE8iXmAvuXeqcRNm?fcwVi@9M3uzgaEX%9DHwSq<tSD$pJ|J=%%=?+
zqAFu>&i)lFhI678t<PDJS#66=EMZEy_-UCY8MNi3rD7DA>6?U3jMDXJaD;+`&RH4N
z?1)i7Mkix=Wtpj1D<o6WNU1U--5n5yo&9T@vnYzp=2WadlIiGTg{hIGB(oP+*j$`h
zjl=n6P;fvMNf@gHRAI4bU=>g$Y={M_@K|7#`#u!Q5$jtCR9T`2ZE=Z!V2MQoRRNXn
z1`WJbibOpWku4G)w=1fpj8K0TXGwTeJYg@6Y)QplW-orZ79591E8j7k%WIp5{m8Xn
z8I+!qYG=GvE!(PEZYRpeC(%7%=gqd*q>5^1mn2Nw--{<y166*NtAGGhSz@(nB>j@L
zRvFG^fZ*p_Im4hVp=XBiep(MC{lFT|K-J8k2WWn{gu(G3pMDY4Jtw>FVX{~>PrgAs
zdbUWD4?UBUo`9Z}DZ-&=q-i+yS()@y92>$3FpE-ge);J*oNooFdro%U@6bd_@Pe{M
zLMZ~!$sp+$pAXq-5=Krdx33uYYJ$qzxrqVQM}F}KL#0k^@(`#*;+nCY7D!-_;Ces`
zV4PMX`j2g5YGPb92@U{5CrvpL**rB=7fE{-8$)(E5bH8Tomh);!yJ4NFkiRy<Jl+O
zRtQ>#@j`i=JM7JLP*Q@*n^u9w4aC;KTs9gGu2Lo(hXrS&WDsae)bfQ8QdOc*JjhkP
ztKf>foX)-{*$^{b^xxj>KV91YK-|!}jSjSaWH=91siU7SyN@FhC~c5rW`zhH<VR^G
zVR-V>(}AbllF)q2q5)^i3<?};QBpnZUY-+ei^EnlOL>5t8gwqN9AxN%yp`}P#|%qj
zeN<W;Dcw)jQgD9gL1)U+lgvT)a;@3%X!x`H2#?#ftFO*2p=zA{y7bm%XttFsXUa0W
znM_2ljYlto2J?6lW_A~Cxslfmg2JM?AmgaZ8s&1=#gloqv3JYI56QsYL4b2W9fEBG
zZfS5iD<W~5IAKFRq~||4W_r>eK7M9;>fd~zk5He@1F`^z!*0s*v7xztaVU0YyGcbM
z|Am+|I98F(2Yd@R1dqSH{0}bmUmOni4-SOtZ@zS#1!zH~bwH|08YpZhNVpa9Z`&2Q
znZNoFglMwIU%GD4iS{ay<wF;j7-CVeXrm69n<%`1Y>X@=L6$SW+1|1lT<mZd#0OlU
zrf;jp1qlhm5Azx*=m*^g-L0W#thuH#ERHt=5<!bYa`K9AIrU?jO-7r!L$|+*QvG-k
zZU~QpH@$%b%o`f{4;=awt1$iwcD(?{%l@8#K=ijlP%AfFq*vNBwuQ$mu9epubi-h@
zK@Gf6gDj`9v1Z)W{L04O*Pl2<L6h?LfWcs!5XeIa2HX6)fhAe|A+o=2*!cLaew|&)
zs;a7rH?s?F<>r;`m6es<qkt+YD7apjnU|fJOIPkk&jgpd5jT*2ZLsC>&o6eTo&E8y
zC3j@<C~j(_$|-qmmn4L|@c9`nPVo3#2{O=Vsd`07`E33OH2UsbRSMR6>HhEUy%Y16
z-#*)v1iy<o5T(-bBUIai+j!1tU*L0Upwx4B6=NzVlqCP{aoue$qrSe|k<W4FSC072
zRpKKO1b6HYp}-+yk7{~y)}ykslNUKT`hGpgsMhq(xsiEXrOcu4S=8WN*OB#=Vr=0h
z*9*)0QIPQ*%F;`V?~1tC&dZ!|Xnm~ULF<kSPd*-Xz2{8msziPb|9v>(wiNVzcp@@!
z2>E-beRxu2+s*02WjQyd#M8!d-!3kqV~sh#II2r=DS>0DP&Hr$vGVkY=8a0f^NmMV
zVjcY4KPE3}e;zK{A!D}JZ_zbT?r~7`U&FqrFQ3n!f4SN$b)q{uY((PGJ|3=y+IzVO
zs~3j7Lrc10<)+F*iqe_9xvbYRDcyIq%P~u*_y2sI6&Jq|Mdm3llW94;-b|@`bHX^`
z=Qt<6A4K#p|CWgT`=_6BF@?tb-c8I%e>OKY_mR_v^b*^>8$cY#<zL8FbTnxYMdwNM
z;=%i?T5iXBG?IS&RmVm7$RO>Ll&`n(;0>;dQA%lxy}2llv#w&Du5IzE8vfD#Ja~(2
zNq6V%{R#?Ev1OkIUot*y(U!dKMjY<mqg|DE&kdP*RLMV0a-U9kZr7E)1Y4scE3Zcm
zj;-o)Lc6k?>Ue(bki7KO_sjBXNB2T@?-SqQh-XnZvgM_0Irt!DuUvADSsx=eRoZY(
z(q8;mR`vCaTfZNNrC=fk;*12cpM>Pj(QHnptrcdBCC(%DKQyLNg2ToYI?tdkpUOG^
zm!KF1u_*8MCerXU;`z_-Zin;EmkGaB{NUcR->gaAB;d-|&iEnC;eeGjmWce~)sx2;
zd~agnD(<wmNPxau44TZ6<4g1WZIiXt+3ni04Z_DJZ0nQSs63wcOfOR|9!Lf<%(Zy9
z_m=KAd&<J#)-4v7&PEycQ=Y9Y`w?s(r6uhBomky|DBgcdzJ5X7?EdM&{s^9}`|usz
zVdH*FWp;@?-vZ1wi1h)&<OAnp1qeHZy0@A72Ff1%Fsu+X5X3abe~wP1-gsD4`NTdS
zc2!OLlc=ztOX)lLJN^s)j9#1JmVGTJpe?}6`%ag{e=9iB?32{4PPG_^Zgoq>bnRWW
z3O@<r>x*+CE|Pr`T?=NvF&^ypI5eCT=xgny_3jm1cYBzMk%hy}p(@3{RLw^p29_n5
zD_`H+I5weMCQc6=2=;Lg$^GjsqEDULr}WaIyCv2Ju2c~&)cCASNmX@LKxwk1D2tBG
zN?spTYULhVV$h#{e3M+{^@>XgaXWBST?PMREA%T%&do~wcf={19mfls@J$Ij%~Ui@
zSEHb!%<cV=9Pto8=6>LY;i&1xt#6sjq7+q<OpDA}_nv~vu(!)$S}jYzXiGQy?gSm}
ztj$BA_Vn3JdoRT*wQQ8sJ&K;{o72{mDLv&YOyi<$le3mKMhr;aeyU|TP9JY%b&M_I
z-A13>X?=V6?T|XdJ#V31SL#Zn_O`okY-0}Tz!V|anI4Y8%+5$h&!20J%DRtHZdwT^
zE(HD#wF<wng7TTIXpQnVc<*+=qOlQzai#W5rjEmZ*POojqb(OUyZ@!E=g8squgXjW
zt1{Tb!6bL3zw^XuMjWz)+xv*0e%NE<_{{oUT=n)vdTSf2AGiI?m#q#&UnO?Eam~FE
zA5^#yo}JzlZ&2wk;+BeCcarpo6VD)D&t%l2`PI5Uy=aj0N+5bQxwtId+Y%WYBWwi;
z^*U2|#%V)q_$^X14IuxP_sj0SIIH<(+h?JO)O=PWjtuLfce^}a`4z^iCIi_vu1skj
z?E8G~M$@q$3-w2n#lCAHUi59WEI&Sy49|;%^gn0Q)uVzRMVxQ(HVz?t`X>Gg_N8s`
zgE8OBa~(7u0X`__^%H!v;7i{lEE$p3Z{!DD1JKVl)0K+X-zGmWFLLTb4fE62?h7QJ
z@MXvhKG(t6iNzh#7Q#D^WmoMu@o_#WC=Y@`E%B|ys-bym(gmsDn(CX<^gB|n)w+;o
zztmEe`s2yClFJumctHagsmYwUQIsEk*SeG@-QBvQ+Ga71vL4TWFzf!8^y9yH_xb2@
z7n!y%ZX~`u8=~O)wGBVPzhlqEU1m~V4f-;Y%Y7-oHu%U;*f;8@WqMlNu_#>J{LfV%
zj)&dZL=x%uc}L&<=hu5|PGjkx48Ii6FC=$!o+{MvB8FAiPuVU#pQvTsix%9s3z4yy
zY}Ok@Q%3}PDd_DHLb+yZ1oU@lM90;PCkHwDEf|F@ob}u4swj&+R{8b7nH`bP*(3LD
zPaATc&mO2ol72TDWj`S8Fsa|ATXUri(GI#`l@w$wN?no<#`WHdVgF{Q!ocxPmB~i`
z`Ltnba*m@-1|0qLB+m!(sqfoamD#MfjKV$NLL4i8;tF>Md`?eidG<ZRkD3gG?+e!s
zY%Vy@&mU)@2kUEtYhaBGHlB}>#Y|gIA}0(&f(kL)33eVcom*BGVPV>NU-NJKTkp)U
z(_a>i)7+X?#jeKA0iid$<LAg!?Su!`0_ThaRL*|syl=uI4y+3(*K!iee|$~3{q2#~
zcYhI|mMwBwI8GgtT*s-twX0p{h%EdVQT)s(gLSHXYu{)>weTS8?WxR&B(Zr(@#87?
z>Kb<0Jm$G4vQ0f-0Df$1%|6jrV_o8BKbk6R$fK8%KMU;%5WM$lzfAnV9rLJ=j^?JX
zPUhUv+>nka<M;FB#B6RDurR%V_nX<7UimV+kN|Fq=crN5K@AOl9wAs1M`O3A^b18N
zR()taX>$6`lOt!uV=`Bzp0rqAc;AsIekptFmNRAFgH}lAC4xs|mD2{$Qt@YgA>5wc
zUBez#-WstdG0V3)w)k_}*9s9)aS|&Md1Z;mShijs=cW~_zOxCx<(}o*r1QA~t#$Gq
zOjOPBZxin%KR}UL%`9$t!5)tD*@)oFUw2<dB%{zfo^)%ZI!2$w8_#0(5BMaJ8}!wn
zruR=VVRceYiwi%J){czT39ZP>Dp$r&!>=p1?ozVP3&sC9OoW~37)X@p>eCAfo$^)<
z_O2K}Ozu#QczKKSXUk8kvm>`cXZ6V8N(JpJ94Ff9o|kxux>yL__TPO&U_@gsU?d|R
zK60Se<Uqde57LJ-*0U@nwO-Y!Cixs>Ra=wRWR~YyY|CyjVM*p#(nB9(&z29S>TXdN
z_0{s8m1v?}8G6;a8-s{&zc1f-uRU1iX0@E|a?1X6=SnGI8$$fjSdwoW%wTvt;w>UO
zGSEpRqq6O68fD{4l|;2)_Ts(wV^+vo!}P=%!PINW$j72HrO!x)_K)TH2Ctcr6Hi=n
zUA>sLhP3i0Mt{ZG4U0Dv6<*!`USKCbxb8JiCA^MfnIDiu&R#aFdD~-o+w&fWULm?W
z64=(@x46U@yD{T+Nwz6mHGksHx<^Urhj!6js+8`0A<GLE1qw68vWW@@9?e@_cgCJE
zq{<o^zlKF;e^l5N`zZbEgV=3XXODbYYS>OV`}B~l#L+Ro!GrJ}cfE@9zMd-8-IZ{$
z@7(T!!BWYD_E}$4fEjGwnm0V1!;zzU@|hJ=7UDjUofIJO6B0}6TRA=KuaZSJl9&6^
zHek%f6V({``B73ncH?)KMRe_7FLLG24^3;NR~;Q6RS<9su^l0gF4!xIpnK^UQ=_nL
zNBe$f9Pw;vv$<z58&qyzaJ+Pn;5m1zol|x%UFWgQ->=wEPAkagm2I<NnskfY9KB<Z
znl(~ACg4~USu|S{zRhR)p(V0`OPH3~sv?fymp`2S<?N<msVi1_+GQe9AG@p?;<Y=y
z^<#vfwS^1F3!>+LL{JAxYY1wubv;+}1+PwY^gFbx|B$;pJkT&;qQ0)EoZD5}8}Bgq
zrtYn`ubKRpP-4SF#|a^D->goanPW7V@f2STK9oi;uhu&<Y8RPVBGF*-^}=k5%s~T3
zbczH+>W4?qeTUPan|Q|QFWgvc7{_0ql^!De>!S8#QqpADlNrgx%A}E&9(DawtKP?9
zTo+I3kKDESn&pV+pBeRhvvEW&!eV#5@FcnD+d<mfLJFVrcwN?<;FOc@ve|->shV>(
z*IM$6cD;puEvX3GY3G}PO{KMU^flM|ZL)uT!moU<{4N#y$v;|YDbVz2Y49`BW0;xM
znx33W%iTq;K!2Gmm&ZPgQeJ*#&I62^H0~|XF8c9IpI!kgSC{m9jq9;TJr)nON}o#1
zC!Mm>JPG#Uc9wYWB;|N0gS7jp-uyDM@^#{cn&)*k@2xJ+ms3Lb1XtKyaX!~8)~j)<
z!dpCV&bNHmhP~HCH}BVxc3&AgP4dp?Sjq8j{0M*a^H&!SR5&LCK6wr$yQlfgR3$WY
d>`tAb=rmN-r~TAf5=K2wT)2C9<&_%8{{iM6r#}Dy

literal 0
HcmV?d00001


From 0ad7b779446dbedd0b70ad03afa1bfab80c333cb Mon Sep 17 00:00:00 2001
From: Couls <coul422@gmail.com>
Date: Thu, 11 Jul 2019 19:27:45 -0400
Subject: [PATCH 2/5] Update
 code/modules/mob/living/carbon/human/human_defense.dm

Co-Authored-By: Tayyyyyyy <Tayyyyyyy@users.noreply.github.com>
---
 code/modules/mob/living/carbon/human/human_defense.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 5dc3710f3b5..b26429a92a6 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -319,7 +319,7 @@ emp_act
 			B = r_hand
 		if(B && B.deflectmode)
 			if(prob(10))
-				visible_message("<span class='warning'><b>[src] Deflects the [I] directly back at the thrower! It's a home run!</b></span>", "<span class='warning'><b>You deflects the [I] directly back at the thrower!, It's a home run!</b></span>")
+				visible_message("<span class='warning'><b>[src] Deflects the [I] directly back at the thrower! It's a home run!</b></span>", "<span class='warning'><b>You deflect the [I] directly back at the thrower! It's a home run!</b></span>")
 				playsound(get_turf(src), 'sound/weapons/homerun.ogg', 100, 1)
 				do_attack_animation(I, ATTACK_EFFECT_DISARM)				
 				I.throw_at(I.thrownby, 20, 20, src)
@@ -558,4 +558,4 @@ emp_act
 	if(head)
 		to_chat(src, "<span class='danger'>Your [head.name] protects you from the [hot ? "hot" : "cold"] liquid!</span>")
 		return FALSE
-	return TRUE
\ No newline at end of file
+	return TRUE

From ea0535756897c278f02abb682d4836812ce439ce Mon Sep 17 00:00:00 2001
From: Couls <coul422@gmail.com>
Date: Thu, 11 Jul 2019 19:27:55 -0400
Subject: [PATCH 3/5] Update
 code/modules/mob/living/carbon/human/human_defense.dm

Co-Authored-By: Tayyyyyyy <Tayyyyyyy@users.noreply.github.com>
---
 code/modules/mob/living/carbon/human/human_defense.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index b26429a92a6..9bfdae11ee1 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -328,7 +328,7 @@ emp_act
 					B.lastdeflect = world.time + 3000
 				return TRUE				
 			else if(prob(30))
-				visible_message("<span class='warning'>[src] swings! And he misses! How embarassing.</span>", "<span class='warning'>You swing! You miss! Oh no!</span>")
+				visible_message("<span class='warning'>[src] swings! And [p_they()] miss[p_es()]! How embarassing.</span>", "<span class='warning'>You swing! You miss! Oh no!</span>")
 				playsound(get_turf(src), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
 				do_attack_animation(get_step(src,pick(alldirs)), ATTACK_EFFECT_DISARM)			
 				B.deflectmode = FALSE

From bf161edfeb6cc991e5faa4fb9619b6de4abdd774 Mon Sep 17 00:00:00 2001
From: Couls <coul422@gmail.com>
Date: Thu, 11 Jul 2019 19:36:25 -0400
Subject: [PATCH 4/5] grammar

---
 code/game/objects/items/weapons/weaponry.dm           | 4 ++--
 code/modules/mob/living/carbon/human/human_defense.dm | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index 9bdabbd543d..78f23b6c92a 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -174,10 +174,10 @@
 /obj/item/melee/baseball_bat/attack_self(mob/user)
 	if(!homerun_able)
 		if(!deflectmode && world.time >= lastdeflect)
-			to_chat(user, "<span class='notice'>You prepare to deflect objects thrown at you, You cannot attack during this time.</span>")
+			to_chat(user, "<span class='notice'>You prepare to deflect objects thrown at you. You cannot attack during this time.</span>")
 			deflectmode = TRUE
 		else if(deflectmode && world.time >= lastdeflect)
-			to_chat(user, "<span class='notice'>You no longer deflect objects thrown at you, You can attack during this time</span>")
+			to_chat(user, "<span class='notice'>You no longer deflect objects thrown at you. You can attack during this time</span>")
 			deflectmode = FALSE
 		else
 			to_chat(user, "<span class='warning'>You need to wait until you can deflect again. The ability will be ready in [time2text(lastdeflect - world.time, "m:ss")]</span>")
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 9bfdae11ee1..d147b52577c 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -319,7 +319,7 @@ emp_act
 			B = r_hand
 		if(B && B.deflectmode)
 			if(prob(10))
-				visible_message("<span class='warning'><b>[src] Deflects the [I] directly back at the thrower! It's a home run!</b></span>", "<span class='warning'><b>You deflect the [I] directly back at the thrower! It's a home run!</b></span>")
+				visible_message("<span class='boldwarning'>[src] Deflects the [I] directly back at the thrower! It's a home run!</span>", "<span class='boldwarning'>You deflect the [I] directly back at the thrower! It's a home run!</span>")
 				playsound(get_turf(src), 'sound/weapons/homerun.ogg', 100, 1)
 				do_attack_animation(I, ATTACK_EFFECT_DISARM)				
 				I.throw_at(I.thrownby, 20, 20, src)

From 6d7ee9c93483ec5e02f7bf17488eb8f9c356f4d9 Mon Sep 17 00:00:00 2001
From: Couls <coul422@gmail.com>
Date: Fri, 23 Aug 2019 00:40:44 -0400
Subject: [PATCH 5/5] use hit_reaction instead

---
 code/game/objects/items.dm                    |  2 +-
 code/game/objects/items/weapons/weaponry.dm   | 34 +++++++++++++++
 .../mob/living/carbon/human/human_defense.dm  | 41 ++-----------------
 3 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 073cd0df669..f9cf71271fc 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -331,7 +331,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 	else
 		return ..()
 
-/obj/item/proc/hit_reaction(mob/living/carbon/human/owner, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
+/obj/item/proc/hit_reaction(mob/living/carbon/human/owner, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK, atom/movable/AM)
 	SEND_SIGNAL(src, COMSIG_ITEM_HIT_REACT, args)
 	if(prob(final_block_chance))
 		owner.visible_message("<span class='danger'>[owner] blocks [attack_text] with [src]!</span>")
diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index 78f23b6c92a..f42decd4363 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -171,6 +171,40 @@
 	desc = "This thing looks dangerous... Dangerously good at baseball, that is."
 	homerun_able = 1
 
+/obj/item/melee/baseball_bat/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type, atom/movable/AM)
+	. = ..()
+	if(!istype(AM, /obj/item) || attack_type != THROWN_PROJECTILE_ATTACK)
+		return FALSE
+	var/obj/item/I = AM
+	if(I.w_class <= WEIGHT_CLASS_NORMAL || istype(I, /obj/item/beach_ball)) // baseball bat deflecting
+		if(deflectmode)
+			if(prob(10))
+				visible_message("<span class='boldwarning'>[owner] Deflects [I] directly back at the thrower! It's a home run!</span>", "<span class='boldwarning'>You deflect the [I] directly back at the thrower! It's a home run!</span>")
+				playsound(get_turf(owner), 'sound/weapons/homerun.ogg', 100, 1)
+				do_attack_animation(I, ATTACK_EFFECT_DISARM)				
+				I.throw_at(I.thrownby, 20, 20, owner)
+				deflectmode = FALSE
+				if(!istype(I, /obj/item/beach_ball))
+					lastdeflect = world.time + 3000
+				return TRUE				
+			else if(prob(30))
+				visible_message("<span class='warning'>[owner] swings! And [p_they()] miss[p_es()]! How embarassing.</span>", "<span class='warning'>You swing! You miss! Oh no!</span>")
+				playsound(get_turf(owner), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
+				do_attack_animation(get_step(owner, pick(alldirs)), ATTACK_EFFECT_DISARM)			
+				deflectmode = FALSE
+				if(!istype(I, /obj/item/beach_ball))
+					lastdeflect = world.time + 3000
+				return FALSE
+			else
+				visible_message("<span class='warning'>[owner] swings and deflects [I]!</span>", "<span class='warning'>You swing and deflect the [I]!</span>")
+				playsound(get_turf(owner), 'sound/weapons/baseball_hit.ogg', 50, 1, -1)
+				do_attack_animation(I, ATTACK_EFFECT_DISARM)					
+				I.throw_at(get_edge_target_turf(owner, pick(cardinal)), rand(8,10), 14, owner)
+				deflectmode = FALSE
+				if(!istype(I, /obj/item/beach_ball))
+					lastdeflect = world.time + 3000
+				return TRUE
+
 /obj/item/melee/baseball_bat/attack_self(mob/user)
 	if(!homerun_able)
 		if(!deflectmode && world.time >= lastdeflect)
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index d147b52577c..d172fabef00 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -141,19 +141,19 @@ emp_act
 
 	if(l_hand && !istype(l_hand, /obj/item/clothing))
 		var/final_block_chance = l_hand.block_chance - (Clamp((armour_penetration-l_hand.armour_penetration)/2,0,100)) + block_chance_modifier //So armour piercing blades can still be parried by other blades, for example
-		if(l_hand.hit_reaction(src, attack_text, final_block_chance, damage, attack_type))
+		if(l_hand.hit_reaction(src, attack_text, final_block_chance, damage, attack_type, AM))
 			return 1
 	if(r_hand && !istype(r_hand, /obj/item/clothing))
 		var/final_block_chance = r_hand.block_chance - (Clamp((armour_penetration-r_hand.armour_penetration)/2,0,100)) + block_chance_modifier //Need to reset the var so it doesn't carry over modifications between attempts
-		if(r_hand.hit_reaction(src, attack_text, final_block_chance, damage, attack_type))
+		if(r_hand.hit_reaction(src, attack_text, final_block_chance, damage, attack_type, AM))
 			return 1
 	if(wear_suit)
 		var/final_block_chance = wear_suit.block_chance - (Clamp((armour_penetration-wear_suit.armour_penetration)/2,0,100)) + block_chance_modifier
-		if(wear_suit.hit_reaction(src, attack_text, final_block_chance, damage, attack_type))
+		if(wear_suit.hit_reaction(src, attack_text, final_block_chance, damage, attack_type, AM))
 			return 1
 	if(w_uniform)
 		var/final_block_chance = w_uniform.block_chance - (Clamp((armour_penetration-w_uniform.armour_penetration)/2,0,100)) + block_chance_modifier
-		if(w_uniform.hit_reaction(src, attack_text, final_block_chance, damage, attack_type))
+		if(w_uniform.hit_reaction(src, attack_text, final_block_chance, damage, attack_type, AM))
 			return 1
 	return 0
 
@@ -311,39 +311,6 @@ emp_act
 		throwpower = I.throwforce
 		if(I.thrownby == src) //No throwing stuff at yourself to trigger reactions
 			return ..()
-	if(I.w_class <= WEIGHT_CLASS_NORMAL || istype(I, /obj/item/beach_ball)) // baseball bat deflecting
-		var/obj/item/melee/baseball_bat/B
-		if(l_hand && istype(l_hand, /obj/item/melee/baseball_bat))
-			B = l_hand
-		else if(r_hand && istype(r_hand, /obj/item/melee/baseball_bat))
-			B = r_hand
-		if(B && B.deflectmode)
-			if(prob(10))
-				visible_message("<span class='boldwarning'>[src] Deflects the [I] directly back at the thrower! It's a home run!</span>", "<span class='boldwarning'>You deflect the [I] directly back at the thrower! It's a home run!</span>")
-				playsound(get_turf(src), 'sound/weapons/homerun.ogg', 100, 1)
-				do_attack_animation(I, ATTACK_EFFECT_DISARM)				
-				I.throw_at(I.thrownby, 20, 20, src)
-				B.deflectmode = FALSE
-				if(!istype(I, /obj/item/beach_ball))
-					B.lastdeflect = world.time + 3000
-				return TRUE				
-			else if(prob(30))
-				visible_message("<span class='warning'>[src] swings! And [p_they()] miss[p_es()]! How embarassing.</span>", "<span class='warning'>You swing! You miss! Oh no!</span>")
-				playsound(get_turf(src), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
-				do_attack_animation(get_step(src,pick(alldirs)), ATTACK_EFFECT_DISARM)			
-				B.deflectmode = FALSE
-				if(!istype(I, /obj/item/beach_ball))
-					B.lastdeflect = world.time + 3000
-				return ..()
-			else
-				visible_message("<span class='warning'>[src] swings and deflects the [I]!</span>", "<span class='warning'>You swing and deflect the [I]!</span>")
-				playsound(get_turf(src), 'sound/weapons/baseball_hit.ogg', 50, 1, -1)
-				do_attack_animation(I, ATTACK_EFFECT_DISARM)					
-				I.throw_at(get_edge_target_turf(src,pick(alldirs)), rand(8,10), 14, src)
-				B.deflectmode = FALSE
-				if(!istype(I, /obj/item/beach_ball))
-					B.lastdeflect = world.time + 3000
-				return TRUE
 	if(check_shields(throwpower, "\the [AM.name]", AM, THROWN_PROJECTILE_ATTACK))
 		hitpush = 0
 		skipcatch = 1