From 0b0e9011a70da39ea7add3cbb5547972aace9696 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 4 Jun 2020 18:56:15 -0400 Subject: [PATCH] Prevent surgery tools and items from being rad contaminatable (#12413) * Update tools.dm * Update tools.dm * Update robot_modules.dm --- code/modules/mob/living/silicon/robot/robot_modules.dm | 1 + code/modules/surgery/tools.dm | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index bf693d70b6..59dfcd3003 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -93,6 +93,7 @@ return new storage_type(src) /obj/item/robot_module/proc/add_module(obj/item/I, nonstandard, requires_rebuild) + rad_flags |= RAD_NO_CONTAMINATE if(istype(I, /obj/item/stack)) var/obj/item/stack/S = I diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 287d9492fb..584a0a189a 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -66,7 +66,6 @@ toolspeed = 0.5 attack_verb = list("attacked", "pinched") - /obj/item/cautery name = "cautery" desc = "This stops bleeding." @@ -91,7 +90,6 @@ toolspeed = 0.5 attack_verb = list("burnt") - /obj/item/surgicaldrill name = "surgical drill" desc = "You can drill using this item. You dig?" @@ -148,7 +146,6 @@ toolspeed = 0.5 attack_verb = list("drilled") - /obj/item/scalpel name = "scalpel" desc = "Cut, cut, and once more cut." @@ -229,7 +226,6 @@ user.visible_message("[user] is slitting [user.p_their()] [pick("wrists", "throat", "stomach")] with [src]! It looks like [user.p_theyre()] trying to commit suicide!") return (BRUTELOSS) - /obj/item/circular_saw name = "circular saw" desc = "For heavy duty cutting."