From a80fbf7e874cbc0efe3e11bdb478c9695a305949 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Wed, 1 May 2024 17:03:46 -0700
Subject: [PATCH] Reapply "ages, visual feedback, some value changes"
This reverts commit ef4444ed44d7a756da2b723cc07e3613d1e8fc03.
---
.../mob/living/carbon/human/species_types/ethereal.dm | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm
index 8700366bd299..78433e8dbdad 100644
--- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm
+++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm
@@ -14,6 +14,7 @@
attack_type = BURN //burn bish
exotic_bloodtype = "E"
damage_overlay_type = "" //We are too cool for regular damage overlays
+ species_age_max = 300
species_traits = list(DYNCOLORS, EYECOLOR, HAIR, FACEHAIR)
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
species_language_holder = /datum/language_holder/ethereal
@@ -50,7 +51,7 @@
// how it takes to enter and exit rooting
var/dig_time = (7.5 SECONDS)
// how long to charge while rooting
- var/root_time = (4 SECONDS)
+ var/root_time = (3 SECONDS)
// how much charge you get from rooting
var/root_charge_gain = (5 * ELZUOSE_CHARGE_SCALING_MULTIPLIER)
@@ -113,7 +114,7 @@
return
E.drain_time = world.time + E.root_time
to_chat(H, "You start to dig yourself into the ground to root. You won't won't be able to move once you start the process.")
-
+ H.visible_message("[H] is digging into the ground.","You start to dig yourself into the ground to root. You won't won't be able to move once you start the process.","You hear digging.")
if(!do_after(H,E.dig_time, target = H))
to_chat(H, "You were interupted!")
return
@@ -130,7 +131,7 @@
if(stomach.crystal_charge > charge_limit)
stomach.crystal_charge = ELZUOSE_CHARGE_FULL
- to_chat(H, "You finish rooting and begin digging yourself out.")
+ H.visible_message("[H] is digging out of the ground.","You finish rooting and begin digging yourself out.","You hear digging.")
if(do_after(H, E.dig_time,target = H))
to_chat(H, "You finish digging yourself out.")
REMOVE_TRAIT(H,TRAIT_IMMOBILIZED,SPECIES_TRAIT)
@@ -144,7 +145,7 @@
// Rooting was interupted, so we start digging yourself out.
if(!(get_dist(terrain, H) <= 0 && isturf(H.loc)))
//You got moved and uprooted, time to suffer the consequences.
- to_chat(H, "You're forcefully unrooted! Ouch!")
+ H.visible_message("[H] is forcefully uprooted. That looked like it hurt.","You're forcefully unrooted! Ouch!","You hear someone scream in pain..")
H.apply_damage(8,BRUTE,BODY_ZONE_CHEST)
H.apply_damage(8,BRUTE,BODY_ZONE_L_LEG)
H.apply_damage(8,BRUTE,BODY_ZONE_R_LEG)
@@ -153,7 +154,7 @@
return
to_chat(H, "Your rooting was interupted and you begin digging yourself out.")
if(do_after(H, E.dig_time,target = H))
- to_chat(H, "You finish digging yourself out.")
+ H.visible_message("[H] is digging out of the ground.","You finish rooting and begin digging yourself out.","You hear digging.")
REMOVE_TRAIT(H,TRAIT_IMMOBILIZED,SPECIES_TRAIT)
return