From 02f3db41833f3f9762c9a0264594bd0cee107b2f Mon Sep 17 00:00:00 2001 From: VampyrBytes Date: Sun, 14 Feb 2016 07:44:42 +0000 Subject: [PATCH 1/2] 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) + ..() From f7511ae017be152beba517a82c5fb7f48cd699a4 Mon Sep 17 00:00:00 2001 From: VampyrBytes Date: Sun, 14 Feb 2016 10:16:45 +0000 Subject: [PATCH 2/2] oxyloss change set to only borgs --- code/modules/mob/living/silicon/robot/robot.dm | 6 +++++- code/modules/mob/living/silicon/silicon.dm | 4 +--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 3f56a1bfc25..af30c4d71e3 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1455,4 +1455,8 @@ var/list/robot_verbs_default = list( status_flags &= ~CANPUSH - notify_ai(2) \ No newline at end of file + notify_ai(2) + +/mob/living/silicon/robot/adjustOxyLoss(var/amount) + if (suiciding) + ..() diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 57ea8ee135f..0ca8b27c852 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -344,6 +344,4 @@ /mob/living/silicon/adjustToxLoss(var/amount) return -/mob/living/silicon/adjustOxyLoss(var/amount) - if (suiciding) - ..() +