From 6268e2f143a4bd03dff15481ecf253ee977024cd Mon Sep 17 00:00:00 2001 From: Poojawa Date: Sat, 13 Oct 2018 04:45:48 -0500 Subject: [PATCH 1/2] stops patches from applying magically through suits --- code/modules/reagents/reagent_containers/patch.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/reagents/reagent_containers/patch.dm b/code/modules/reagents/reagent_containers/patch.dm index b11ef878b6..7de12e38b6 100644 --- a/code/modules/reagents/reagent_containers/patch.dm +++ b/code/modules/reagents/reagent_containers/patch.dm @@ -14,6 +14,8 @@ /obj/item/reagent_containers/pill/patch/attack(mob/living/L, mob/user) if(ishuman(L)) var/obj/item/bodypart/affecting = L.get_bodypart(check_zone(user.zone_selected)) + if(!L.can_inject(user, 1)) + return if(!affecting) to_chat(user, "The limb is missing!") return From 35ae45e220160ca735647c55279d3539b9f6380f Mon Sep 17 00:00:00 2001 From: Poojawa Date: Sat, 13 Oct 2018 06:54:20 -0500 Subject: [PATCH 2/2] make it actually check for THICKMATERIAL --- 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 7de12e38b6..d4111467ba 100644 --- a/code/modules/reagents/reagent_containers/patch.dm +++ b/code/modules/reagents/reagent_containers/patch.dm @@ -14,7 +14,7 @@ /obj/item/reagent_containers/pill/patch/attack(mob/living/L, mob/user) if(ishuman(L)) var/obj/item/bodypart/affecting = L.get_bodypart(check_zone(user.zone_selected)) - if(!L.can_inject(user, 1)) + if(!L.can_inject(user, 1, affecting)) //like monkey code, thickmaterial stops patches return if(!affecting) to_chat(user, "The limb is missing!")