Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit f171b06

Browse files
committed
Update stealth.dm
1 parent e7dae4f commit f171b06

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

yogstation/code/datums/martial/stealth.dm

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,10 @@
111111
/obj/item/ammo_box/magazine/m10mm/martial
112112
max_ammo = 1
113113

114+
/obj/item/gun/ballistic/automatic/pistol/martial/pre_attack(atom/target, mob/living/user, params)
115+
afterattack(target, user, FALSE, params) //call afterattack so the gun still shoots
116+
return TRUE //prevent the regular attack
117+
114118
/obj/item/gun/ballistic/automatic/pistol/martial/eject_magazine(mob/user, display_message = TRUE, obj/item/ammo_box/magazine/tac_load = null)
115119
return FALSE
116120

@@ -156,16 +160,13 @@
156160
combined_msg += "[span_notice("Finger gun")]: Harm Grab. Briefly paralyse your target and place a stealthy version of a stechkin in your hand."
157161

158162
combined_msg += "[span_notice("Injection")]: Your disarm intent will inject chemicals in a determined order."
159-
combined_msg += span_notice("The chemicals that will be injected in this order are:")
163+
combined_msg += "<i>A chemical will only be injected if the target has under half the amount of injected units in them.</i>"
160164
for(var/datum/reagent/chemical as anything in helper.injection_chems)
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.")
165+
combined_msg += span_notice("[initial(chemical.name)]: [helper.injection_chems[chemical]]u.")
162166
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)].")
163167

164168
to_chat(usr, examine_block(combined_msg.Join("\n")))
165169
qdel(helper)
166170

167-
#undef PRE_DAGGER_COMBO
168171
#undef DAGGER_COMBO
169-
#undef PRE_INJECTION_COMBO
170-
#undef INJECTION_COMBO
171172
#undef FINGERGUN_COMBO

0 commit comments

Comments
 (0)