Merge pull request #9946 from Citadel-Station-13/kevinz000-patch-117

Removes hyperspeed from light pink stabilized for -4.5 stam/tick + free sprint
This commit is contained in:
Putnam3145
2019-12-01 23:12:35 -08:00
committed by GitHub
3 changed files with 8 additions and 4 deletions
+2 -1
View File
@@ -162,6 +162,7 @@
#define TRAIT_FRIENDLY "friendly"
#define TRAIT_ASSBLASTUSA "assblastusa"
#define TRAIT_CULT_EYES "cult_eyes"
#define TRAIT_FREESPRINT "free_sprinting"
// common trait sources
@@ -216,4 +217,4 @@
#define NINJA_SUIT_TRAIT "ninja-suit"
#define ANTI_DROP_IMPLANT_TRAIT "anti-drop-implant"
#define ABDUCTOR_ANTAGONIST "abductor-antagonist"
#define MADE_UNCLONEABLE "made-uncloneable"
#define MADE_UNCLONEABLE "made-uncloneable"
@@ -904,10 +904,11 @@ datum/status_effect/stabilized/blue/on_remove()
colour = "light pink"
/datum/status_effect/stabilized/lightpink/on_apply()
owner.add_movespeed_modifier(MOVESPEED_ID_SLIME_STATUS, update=TRUE, priority=100, multiplicative_slowdown=-1, blacklisted_movetypes=(FLYING|FLOATING))
ADD_TRAIT(owner, TRAIT_FREESPRINT, "stabilized_slime")
return ..()
/datum/status_effect/stabilized/lightpink/tick()
owner.adjustStaminaLoss(-4.5)
for(var/mob/living/carbon/human/H in range(1, get_turf(owner)))
if(H != owner && H.stat != DEAD && H.health <= 0 && !H.reagents.has_reagent("epinephrine"))
to_chat(owner, "[linked_extract] pulses in sync with [H]'s heartbeat, trying to keep [H.p_them()] alive.")
@@ -915,7 +916,8 @@ datum/status_effect/stabilized/blue/on_remove()
return ..()
/datum/status_effect/stabilized/lightpink/on_remove()
owner.remove_movespeed_modifier(MOVESPEED_ID_SLIME_STATUS)
REMOVE_TRAIT(owner, TRAIT_FREESPRINT, "stabilized_slime")
return ..()
/datum/status_effect/stabilized/adamantine
id = "stabilizedadamantine"