From 85c0c763dfa4ca6ff81e29fa17fd1d921e0843f3 Mon Sep 17 00:00:00 2001
From: Alberyk <Alberyk@users.noreply.github.com>
Date: Sat, 5 Aug 2017 15:04:18 -0300
Subject: [PATCH] Fixes throat slitting being broken (#3232)

-fixes being unable to slit people's throat
-fixes the sprite of make's custom item being wrong
-fixes the infestation event using the incinerator area, something that don't seems to exist anymore, it is replaced with the waste disposal now
---
 code/modules/events/infestation.dm            |   4 ++--
 .../mob/living/carbon/human/human_defense.dm  |   3 +++
 icons/obj/custom_items/make_items.dmi         | Bin 1418 -> 1428 bytes
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/code/modules/events/infestation.dm b/code/modules/events/infestation.dm
index 8b427efd2dd..b14ec08cbeb 100644
--- a/code/modules/events/infestation.dm
+++ b/code/modules/events/infestation.dm
@@ -68,8 +68,8 @@
 			spawn_area_type = /area/engineering/atmos
 			locstrings[numlocs] = "atmospherics"
 		if(LOC_INCIN)
-			spawn_area_type = /area/maintenance/incinerator
-			locstrings[numlocs] = "the incinerator"
+			spawn_area_type = /area/maintenance/disposal
+			locstrings[numlocs] = "waste disposal"
 		if(LOC_CHAPEL)
 			spawn_area_type = /area/chapel/main
 			locstrings[numlocs] = "the chapel"
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index b3f287255f9..b7d0ec9fa1a 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -151,6 +151,9 @@ emp_act
 	..()
 
 /mob/living/carbon/human/resolve_item_attack(obj/item/I, mob/living/user, var/target_zone)
+	if(check_attack_throat(I, user))
+		return null
+
 	if(user == src) // Attacking yourself can't miss
 		return target_zone
 
diff --git a/icons/obj/custom_items/make_items.dmi b/icons/obj/custom_items/make_items.dmi
index a124f278f2a102c77fc15b3997028fe085f3d96d..1c4c86aa13752be7f07ccdb946d18ce660681fee 100644
GIT binary patch
delta 1187
zcmZ{iYgE#A0ET}c8l5cXSw|qTw2srHkrj$rVG)Q|D6^T@FuOR<ywnNJOa93%YqV?*
zb7?LsQ)V5kOr56-LQYXDh15(9F!papC1i*|pu+sT%eVJ=&w0=L<>9TUSn;C-5{1+D
z#Ga|qDnioTPvE=ts;ebV7U%VQCu7k8*y)XscoaoEPZjLbA+O--Hhrj&Ec2K~t)gCV
zb`nYy3BJB=Xwp!3xPF2v@y6}EhK&pqy;wNz-^`iCsX`Qr!U044$G6=D^7&_RKE1lG
zNn-)EUG%aLtX41u!fyK_G%;W5YR>x_Cmzc<FpR+z9oA%Odk0Spq^Vp}qm`C;Wv)zX
zZZpyD2-Tr~(f#WBWJ|;8ODm34AKdclE@@qBz2(<0ja`oMiJ2)?H6)=haM<E86L&ZX
z?VPsei)?6i_r*Th6rOz=zJB~5jb=OZNIP$9x$^v%ej{UyDS(8{3Cl~q61Nk$m57T+
zpL}$af8z0Bk<1S~&d6+S{0WbC1~s`p=PHO!fT-7i4!h~aRY6F|E*s7SN0A>6Ai8}-
zfr-yPS$jtXmj-ZDJ$;pDx;lI0_-2t^4@c36d)cTiw<#|+$<jJ{H~TdslpkWP(hqZa
z8&88esJGT`C0I1I5S?;yA;+BPy1n)cv+V}e(Z3jGRo5*1tm4pUuyn+H0OuJ!av6b&
zE|!(sQ~fJ^epB*>D(N)1SGY2N3mZkpWH_ROM?ZH}!Iye0-(`Q3RLne&@#FFzv0|<Z
zt<2e`Z4`Y^_M1s{cO3G5;Tm%O97_#D8m~DGDC)Xj^C`<SNQ6U`A-HK^0t<qiz`x_}
zFhv%bujmM;dz^sJBJyWm4Gc;odz5?8-qS%FguuS|?3Qi8D4c6E70nMldbf@>#e0f;
zT3|SIgOW%z%Gcge=_2doJ%v~@FStL9AYOnvkEPkXlyG8YebnH~LhP+;4I3+uolm*k
zN?HC+sqBYSrG}kVRaL#}hM4#HDU-Fs!Q9Ty&ZsQuN&JR;;}LzF<db-xIX@u>Fc^#~
z#T%>jv75`;{nADbsK7e_0SA05@zi;xvoyeDHXGKKm|9kfn>PiJ$(X6_o0FmXW1ubb
zUPS$RsZ<)%82fu$X6R@9T*TWpA(O@G@^@|=&NzZCJ^e(H_k-tJEfQ<_v)@C-;4#L5
z4YDiE<!X5#XaZBRQ+W?E$NT(=hxM@$;rE7LtLw*Z%TGC`w<eUvL<Ew_s*|&P`Bvas
z{yxVyGBVO!+Brd}*carKKtb&*XyNZh;i074U`(t2h`wR6EjFjDyGbI5Tg*Cx6^tB;
zkC&@^Zn7UbU>CRN4rzM^U#F8AtYpMuF;v|_3D_^i?EnLYqj`B|wPEWYMg%gbEUmrC
zJ%2}YSzpmvF3q0bLQHJnpTbLJACjaTMVR4v2O1eyEjYK@#Q{ixcniqkPodoTGblG`
z3BAX#F;2#UT{<tAH?j=GRbK$fCLLzweHT!+#8Qm|cj-l}w}OcX!zQje^?#N5Z;}4d
a&TRYsfjrA4*pUDLSPsJJOj;9_UGg^v^+${V

delta 1085
zcmV-D1j7523yKSn!GE+#L_t(|obBB|Xd7o7#_`{kfCl*tB17m@2sIeusei!P1TKX_
zr%>+#j~SyZ<&?n(8R8TUN{0>xt;OA1C@2;PG{nY9@ZdneB^f-J8cR0TWqvz2vUTS(
zzV~#xyI0TiS?t)s_ge4wUY*Xqv(@QzgmB%;djO<wr`1%W|9}4W`<j*XYZ)29+G<@@
z7Z(B_>ul}G<0sD(KM-++AN(x09ku<=)}DwoRniDPOJ!6U+G#aab#Xy#yDYX{mimLH
z)E_jZy0{=~tMx0Blcu%Rx;lTrgQ|-Qkzq_ic>CcUL6>FHF~D%ox9zfsi2U_pJMj5Q
z?}a<9>-V&sR)14vwGu?FfJs*XBLfi0cG)eW(G_Q$$HJ%p=&H5Vx*BIkU;yBZI|!t7
zF#vF5p9lE!x2IQL{`~atXV`-?(<D9y7@hdaZ298jCubio-e(BKryW4l#NVmRUVQ$)
zlQR*y41p08o7PjnaPlj&<-nv54JUv2e@0gWDyG;041Xto{)^A$pEqwsK8XDA)jbh8
zpLkBTnPLSny61<5C;!*)S|TFy;~(FoGC-QF8v}@%{HQ(uL$5E7Zod+#EQ^T9quU$u
zOOFv0U91%#>R?Yq0+TNy=M%oMarr(KUaSC4&OS<Iwj4OfyUysuBmc0*6gQp;yzXUO
zc<&G6<Pe)7_IUuF@taQkX&^ZMFbI>~1RZ~XnA+`jCRhKCOLv^w*9GKxZGN5(4i54j
zLM*!D)LH@Fz1&cLKYJyet-Zi?>RDbNPwCQL0e*k+P#!;7p6b0lO1ImUTCJA%Fm9wf
zPOTMS{{FHxe;;r19mi3&ZRb6VSZv!C$8ln>#zr3mZf|dA^0edozRb+bWU;AK_`ZK1
z`~Mmpz~SLxCfo5m&&q0B;~ESG;(1=|RodtPj*gBp+t&K}x)D!(y5lrD02&_y0B3Xn
zy<RWxAsEl-0QUFy^B#inj19nX95pvLr}dhbt}-$J*L78?RFdQ4V=0wN;<_#)NXWPV
zT-Q~nr>A0BmQ*Sgu`Em4?e=R%kc?Py0StY4_io@VC1Y#=|Gs}8cuUC`8vs{;bQpPc
zu<N?YvM$efDy5{+Xc%#-wrGr80UC{lrIeD*&CS=G{P7qWfQU%H-<PGOrLX(_=sT29
zJVrhRP<o7$Km;6WoOS?3y-t48<0|U+9i}@@?Es2;o&2Q7Rn+f0Y@+uEpy`t+fR&Y%
z!YzljT5Y1g6VUB;C;8=5qdQKm0EWMVuX_!;>3DyDPki5(-QC@b_fhcv0H1iCXAK4e
z?Q76YH_i74;BN$h<ExYJ1R#^{1RgS{{kMasO|@FhdkDGW{Q<!7{s7>33;>Sz2LQ+W
z1AycG0l@M80N}LG1L*#JdMY-)3X|UiFq7^C4i^6d_ZHRqA>CG100000NkvXXu0mjf
Dxnd!V