From 3898ba87a7cf385f12355b9f51fd5a08f04b833d Mon Sep 17 00:00:00 2001 From: Markolie Date: Tue, 1 Sep 2015 19:13:17 +0200 Subject: [PATCH] Robotic eyes will not protect your from welding/the supermatter --- code/game/objects/items/weapons/tools.dm | 2 +- code/modules/power/supermatter/supermatter.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 79f94596a76..c01949be1e7 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -371,7 +371,7 @@ if(ishuman(user)) var/mob/living/carbon/human/H = user var/obj/item/organ/eyes/E = H.internal_organs_by_name["eyes"] - if(!istype(E) || (E.status & ORGAN_ROBOT)) // No eyes or robotic eyes? No problem! + if(!istype(E)) // No eyes eyes? No problem! return switch(safety) if(1) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 2eb9e562a61..f9b97b7f26a 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -182,7 +182,7 @@ // Where we're going, we don't need eyes. // Prosthetic eyes will also protect against this business. var/obj/item/organ/eyes = l.internal_organs_by_name["eyes"] - if(!istype(eyes) || (eyes.status & ORGAN_ROBOT)) + if(!istype(eyes)) continue l.hallucination = max(0, min(200, l.hallucination + power * config_hallucination_power * sqrt( 1 / max(1,get_dist(l, src)) ) ) )