diff --git a/hyperstation/code/modules/resize/resizing.dm b/hyperstation/code/modules/resize/resizing.dm index 2e2e0a99..d09327ba 100644 --- a/hyperstation/code/modules/resize/resizing.dm +++ b/hyperstation/code/modules/resize/resizing.dm @@ -76,11 +76,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") - to_chat(H,"You carefully slither around [tmob].") - to_chat(tmob,"[H]'s huge tail slithers beside you!") + H.visible_message("[H]'s huge tail slithers besides you.", "[H] carefully slithers around [tmob].") else - to_chat(H,"You carefully step over [tmob].") - to_chat(tmob,"[H] steps over you carefully!") + H.visible_message("[H] steps over you carefully.", "[H] carefully steps over [tmob].") return 1 //Smaller person stepping under a larger person @@ -120,11 +118,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") - to_chat(H,"You carefully roll over [tmob] with your tail!") - to_chat(tmob,"[H]'s huge tail rolls over you!") + H.visible_message("[H]'s huge tail rolls over you!", "[H] carefully rolls their tail over [tmob]!") else - to_chat(H,"You painfully but harmlessly step on [tmob]!") - to_chat(tmob,"[H] steps onto you with force!") + H.visible_message("[H] steps onto you with force!", "[H] carefully steps on [tmob]!") return 1 if(H.a_intent == "harm" && H.canmove && !H.buckled) @@ -137,11 +133,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") - to_chat(H,"You grind [tmob] into the floor with your tail!") - to_chat(tmob,"[H]'s massive tail plows you into the floor!") + H.visible_message("[H] plows their tail over you mercilessly!", "[H] mows down [tmob] under their tail!") else - to_chat(H,"You pound [tmob] into the floor underfoot!") - to_chat(tmob,"[H] slams you into the ground, crushing you!") + H.visible_message("[H] crushes you under their foot!", "[H] slams their foot down on [tmob]!") return 1 if(H.a_intent == "grab" && H.canmove && !H.buckled) @@ -155,20 +149,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") - to_chat(H,"You pin [tmob] underneath your tail!") - to_chat(tmob,"[H]'s plows you into the ground, pinning you helplessly!") + H.visible_message("[H] pins you beneath their tail!", "[H] pins [tmob] under their tail!") else - to_chat(H,"You pin [tmob] helplessly to the floor with your foot!") - to_chat(tmob,"[H] weightfully pins you to the ground!") + H.visible_message("[H] pins you underfoot!", "[H] pins [tmob] helplessly underfoot!") return 1 else if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle") - to_chat(H,"You curl [tmob] up in the coils of your tail!") - to_chat(tmob,"[H]'s tail winds around you and snatches you in its coils!") + H.visible_message("[H]'s tail winds around you and snatches you in its coils!", "[H] snatches up [tmob] underneath their tail!") tmob.mob_pickup_micro_feet(H) else - to_chat(H,"You stomp your foot into [tmob], curling your toes and picking them up!") - to_chat(tmob,"[H]'s toes pin you down and curl around you, picking you up!'") + 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.mob_pickup_micro_feet(H) return 1 @@ -181,11 +171,9 @@ mob/living/get_effective_size() //smaller person stepping under another person... TO DO, fix and allow special interactions with naga legs to be seen /mob/living/proc/micro_step_under(var/mob/living/tmob) if(istype(tmob) && istype(tmob, /datum/sprite_accessory/taur/naga)) - to_chat(src,"You jump over [tmob]'s thick tail.") - to_chat(tmob,"[src] bounds over your tail.") + src.visible_message("[src] bounds over [tmob]'s tail.", "You jump over [tmob]'s thick tail.") else - to_chat(src,"You run between [tmob]'s legs.") - to_chat(tmob,"[src] runs between your legs.") + src.visible_message("[src] runs between [tmob]'s legs.", "You run between [tmob]'s legs.") //Proc for scaling stamina damage on size difference /mob/living/proc/sizediffStamLoss(var/mob/living/tmob)