From be41b14f9ae5edc6996b52206b2dab9719c175e1 Mon Sep 17 00:00:00 2001 From: Heroman Date: Wed, 26 May 2021 07:56:42 +1000 Subject: [PATCH] Fixes proteans being a bit too liberal with reformation --- .../human/species/station/protean_vr/protean_blob.dm | 12 ++++++++---- 1 file 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 a0a505d61aa..83321e40498 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 @@ -187,7 +187,7 @@ return humanform.adjustOxyLoss(amount) else return ..() - + /mob/living/simple_mob/protean_blob/adjustHalLoss(amount) if(humanform) return humanform.adjustHalLoss(amount) @@ -230,7 +230,7 @@ else animate(src, alpha = 0, time = 2 SECONDS) sleep(2 SECONDS) - + if(!QDELETED(src)) // Human's handle death should have taken us, but maybe we were adminspawned or something without a human counterpart qdel(src) @@ -380,7 +380,7 @@ var/global/list/disallowed_protean_accessories = list( var/obj/belly/B = belly B.forceMove(blob) B.owner = blob - + //We can still speak our languages! blob.languages = languages.Copy() @@ -402,10 +402,14 @@ var/global/list/disallowed_protean_accessories = list( if(!istype(blob)) return + if(istype(blob.loc, /obj/machinery/atmospherics)) + to_chat(src, "You cannot reform in these confines!") + return + var/panel_was_up = FALSE if(client?.statpanel == "Protean") panel_was_up = TRUE - + if(buckled) buckled.unbuckle_mob() if(LAZYLEN(buckled_mobs))