diff --git a/code/datums/uplink/stealthy_and_inconspicuous_weapons.dm b/code/datums/uplink/stealthy_and_inconspicuous_weapons.dm index 6ea6860a778..f75a8dfe963 100644 --- a/code/datums/uplink/stealthy_and_inconspicuous_weapons.dm +++ b/code/datums/uplink/stealthy_and_inconspicuous_weapons.dm @@ -35,7 +35,7 @@ /datum/uplink_item/item/stealthy_weapons/fakescalp name = "Injection Scalpel" - desc = "This 'scalpel' will inject a chemical of choice into the bloodstream of an unsuspecting patient, either it be a surgery or assault. WARNING: Not for use as a scalpel, poison not included." + desc = "This 'scalpel' will inject a chemical of choice into the bloodstream of an unsuspecting patient, either it be a surgery or assault. WARNING: Not for use as a scalpel, chemicals not included." item_cost = 15 path = /obj/item/material/knife/reagent/fakescalp diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index c4e08b724ec..4233b47e367 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -71,23 +71,23 @@ T.hotspot_expose(700,125) /obj/item/grenade/attackby(obj/item/W as obj, mob/user as mob) - if(!emagged) - if(isScrewdriver(W)) + if(isScrewdriver(W)) + if(!emagged) switch(det_time) if (1) det_time = 10 - to_chat(user, "You set the [name] for 1 second detonation time.") + to_chat(user, SPAN_NOTICE("You set the [name] for 1 second detonation time.")) if (10) det_time = 30 - to_chat(user, "You set the [name] for 3 second detonation time.") + to_chat(user, SPAN_NOTICE("You set the [name] for 3 second detonation time.")) if (30) det_time = 50 - to_chat(user, "You set the [name] for 5 second detonation time.") + to_chat(user, SPAN_NOTICE("You set the [name] for 5 second detonation time.")) if (50) det_time = 1 - to_chat(user, "You set the [name] for instant detonation.") - else - to_chat(user, SPAN_WARNING("\The [src] refuses the change!")) + to_chat(user, SPAN_NOTICE("You set the [name] for instant detonation.")) + else + to_chat(user, SPAN_WARNING("\The [src] refuses the change!")) add_fingerprint(user) ..() diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm index f7080fdab57..3b2726ce800 100644 --- a/code/game/objects/items/weapons/material/knives.dm +++ b/code/game/objects/items/weapons/material/knives.dm @@ -115,11 +115,13 @@ /obj/item/material/knife/reagent atom_flags = ATOM_FLAG_OPEN_CONTAINER + var/amount_to_transfer = 1 // the amount of chems to transfer between attacks + var/volume = 30 origin_tech = list(TECH_MATERIAL = 2, TECH_ESOTERIC = 5) /obj/item/material/knife/reagent/New() ..() - create_reagents(30) + create_reagents(volume) /obj/item/material/knife/reagent/attack(mob/living/M, mob/user, var/target_zone) if(!istype(M)) @@ -129,14 +131,13 @@ var/allow = M.can_inject(user, target_zone) if(user.a_intent == I_HURT) //prevents it from injecting reagents WITHOUT attacking (reagents get injected but no harm is done to the target) - if(allow) - if(allow == INJECTION_PORT) //this is a knife meant for combat, we are not gonna inject - return + if(allow == INJECTION_PORT) //this is a knife meant for combat, we are not gonna inject + return if(reagents.total_volume) if(M.reagents) var/should_admin_log = reagents.should_admin_log() var/contained_reagents = reagents.get_reagents() - var/trans = reagents.trans_to_mob(M, 4, CHEM_BLOOD) //we transfer only 4 units because slashing doesnt generally make you stay in the wound long + var/trans = reagents.trans_to_mob(M, 1, CHEM_BLOOD) //we transfer only 1 unit because slashing doesnt generally make you stay in the wound long if(should_admin_log) admin_inject_log(user, M, src, contained_reagents, trans) @@ -146,6 +147,7 @@ desc = "A tiny and extremely sharp steel cutting tool used for surgery, dissection, autopsy, and very precise cuts. The cornerstone of any surgical procedure." icon = 'icons/obj/surgery.dmi' icon_state = "scalpel" + max_force = 7 //already kills people with chems, why make it op? applies_material_colour = 0 //does not rename it to "steel scalpel" so we can hide it :))))))) applies_material_name = 0 //does not recolor it, makes it indistinguishable from a real scalpel. origin_tech = list(TECH_MATERIAL = 2, TECH_ESOTERIC = 5)