Skip to content

Commit

Permalink
fiks issues
Browse files Browse the repository at this point in the history
  • Loading branch information
casualspacestation14enjoyer committed Sep 30, 2023
1 parent ba6c1b7 commit ccd6155
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 14 deletions.
2 changes: 1 addition & 1 deletion code/datums/uplink/stealthy_and_inconspicuous_weapons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
16 changes: 8 additions & 8 deletions code/game/objects/items/weapons/grenades/grenade.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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, "<span class='notice'>You set the [name] for 1 second detonation time.</span>")
to_chat(user, SPAN_NOTICE("You set the [name] for 1 second detonation time."))
if (10)
det_time = 30
to_chat(user, "<span class='notice'>You set the [name] for 3 second detonation time.</span>")
to_chat(user, SPAN_NOTICE("You set the [name] for 3 second detonation time."))
if (30)
det_time = 50
to_chat(user, "<span class='notice'>You set the [name] for 5 second detonation time.</span>")
to_chat(user, SPAN_NOTICE("You set the [name] for 5 second detonation time."))
if (50)
det_time = 1
to_chat(user, "<span class='notice'>You set the [name] for instant detonation.</span>")
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)
..()

Expand Down
12 changes: 7 additions & 5 deletions code/game/objects/items/weapons/material/knives.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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)

Expand All @@ -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)
Expand Down

0 comments on commit ccd6155

Please sign in to comment.