|
55 | 55 | if(findtext(streak, DAGGER_COMBO)) |
56 | 56 | hidden_knife(A,D) |
57 | 57 | streak = "" |
58 | | - return FALSE |
| 58 | + return |
59 | 59 |
|
60 | 60 | if(findtext(streak, FINGERGUN_COMBO)) |
61 | 61 | fingergun(A,D) |
62 | 62 | streak = "" |
63 | | - return FALSE |
| 63 | + return TRUE //don't upgrade the grab |
64 | 64 |
|
65 | 65 | /datum/martial_art/liquidator/proc/hidden_knife(mob/living/carbon/human/A, mob/living/carbon/human/D) if(findtext(streak, DAGGER_COMBO)) |
66 | 66 | var/selected_zone = A.zone_selected |
67 | 67 | var/armor_block = D.run_armor_check(selected_zone, MELEE, armour_penetration = 40) |
68 | 68 | D.apply_damage(A.get_punchdamagehigh() * 4, BRUTE, selected_zone, armor_block, sharpness = SHARP_EDGED) //28 damage |
69 | 69 | to_chat(A, span_warning("You stab [D] with a hidden blade!")) |
70 | 70 | to_chat(D, span_userdanger("You are suddenly stabbed with a blade!")) |
71 | | - A.playsound_local(src, 'sound/weapons/batonextend.ogg', 15, TRUE) //sound only to you as audio feedback that you stabbed them |
72 | | - A.playsound_local(src, 'sound/weapons/bladeslice.ogg', 15, TRUE) |
| 71 | + A.playsound_local(src, 'sound/weapons/batonextend.ogg', 25, TRUE) //sound only to you as audio feedback that you stabbed them |
| 72 | + A.playsound_local(src, 'sound/weapons/bladeslice.ogg', 25, TRUE) |
73 | 73 |
|
74 | 74 | /datum/martial_art/liquidator/proc/injection(mob/living/carbon/human/A, mob/living/carbon/human/D) |
75 | 75 | var/datum/reagent/picked_chem = default_chem |
|
161 | 161 | combined_msg += span_notice("[helper.injection_chems[chemical]]u of [initial(chemical.name)]. But only if there is less than [helper.injection_chems[chemical]/2]u in the target already.") |
162 | 162 | combined_msg += span_notice("If none of the above chemicals are injected, you will default to [helper.injection_chems[helper.default_chem]]u of [initial(helper.default_chem.name)].") |
163 | 163 |
|
| 164 | + to_chat(usr, examine_block(combined_msg.Join("\n"))) |
164 | 165 | qdel(helper) |
165 | 166 |
|
166 | 167 | #undef PRE_DAGGER_COMBO |
|
0 commit comments