Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions code/modules/reagents/reagent_containers/medspray.dm
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,14 @@
amount_per_transfer_from_this = initial(amount_per_transfer_from_this)
to_chat(user, "<span class='notice'>You will now apply the medspray's contents in [squirt_mode ? "short bursts":"extended sprays"]. You'll now use [amount_per_transfer_from_this] units per use.</span>")

/obj/item/reagent_containers/medspray/attack(mob/M, mob/user, def_zone)
/obj/item/reagent_containers/medspray/attack(mob/living/M, mob/user, def_zone)
if(!reagents || !reagents.total_volume)
to_chat(user, "<span class='warning'>[src] is empty!</span>")
return


if(!M.can_inject(user, TRUE, check_zone(user.zone_selected)))
return

if(M == user)
M.visible_message("<span class='notice'>[user] attempts to [apply_method] [src] on [user.p_them()]self.</span>")
if(self_delay)
Expand Down
2 changes: 2 additions & 0 deletions code/modules/reagents/reagent_containers/patch.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

/obj/item/reagent_containers/pill/patch/attack(mob/living/L, mob/user)
if(ishuman(L))
if(!L.can_inject(user, TRUE, check_zone(user.zone_selected)))
return
var/obj/item/bodypart/affecting = L.get_bodypart(check_zone(user.zone_selected))
if(!affecting)
to_chat(user, "<span class='warning'>The limb is missing!</span>")
Expand Down