From 42e32614285cd591cd5ae0f3ec9d85b9001d122a Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Sat, 17 Mar 2018 12:33:04 -0400 Subject: [PATCH] Final tweaks --- .../carbon/human/species/station/protean_vr/protean_blob.dm | 2 +- .../human/species/station/protean_vr/protean_species.dm | 6 +++++- code/modules/organs/organ_external.dm | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm index 00011648ab..f51510a535 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm @@ -289,7 +289,7 @@ //Record where they should go var/atom/reform_spot = blob.drop_location() - //Mail them to nullspace + //Move them back where the blob was forceMove(reform_spot) //Put our owner in it (don't transfer var/mind) diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm index af775ca519..53b84c33a7 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm @@ -281,8 +281,12 @@ var/mob/living/carbon/human/H = holder for(var/organ in H.internal_organs) var/obj/item/organ/O = organ - if(O.damage > 0) // Fix internal damage + // Fix internal damage + if(O.damage > 0) O.damage = max(0,O.damage-0.1) + // If not damaged, but dead, fix it + else if(O.status & ORGAN_DEAD) + O.status &= ~ORGAN_DEAD //Unset dead if we repaired it entirely // PAN Card /obj/item/clothing/accessory/permit/nanotech diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index ae31a9cdba..4f85ee689d 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -816,10 +816,10 @@ Note that amputating the affected organ does in fact remove the infection from t if(!cannot_amputate) if(nonsolid && damage >= max_damage) - droplimb(true, DROPLIMB_BLUNT) + droplimb(TRUE, DROPLIMB_BLUNT) //VOREStation Add Start if(robotic >= ORGAN_NANOFORM && damage >= max_damage) - droplimb(true, DROPLIMB_BURN) + droplimb(TRUE, DROPLIMB_BURN) //VOREStation Add End /****************************************************