Merge pull request #3602 from VampyrBytes/BorgDamage

prevents toxloss and oxyloss for silicons
This commit is contained in:
Fox McCloud
2016-02-15 16:32:48 -05:00
2 changed files with 10 additions and 1 deletions
@@ -1455,4 +1455,8 @@ var/list/robot_verbs_default = list(
status_flags &= ~CANPUSH
notify_ai(2)
notify_ai(2)
/mob/living/silicon/robot/adjustOxyLoss(var/amount)
if (suiciding)
..()
@@ -340,3 +340,8 @@
for(var/obj/machinery/camera/C in A.cameras())
cameratext += "[(cameratext == "")? "" : "|"]<A HREF=?src=\ref[src];switchcamera=\ref[C]>[C.c_tag]</A>"
src << "[A.alarm_name()]! ([(cameratext)? cameratext : "No Camera"])"
/mob/living/silicon/adjustToxLoss(var/amount)
return