From 55cb1c7053fcfd5daaa32d0a27fef6a984edc6da Mon Sep 17 00:00:00 2001 From: MacBlaze1 <33578623+MacBlaze1@users.noreply.github.com> Date: Fri, 8 May 2020 21:09:36 -0500 Subject: [PATCH] Fixes #50973 (#50975) --- code/__DEFINES/DNA.dm | 2 +- code/modules/antagonists/changeling/powers/lesserform.dm | 2 +- code/modules/mob/transform_procs.dm | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm index 5cdb6f45146..a077c8a47ef 100644 --- a/code/__DEFINES/DNA.dm +++ b/code/__DEFINES/DNA.dm @@ -103,7 +103,7 @@ #define TR_KEEPORGANS (1<<8) #define TR_KEEPSTUNS (1<<9) #define TR_KEEPREAGENTS (1<<10) - +#define TR_KEEPSTAMINADAMAGE (1<<11) //species traits for mutantraces #define MUTCOLORS 1 #define HAIR 2 diff --git a/code/modules/antagonists/changeling/powers/lesserform.dm b/code/modules/antagonists/changeling/powers/lesserform.dm index 03ea226e9e5..25af1eb3560 100644 --- a/code/modules/antagonists/changeling/powers/lesserform.dm +++ b/code/modules/antagonists/changeling/powers/lesserform.dm @@ -13,5 +13,5 @@ return FALSE to_chat(user, "Our genes cry out!") ..() - user.monkeyize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSTUNS | TR_KEEPREAGENTS | TR_KEEPSE) + user.monkeyize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSTUNS | TR_KEEPREAGENTS | TR_KEEPSE | TR_KEEPSTAMINADAMAGE) return TRUE diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 0e41840f6ee..2ac1f993472 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -1,6 +1,6 @@ #define TRANSFORMATION_DURATION 22 -/mob/living/carbon/proc/monkeyize(tr_flags = (TR_KEEPITEMS | TR_KEEPVIRUS | TR_KEEPSTUNS | TR_KEEPREAGENTS | TR_DEFAULTMSG)) +/mob/living/carbon/proc/monkeyize(tr_flags = (TR_KEEPITEMS | TR_KEEPVIRUS | TR_KEEPSTUNS | TR_KEEPREAGENTS | TR_DEFAULTMSG | TR_KEEPSTAMINADAMAGE)) if (notransform || transformation_timer) return @@ -25,7 +25,6 @@ transformation_timer = null var/list/missing_bodyparts_zones = get_missing_limbs() - var/list/stored_implants = list() if (tr_flags & TR_KEEPIMPLANTS) @@ -150,7 +149,9 @@ var/datum/action/changeling/humanform/hf = new changeling.purchasedpowers += hf changeling.regain_powers() - + //transfer stamina damage + if(tr_flags & TR_KEEPSTAMINADAMAGE) + O.adjustStaminaLoss(getStaminaLoss()) if (tr_flags & TR_DEFAULTMSG) to_chat(O, "You are now a monkey.")