From 02f3db41833f3f9762c9a0264594bd0cee107b2f Mon Sep 17 00:00:00 2001 From: VampyrBytes Date: Sun, 14 Feb 2016 07:44:42 +0000 Subject: [PATCH] prevents toxloss and oxyloss for silicons fixes #3595 stops adjustToxLoss working on silicons, and only allows adjustOxyLoss when suiciding Have checked through, nowhere that shouldn't be is directly setting toxloss and oxyloss, and the only place that uses the setters to set it to anything other than 0 (statues) doesn't affect silicon based life, so this will fix the found bug and any other situations is could happen in --- code/modules/mob/living/silicon/silicon.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index f1f5f7862b3..57ea8ee135f 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -340,3 +340,10 @@ for(var/obj/machinery/camera/C in A.cameras()) cameratext += "[(cameratext == "")? "" : "|"][C.c_tag]" src << "[A.alarm_name()]! ([(cameratext)? cameratext : "No Camera"])" + +/mob/living/silicon/adjustToxLoss(var/amount) + return + +/mob/living/silicon/adjustOxyLoss(var/amount) + if (suiciding) + ..()