From d0a312ada8acf33854bc968e88fcaa1c9849961b Mon Sep 17 00:00:00 2001 From: Hopek Date: Fri, 20 Mar 2020 21:34:20 -0500 Subject: [PATCH 1/3] Medical sprays and patches now look for exposed flesh or thin material --- code/modules/reagents/reagent_containers/medspray.dm | 7 +++++-- code/modules/reagents/reagent_containers/patch.dm | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/reagent_containers/medspray.dm b/code/modules/reagents/reagent_containers/medspray.dm index 9335b88af77b..4ddbb6394fd8 100644 --- a/code/modules/reagents/reagent_containers/medspray.dm +++ b/code/modules/reagents/reagent_containers/medspray.dm @@ -32,11 +32,14 @@ amount_per_transfer_from_this = initial(amount_per_transfer_from_this) to_chat(user, "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.") -/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, "[src] is empty!") return - + + if(!M.can_inject(user, TRUE)) + return + if(M == user) M.visible_message("[user] attempts to [apply_method] [src] on [user.p_them()]self.") if(self_delay) diff --git a/code/modules/reagents/reagent_containers/patch.dm b/code/modules/reagents/reagent_containers/patch.dm index fd05482daa67..878336885374 100644 --- a/code/modules/reagents/reagent_containers/patch.dm +++ b/code/modules/reagents/reagent_containers/patch.dm @@ -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)) + return var/obj/item/bodypart/affecting = L.get_bodypart(check_zone(user.zone_selected)) if(!affecting) to_chat(user, "The limb is missing!") From 42ec8cb4f01b7f28ffe4edd2a0aa445c9d43b93a Mon Sep 17 00:00:00 2001 From: Hopekz Date: Sun, 29 Mar 2020 22:58:34 -0500 Subject: [PATCH 2/3] Update code/modules/reagents/reagent_containers/medspray.dm Co-Authored-By: alexkar598 <25136265+alexkar598@users.noreply.github.com> --- code/modules/reagents/reagent_containers/medspray.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/medspray.dm b/code/modules/reagents/reagent_containers/medspray.dm index 4ddbb6394fd8..121240cc2bde 100644 --- a/code/modules/reagents/reagent_containers/medspray.dm +++ b/code/modules/reagents/reagent_containers/medspray.dm @@ -37,7 +37,7 @@ to_chat(user, "[src] is empty!") return - if(!M.can_inject(user, TRUE)) + if(!M.can_inject(user, TRUE, check_zone(user.zone_selected))) return if(M == user) From 0162e022a1c99e79061b9324c2d36679981229f2 Mon Sep 17 00:00:00 2001 From: Hopek Date: Sun, 29 Mar 2020 23:11:56 -0500 Subject: [PATCH 3/3] Alex's suggestion --- code/modules/reagents/reagent_containers/patch.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/patch.dm b/code/modules/reagents/reagent_containers/patch.dm index 878336885374..b84b7bcd867f 100644 --- a/code/modules/reagents/reagent_containers/patch.dm +++ b/code/modules/reagents/reagent_containers/patch.dm @@ -13,7 +13,7 @@ /obj/item/reagent_containers/pill/patch/attack(mob/living/L, mob/user) if(ishuman(L)) - if(!L.can_inject(user, TRUE)) + 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)