From 464a589c255f5421aa73bd0672599546b766f5d0 Mon Sep 17 00:00:00 2001 From: EgoSumStultus Date: Sat, 3 Aug 2019 07:34:32 -0700 Subject: [PATCH] *sobbing noises* --- code/game/objects/structures/femur_breaker.dm | 10 +++++----- icons/obj/femur_breaker.dmi | Bin 2675 -> 4949 bytes 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/objects/structures/femur_breaker.dm b/code/game/objects/structures/femur_breaker.dm index a71bb66315..650fb4439c 100644 --- a/code/game/objects/structures/femur_breaker.dm +++ b/code/game/objects/structures/femur_breaker.dm @@ -1,8 +1,8 @@ -#define BREAKER_ANIMATION_LENGTH 9 // How many deciseconds the animation is +#define BREAKER_ANIMATION_LENGTH 9 #define BREAKER_SLAT_RAISED 1 #define BREAKER_SLAT_MOVING 2 #define BREAKER_SLAT_DROPPED 3 -#define BREAKER_ACTIVATE_DELAY 30 // Delay for activation +#define BREAKER_ACTIVATE_DELAY 30 #define BREAKER_WRENCH_DELAY 10 #define BREAKER_ACTION_INUSE 5 #define BREAKER_ACTION_WRENCH 6 @@ -49,7 +49,7 @@ /obj/structure/femur_breaker/attack_hand(mob/user) add_fingerprint(user) - // Currently being used by something + // Currently being used if (current_action) return @@ -88,7 +88,7 @@ /obj/structure/femur_breaker/proc/damage_leg(mob/living/carbon/human/H) H.say("AAAAAAAAAAAAAAAAAAAAAAAAAAAHHHHHHHHHHHHHHHHHHH!!", forced = "femur broken") - H.apply_damage(75, BRUTE, pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)) + H.apply_damage(150, BRUTE, pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)) /obj/structure/femur_breaker/proc/raise_slat() slat_status = BREAKER_SLAT_RAISED @@ -102,7 +102,7 @@ return playsound(src, 'sound/effects/femur_breaker.ogg', 100, FALSE) - H.stun(32) + H.Stun(32) addtimer(CALLBACK(src, .proc/damage_leg, H), 32, TIMER_UNIQUE) log_combat(user, H, "femur broke", src) diff --git a/icons/obj/femur_breaker.dmi b/icons/obj/femur_breaker.dmi index a166710daabf306cfa61856c8ec6894d95a359bf..4b36f4b2b83b611569c3a77b51515f66fe9e13bf 100644 GIT binary patch literal 4949 zcmcJTdpy(q-^VA6oGV36Qz$BjeoJ$h4JE2ejwPY#>bg+6m{U%(B}qjN>56igN|B1L zT*bm>qD|O3Ic02(wj#rZ89UtH)ph@V*LC0j-2dE<$G-b~zMs!$@9*LBem~!@_b&S$ z^3+r_Py>NLn)|)>`h!3U?eara5g1vu;^hW3VZJ{FdbGE4*S~w%NAl{SXbAeuC_YB_h95NC=WLmJ8LVWjT=s) zjwL6=9QHlv28UT&nkB@X$~m6_SmqsAc@CIUNc2Ax0CMFFMF1x^(*lns?)^34Wc(>~ z;;Gme5GbWQ;0QWCNjM*Xo?DpMcF=kot(P9~=;&KDv7C;BD3T zIL-uD?_8f}lQZI;B`Mt1*!OyAaJkd0jTf1xw8!RGL*UF9@{kWQ506atiz8_Vcc2RM55-h?sN87e>8ThFDq-=oBQ0e zaEkMFL)(hSagd7ja#<^=GDFRjtLqdkZz0I+%75&cxPKk3pP!o*wKCUWrp-=UbZY+yciZ#r9?b7s*X_>y;S5x zUv9X!oPwEB!DLJ&T`60X4z*dw<~JK-QHFUb(=%%PkKxq8wWvM7xkf|7ZU^$!&wZ57 zPggFsjMW#EYA1sgc^dl|26;=z*wNGq@=L~11Uhq3m4AZ*7N(v-x0_`tnrt-UzhUJY z_LQkFC1G7NltlN$^zm^>CnV^hXJ=4ZpBlf$9M-c8@owCWlPuacnv*tsw+m)$g!e`# z736WXm|Y_i#dFPBD{vkQI_4OH{N}krJv_@TDdCzoj2e}$N}B=2_qDE28ZwKi3kjM5 zN+Q+oZ_6cH%K`qxyS_LQ0&>(Ww?~wbJFEE#-ST3=w45F5^&{R$c7?Y;RFfz%x|}X7>}@FKPanm7T=phbW++@IMWR4+Dqk@J_*!CcGp5xt+>Sb!d)##5 zle!Z81!#ceFWJK6eO=8Nkqn;+M^vVM)bGXHF}=8rh+gePg)B=Z%^;6I_lRtXq8|rM z_>{(03nD{EMM)%%M@Y@e4%X9axTI#Ibe8N4y~4$wD@^?`W|G* zTWwU@NDR}Ic|!VhguF~2`OOJJkC}N678r9vzKYLJji449wXBcWMDI~<& z>EogLp?D~0PLY%TRlH`Qu_ktOR5KBcbLO$6XBlLL0w;%BND>;i68nKnKKtRsCT-^( zL-|hM)EDgaE$2uwsl-Ff#K|Ok#H8^#Bz1eQ?C| z#ylghj!BDI?#~E$K&1qbM|Cxu%kC&72kc_6=fqqw;q+>^f@d@i&C*y(Kr^?kn-H<+ zGfO1zoG~;K5XmmI!&CON0;{x3c%Qcl$vu%}UTN`bsL|MeIj~nNhTILXb*;~S-`y7^vRC{q^QZ`b5ZqBWM{@rlyJ5o@#jOz#QOS2h z1>&jJ8yCfJVTm||5k;jZ;JQg&hbOomSzAb@hMJ;OEJT#t{I(F!RXHFvMx+u)Ef(&& z6{C798Ur{ZVgATx1)-d~V`+xIPNXXeCpBrQiU+tnN=MzXPN#8Cz@2F& z&AvF_3B9-`gX2k|X%>88otofoBC%cXAb%z<_DQa4(t(MoVJlreFpS1Fm2Vd5iLBh7 zeu}VzG}t?kOCFQ=A3re`QglPC&afpgwDljY=Zq|9O< zTY4_$a3XzsFWt;NXGx^%(%E8vyPNcSls{af)P2M)hTP3kYOq5BKsPHwy>83&YY&f3 zjCPHZXNWx}21c`96D9Epewhz6D`!{5R;3AT}7W4~6i8vF8tV;ZX(m%Oou0Nvjym+;MQnU4_j2@v# zDRGh6p(H*0sdDl;=PZR}u$lA%0jhtMZcq-D&m0S)Hsv}u)5o=Vf@UB;C!u|jldN!z zpNh&LY_|+OiSY=OZS5$lL>;eOgG)_McN72Cl97eU5%t8VOd(^N(3oMtdOyjxPu})I zIa3|_+Q{c->;R_DIc7mQ+wUxINtTW(|DY*4(vI!iTS1P(46v+#pJB&+e!3kX5Ec|9 zcOnr;q>hX+gWQA+m&Q4?FVC#F7%^+b`!oZ-d|()s{~)y@wjIFeE3Sq#0()|C-dY(D z0di(arvG#I(nV%%R(e2`)UdXq#h#>)ocltNcVyZVz~ASXH|>V@DMh-XXa5a7mbviZ zCu_q8J(M!#@0dJ2VJ%4ca9i%J;p~L^VP{i}tQKDD&9ws0{8T~JZ5X7$NbpVWKFy~> z(5_B$m;HZF?#D6Mv82h|&|2I4*r&@~TyEF{Vtdze$I|_Ws2@`ewjWAf!NM{cE#b%+ zrv(q24|)_>u!JoT)CZziKWCi4yzjR~$fvpn^(GIFm(^n*zXK-yP!sMMahP=jumJAJ zdcPk_0|xMLX8na__LTaI+?S-ba~^EhYS^eG`9M4tTfsB_j5~P_X4voZJ@xSsb!OPi zx(=~r1-|94=Xn$>Q&0qR!=FTCRWC0#xf|LwUrGehUgu--CEL1_dFie4<;bT$EWPT_ z5f0X;M=F9#u)(clvD5by**Oi;K^>u3aMp7?zlw`OAKB*l)Y^_h&^U=BF~%GqO&O!5lae1&vuXfmBmpA2kDhC4Ls!K1c{e8Q>E$-boaM zLZ^oVc+U%3bAKh?EZ|`CAos1IjIPleXs4Hu<&|*W14P9Ga847S9N81Bd<0 zYG2c~YT1#P$;Izvj{8dxQ;r4PWZoSGtsn2#Hb3iIVlto~U)S=K3a z^?WSW>%w{Z-vA;9sGwrpBKT{866y*NF*hM8?=gu>YaL%UP(5b>Faf+Sx2GeN3lr2T z>|q2z(^BTX2brAF-_fmy$HRnj*YCR{mAriELet&>L(XiObj|{y9uIEcgnTk2Zrwad z0WYMU@ufoiTbIP}^$W5yyKy==Oj_Dr%)+0+Zp8h3AR@5UM5rn{Qinw|?Sz#g>yJEG zes+LPZ*iA2XD!2dRfqy-OO~IC^1@@cC`>`Y*SVWOq}bHTT1OFPfM#tol|COKx)Hm? zpQkkkaM;w$aRF`}aJ^PQLB3-cUgwONwl|fgXSFYtyRnuT#Mt-%S8V0KFWFS;ob_hu zk=vJLG4WKhUm;#dWRlDPo?=X;sY5t-B1JqdST}%^Eu8}lL+9{Rx&VBS0JH3Cb2~Q! z@F)|&_Lf`h`yASEk?1V$uGVBM#rOj=|F66LalY$G*fx?m!utxom_5aKD!l~RnVfs= z?%c3_!?Q6K-mVb5zIQq{+aFPN-8M?oondgH*rGf0MZ}< z0raoVSNqhLIV;-Z20il$uqO#iiRW&}J*-ScvrVoK9;v2iPeXEYmvPPbwXn-vMa5ca1tYofPZRf*?aB!Gf6R81Lte2-A;!{*626q6)lw zpr~>KimDm20zz$ePff0d8h>hY)_F`TwF;=C3`|AYq1Wk6x$hc*AxoF-)WPV*B2+~# zUz9RndcA=wERw-VuA^oaRHhl7;_+E4b~7b3kO!!qUJvhzSU?=-zIO2df~)P6ONb2aou4J4^W^%zaXsin~JD;mcFF zRscg+xz8w5p?uYBzK_wTxJX;qN*Kh~pO>sJ8qx}sZnR4_X>=v1cp)wW$}o#VJGsH+ z^cm$g=HA{4!~HzfE~YXK=twVl1Oj!%7=uvsLA+SK8xqT7c%8-;OiCYE1O3o}%~r;u flmza1smkJ$wP+Q_do=Km6==W5p}qC);phJgly(yl delta 2622 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