From 7f3e5ad3d067338242b30df520da928f825ced4c Mon Sep 17 00:00:00 2001 From: EgoSumStultus Date: Fri, 2 Aug 2019 08:07:00 -0700 Subject: [PATCH] AAUUGUGGHHHGHUGHUGHHH!! --- code/game/objects/structures/femur_breaker.dm | 13 ++++--------- icons/obj/femur_breaker.dmi | Bin 0 -> 2130 bytes 2 files changed, 4 insertions(+), 9 deletions(-) create mode 100644 icons/obj/femur_breaker.dmi diff --git a/code/game/objects/structures/femur_breaker.dm b/code/game/objects/structures/femur_breaker.dm index 8583e3d353..3ade89fbb7 100644 --- a/code/game/objects/structures/femur_breaker.dm +++ b/code/game/objects/structures/femur_breaker.dm @@ -33,7 +33,7 @@ msg += "It is [anchored ? "secured to the floor." : "unsecured."]
" - if (breaker_status == BREAKER_SLAT_RAISED) + if (slat_status == BREAKER_SLAT_RAISED) msg += "The breaker slat is in a neutral position." else msg += "The breaker slat is lowered, and must be raised." @@ -87,8 +87,8 @@ icon_state = "breaker_drop" addtimer(CALLBACK(src, .proc/drop_slat), BREAKER_ANIMATION_LENGTH) -/obj/structure/femur_breaker/proc/damage_leg(mob/living/carbon/human/victim) - H.apply_damage(200, BRUTE, leg) +/obj/structure/femur_breaker/proc/damage_leg(mob/living/carbon/human/H) + H.apply_damage(200, BRUTE, pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)) H.say("AAAAAAAAAAAAAAAAAAAAAAAAAAAHHHHHHHHHHHHHHHHHHH!!") /obj/structure/femur_breaker/proc/raise_slat() @@ -102,13 +102,8 @@ if (!H) return - var/obj/item/bodypart/leg = H.get_bodypart(pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)) - - if (QDELETED(leg)) - return - playsound(src, 'sound/effects/femur_breaker.ogg', 100, 1) - addtimer(CALLBACK(src, .proc/damage_leg, h), 32, TIMER_UNIQUE) + addtimer(CALLBACK(src, .proc/damage_leg, H), 32, TIMER_UNIQUE) log_combat(user, H, "femur broke", src) unbuckle_all_mobs() diff --git a/icons/obj/femur_breaker.dmi b/icons/obj/femur_breaker.dmi new file mode 100644 index 0000000000000000000000000000000000000000..a22fc21dcbe953a79ee2f9fceca0e6c427bc3543 GIT binary patch literal 2130 zcmaJ?dpOj27yk~EJIN)Agp|u$D57Q52>VhRa-Cc{f2c zTC^huBZ@Ye@M=ViL@vWx4GBBu9X;><`=00dp7Wf~=X=ice9rmfWVoXKEibcQ1^^)M z4bP5!MOHNLX3`BoJ_+K91d@gkkvv+Bt!Q`-~ajlkiDF71Jo$PHr zu9hs7%6pHVQ%u(xHPAJbx`(eeSNAyGq((Mud&=_Oa~{t4>23-FA>*F z?)q~2b>902s0yzxk^Jul?O!{Cz{iD~=-0N)lb^Kb_jGt$`s+h0sv1c@N*cIvxtv27m9iu#_1V4SvKG*Q6)fZoe)Q%l6uecSWvdVeVVi+Xg4il>%M{q2kwtoP ziy*fIt9?*+H^#IV?m8T-?7D!`SI#MLEbM%~ItRb|Z0Hrt`2ZbhV+EU8A{oJN^Fo(M zEO7tn5Dbp)M@gz+_E{gmK-Ja<9wDR^OhYRl+|`GP9bu4-5|#8YF^?HZWpJ5-4+~30 z`kgy)>x>f%a-!rTa4M6=iG!xd4Fpb;9#Lkl=xXe;U)q4CFTYELP4k8BC|k=Po&b4e z_w_Th*tBS*KJz?Pe6nRG2QlCMB}DFRhK-&i^egQNIJ_8t2(rCyLK+nAejzp9uqmiQ z0h9FQiDz8{Gkh@d4UcGNwgic*SNM8)gh3oj4$X-K*sc3rD!VWsEl%uIYgykcgTY`+ zei%=j*!oE7lQ8uOgM>%@IQ}V8?cHnhWe)do@?VEGIw?I8;H=8IT%k7hIN?6@$_iG(ZRWq2n!7U9@*r(slehk2I!L(k@nhi2?@cWmF9~|cg4hP1XS|nJ zR@zpk#}hkJY)&`8Zoi`-d4CbV{?@LQm7+Bk-xby5^X4;cy^C*ba_j{3o-8l^k41#+ zjS}djuBBD*#;C~ym$}}*qoU|Mp+}rpZwkC=+r^W6`Ik}N)*tWETlX$&CyA=l2vmT=;BYxt6ecPJQ}8e-&F+=C7X@aNE)tG*!)S>CofTzYc}o z__k9fXIj+}?7h`n$L0+hB{!3AQN`4&I}YVPCo&f|nW&q!#Afo~8Q6!K4nFhmO++K9 z#a@RatX_aCk_6>7C}6vjJgwnv)u$-_Z;YRov-+MNv%9uiin*Qbd$4!chu6jBBg+SD z7j&V4N>7f^Y2C7RT zVpXe_a9A(Tfh?lxc;tA70yEwVf6O zL0ghvNPCcP1>%V<>e`drsR)13B8A8@V=<`~s&ni@H7dd%D8>uQ b@svq|Z_{EnlY*WW-Av%*fU>VUi@Ek+)i&>F literal 0 HcmV?d00001