From 230c8f683b157bbb3194fbcd2dbda35c42e780b1 Mon Sep 17 00:00:00 2001 From: Chompstation Bot Date: Thu, 3 Jun 2021 01:58:49 +0000 Subject: [PATCH 1/2] Really fix protean blobs --- .../species/station/protean_vr/protean_powers.dm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm index 1bd45ea4ce..f82f8bc245 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm @@ -327,6 +327,19 @@ set category = "Abilities" set hidden = TRUE +<<<<<<< HEAD +||||||| parent of a9ad167f46... Merge pull request #10548 from VOREStation/Arokha/blobfix2 + if(!isturf(loc)) + to_chat(src,"You need more space to perform this action!") + return + +======= + var/atom/movable/to_locate = temporary_form || src + if(!isturf(to_locate.loc)) + to_chat(to_locate,"You need more space to perform this action!") + return + +>>>>>>> a9ad167f46... Merge pull request #10548 from VOREStation/Arokha/blobfix2 //Blob form if(temporary_form) if(health < maxHealth*0.5) From 0c8925cced8465e55fffb394b5090c20c07acc41 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Thu, 3 Jun 2021 03:22:01 -0700 Subject: [PATCH 2/2] Update protean_powers.dm --- .../human/species/station/protean_vr/protean_powers.dm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm index f82f8bc245..ee393f4d1b 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm @@ -327,19 +327,11 @@ set category = "Abilities" set hidden = TRUE -<<<<<<< HEAD -||||||| parent of a9ad167f46... Merge pull request #10548 from VOREStation/Arokha/blobfix2 - if(!isturf(loc)) - to_chat(src,"You need more space to perform this action!") - return - -======= var/atom/movable/to_locate = temporary_form || src if(!isturf(to_locate.loc)) to_chat(to_locate,"You need more space to perform this action!") return ->>>>>>> a9ad167f46... Merge pull request #10548 from VOREStation/Arokha/blobfix2 //Blob form if(temporary_form) if(health < maxHealth*0.5)