cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 23:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #50973 (#50975)

Browse Source
This commit is contained in:
MacBlaze1
2020-05-08 19:09:36 -07:00
committed by GitHub
parent 1f4155e887
commit 55cb1c7053
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/DNA.dm
+1 -1
View File
@@ -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
code/modules/antagonists/changeling/powers/lesserform.dm
+1 -1
View File
@@ -13,5 +13,5 @@
return FALSE
to_chat(user, "<span class='warning'>Our genes cry out!</span>")
..()
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
code/modules/mob/transform_procs.dm
+4 -3
View File
@@ -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, "<B>You are now a monkey.</B>")