diff --git a/code/modules/mob/living/simple_animal/morph/morph.dm b/code/modules/mob/living/simple_animal/morph/morph.dm index af42538d056f9..15d69564839bf 100644 --- a/code/modules/mob/living/simple_animal/morph/morph.dm +++ b/code/modules/mob/living/simple_animal/morph/morph.dm @@ -21,8 +21,8 @@ maxHealth = 150 health = 150 environment_smash = 1 - melee_damage_lower = 30 - melee_damage_upper = 30 + melee_damage_lower = 20 + melee_damage_upper = 20 see_in_dark = 8 see_invisible = SEE_INVISIBLE_MINIMUM idle_vision_range = 1 // Only attack when target is close @@ -35,7 +35,7 @@ /mob/living/simple_animal/hostile/morph/examine(mob/user) if(morphed) form.examine(user) // Refactor examine to return desc so it's static? Not sure if worth it - if(get_dist(user,src)<=3) + if(get_dist(user,src)<=3) user << "<span class='notice'>Looks odd!</span>" else ..() @@ -49,7 +49,7 @@ return 1 /mob/living/simple_animal/hostile/morph/ShiftClickOn(atom/movable/A) - if(morph_time <= world.time) + if(morph_time <= world.time && !stat) if(A == src) restore() return @@ -61,7 +61,7 @@ /mob/living/simple_animal/hostile/morph/proc/assume(atom/movable/target) morphed = 1 form = target - + //anim(loc,src,'icons/mob/mob.dmi',,"morph",,src.dir) No effect better than shit effect //Todo : update to .appearance once 508 hits @@ -89,9 +89,9 @@ return morphed = 0 form = null - - //anim(loc,src,'icons/mob/mob.dmi',,"morph",,src.dir) - + + //anim(loc,src,'icons/mob/mob.dmi',,"morph",,src.dir) + name = initial(name) icon = initial(icon) icon_state = initial(icon_state) @@ -194,7 +194,13 @@ player_mind.assigned_role = "Morph" player_mind.special_role = "Morph" ticker.mode.traitors |= player_mind - S << "<B>You are a Morph, a shapeshifting alien creature.</B><br>You can assume the shape of anything in sight by Shift-Clicking it.<br> You can only transform every 5 seconds.<br> To return to your basic form Shift-Click on yourself." + var/info = {"<B>You are a Morph, a shapeshifting alien creature.</B> + You can assume the shape of anything in sight by Shift-Clicking it. + You can only transform every 5 seconds. + To return to your basic form Shift-Click on yourself. + Base form is slow but strong, you're much weaker and faster when disguised. + You can eat items and corpses by clicking on them,eating corpses will heal you."} + S << info message_admins("[key_of_morph] has been made into Morph by an event.") log_game("[key_of_morph] was spawned as a Morph by an event.") return 1