From cec839a100aaa62e0094fc7ca9a513dcf3f88069 Mon Sep 17 00:00:00 2001 From: Dahlular Date: Mon, 21 Sep 2020 07:21:51 -0600 Subject: [PATCH] Fix stepping text, updates health values --- hyperstation/code/modules/resize/resizing.dm | 26 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/hyperstation/code/modules/resize/resizing.dm b/hyperstation/code/modules/resize/resizing.dm index 896a8123..bfb489f1 100644 --- a/hyperstation/code/modules/resize/resizing.dm +++ b/hyperstation/code/modules/resize/resizing.dm @@ -37,12 +37,12 @@ mob/living/get_effective_size() if(size_multiplier == previous_size) return 1 src.update_transform() //WORK DAMN YOU - src.update_mobsize() //Doesn't work yet + src.update_mobsize() //Going to change the health and speed values too src.remove_movespeed_modifier(MOVESPEED_ID_SIZE) src.add_movespeed_modifier(MOVESPEED_ID_SIZE, multiplicative_slowdown = (abs(size_multiplier - 1) * 0.8 )) - var/healthmod_old = ((previous_size * 50) - 50) //Get the old value to see what we must change. - var/healthmod_new = ((size_multiplier * 50) - 50) //A size of one would be zero. Big boys get health, small ones lose health. + var/healthmod_old = ((previous_size * 75) - 75) //Get the old value to see what we must change. + var/healthmod_new = ((size_multiplier * 75) - 75) //A size of one would be zero. Big boys get health, small ones lose health. var/healthchange = healthmod_new - healthmod_old //Get ready to apply the new value, and subtract the old one. (Negative values become positive) src.maxHealth += healthchange src.health += healthchange @@ -80,9 +80,9 @@ mob/living/get_effective_size() //Smaller person being stepped on if(get_effective_size() > tmob.get_effective_size() && iscarbon(src)) if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle") - H.visible_message("[H]'s huge tail slithers besides you.", "[H] carefully slithers around [tmob].") + tmob.visible_message("[src] carefully slithers around [tmob].", "[src]'s huge tail slithers besides you.") else - H.visible_message("[H] steps over you carefully.", "[H] carefully steps over [tmob].") + tmob.visible_message("[src] carefully steps over [tmob].", "[src] steps over you carefully.") return 1 //Smaller person stepping under a larger person @@ -122,9 +122,9 @@ mob/living/get_effective_size() addtimer(CALLBACK(H, /mob/.proc/remove_movespeed_modifier, MOVESPEED_ID_STOMP), 3) //0.3 seconds if(get_effective_size() > tmob.get_effective_size() && iscarbon(H)) if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle") - H.visible_message("[H]'s huge tail rolls over you!", "[H] carefully rolls their tail over [tmob]!") + tmob.visible_message("[src] carefully rolls their tail over [tmob]!", "[src]'s huge tail rolls over you!") else - H.visible_message("[H] steps onto you with force!", "[H] carefully steps on [tmob]!") + tmob.visible_message("[src] carefully steps on [tmob]!", "[src] steps onto you with force!") return 1 if(H.a_intent == "harm" && H.canmove && !H.buckled) @@ -138,9 +138,9 @@ mob/living/get_effective_size() //H.Stun(20) if(get_effective_size() > tmob.get_effective_size() && iscarbon(H)) if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle") - H.visible_message("[H] plows their tail over you mercilessly!", "[H] mows down [tmob] under their tail!") + tmob.visible_message("[src] mows down [tmob] under their tail!", "[src] plows their tail over you mercilessly!") else - H.visible_message("[H] crushes you under their foot!", "[H] slams their foot down on [tmob]!") + tmob.visible_message("[src] slams their foot down on [tmob], crushing them!", "[src] crushes you under their foot!") return 1 if(H.a_intent == "grab" && H.canmove && !H.buckled) @@ -154,16 +154,16 @@ mob/living/get_effective_size() var/feetCover = (H.wear_suit && (H.wear_suit.body_parts_covered & FEET)) || (H.w_uniform && (H.w_uniform.body_parts_covered & FEET) || (H.shoes && (H.shoes.body_parts_covered & FEET))) if(feetCover) if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle") - H.visible_message("[H] pins you beneath their tail!", "[H] pins [tmob] under their tail!") + tmob.visible_message("[src] pins [tmob] under their tail!", "[src] pins you beneath their tail!") else - H.visible_message("[H] pins you underfoot!", "[H] pins [tmob] helplessly underfoot!") + tmob.visible_message("[src] pins [tmob] helplessly underfoot!", "[src] pins you underfoot!") return 1 else if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle") - H.visible_message("[H]'s tail winds around you and snatches you in its coils!", "[H] snatches up [tmob] underneath their tail!") + tmob.visible_message("[src] snatches up [tmob] underneath their tail!", "[src]'s tail winds around you and snatches you in its coils!") tmob.mob_pickup_micro_feet(H) else - H.visible_message("[H]'s toes pin you down and curl around you, picking you up!", "[H] stomps down on [tmob], curling their toes and picking them up!") + tmob.visible_message("[src] stomps down on [tmob], curling their toes and picking them up!", "[src]'s toes pin you down and curl around you, picking you up!") tmob.mob_pickup_micro_feet(H) return 1