From 0baec55043fbfea95eb5c8aa985fe0b987c7dd14 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Mon, 24 Feb 2020 13:17:18 -0800 Subject: [PATCH] Merge pull request #6734 from VOREStation/pol-dead Removes deadringer cloak exploit --- code/modules/mob/living/carbon/human/human_helpers.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 7c082285ab1..0282befbf85 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -63,6 +63,8 @@ for(var/obj/item/rig_module/stealth_field/cloaker in suit.installed_modules) if(cloaker.active) cloaker.deactivate() + for(var/obj/item/weapon/deadringer/dr in src) + dr.uncloak() /mob/living/carbon/human/is_cloaked() if(mind && mind.changeling && mind.changeling.cloaked) // Ling camo. @@ -72,6 +74,9 @@ for(var/obj/item/rig_module/stealth_field/cloaker in suit.installed_modules) if(cloaker.active) return TRUE + for(var/obj/item/weapon/deadringer/dr in src) + if(dr.timer > 20) + return TRUE return ..() /mob/living/carbon/human/get_ear_protection()