Skip to content

Commit

Permalink
Merge pull request tgstation#10620 from AnturK/mimic_fixes
Browse files Browse the repository at this point in the history
Morph Fixes
  • Loading branch information
phil235 committed Jul 16, 2015
2 parents 0f37ac3 + f1a2385 commit ed1d1c1
Showing 1 changed file with 15 additions and 9 deletions.
24 changes: 15 additions & 9 deletions code/modules/mob/living/simple_animal/morph/morph.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
..()
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit ed1d1c1

Please sign in to comment.