From a653dfd69dfd59b5826a575c334e24423e30bd3f Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Sat, 12 Mar 2016 00:49:36 -0500 Subject: [PATCH] god its late --- code/game/gamemodes/changeling/powers/augmented_eyesight.dm | 3 +++ code/modules/surgery/organs/augments_eyes.dm | 2 ++ code/modules/surgery/organs/organ.dm | 2 +- code/modules/surgery/organs/organ_external.dm | 3 ++- code/modules/surgery/organs/organ_internal.dm | 6 ++++++ 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm index 832973d4ce6..21d703b9a83 100644 --- a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm +++ b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm @@ -43,6 +43,7 @@ origin_tech = "biotech=4" slot = "eye_ling" status = 0 + aug_message = "We feel a minute twitch in our eyes, our eyes feel more durable." /obj/item/organ/internal/cyberimp/eyes/shield/ling/on_life() ..() @@ -64,6 +65,8 @@ implant_overlay = null origin_tech = "biotech=5;magnets=5" slot = "eye_ling" + darkness_view = 8 + see_darkness = 0 status = 0 aug_message = "We feel a minute twitch in our eyes, and darkness creeps away." diff --git a/code/modules/surgery/organs/augments_eyes.dm b/code/modules/surgery/organs/augments_eyes.dm index 6dcd76bedfa..f3cf645f3a0 100644 --- a/code/modules/surgery/organs/augments_eyes.dm +++ b/code/modules/surgery/organs/augments_eyes.dm @@ -8,6 +8,8 @@ w_class = 1 var/vision_flags = 0 + var/darkness_view = 0 + var/see_darkness = 1 var/list/eye_colour = list(0,0,0) var/list/old_eye_colour = list(0,0,0) var/flash_protect = 0 diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm index fee4aaa1eb6..eceb5d03737 100644 --- a/code/modules/surgery/organs/organ.dm +++ b/code/modules/surgery/organs/organ.dm @@ -81,7 +81,7 @@ var/list/organ_cache = list() return //Process infections - if ((status & ORGAN_ROBOT) || (sterile) ||(owner && owner.species && (owner.species.flags & IS_PLANT))) + if ((status & ORGAN_ROBOT) || sterile == 1 ||(owner && owner.species && (owner.species.flags & IS_PLANT))) germ_level = 0 return diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm index c020b873354..f7c51acc6d7 100644 --- a/code/modules/surgery/organs/organ_external.dm +++ b/code/modules/surgery/organs/organ_external.dm @@ -312,7 +312,8 @@ This function completely restores a damaged organ to perfect condition. // handle internal organs for(var/obj/item/organ/internal/current_organ in internal_organs) - current_organ.rejuvenate() + if(!istype(current_organ,/obj/item/organ/internal/cyberimp)) + current_organ.rejuvenate() // remove embedded objects and drop them on the floor diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index 48b97ed4c88..33dd362f81b 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -15,6 +15,12 @@ insert(holder) ..() + +/obj/item/organ/internal/process() + + ..() + + /obj/item/organ/internal/proc/insert(mob/living/carbon/M, special = 0) if(!iscarbon(M) || owner == M) return