Merge pull request #4 from Vulpias/Vulpias-patch-2

final update.

code/modules/mob/living/simple_animal/animals/synx.dm

@@ -13,7 +13,7 @@
 	maxHealth = 150
 	health = 120
 	turns_per_move = 3
-	speed = -3
+	speed = -2
 	see_in_dark = 6
 	stop_when_pulled = 0
 	armor = list(			// will be determined
@@ -58,7 +58,7 @@
 /mob/living/simple_animal/neutral/synx/New()
 	..()
 	verbs |= /mob/living/proc/ventcrawl
-	verbs |= /mob/living/proc/hide
+	verbs |= /mob/living/simple_animal/proc/contort
 	verbs |= /mob/living/proc/disguise
 
 mob/living/simple_animal/synx/PunchTarget()
@@ -82,3 +82,22 @@ mob/living/simple_animal/synx/PunchTarget()
 		..()
 
 
+/mob/living/simple_animal/proc/contort()
+	set name = "contort"
+	set desc = "Allows to hide beneath tables or certain items. Toggled on or off."
+	set category = "Abilities"
+
+	if(stat == DEAD || paralysis || weakened || stunned || restrained())
+		return
+
+	if(status_flags & HIDING)
+		status_flags &= ~HIDING
+		reset_plane_and_layer()
+		to_chat(src,"<span class='notice'>You have stopped hiding.</span>")
+		speed = -3
+	else
+		status_flags |= HIDING
+		layer = HIDING_LAYER //Just above cables with their 2.44
+		plane = OBJ_PLANE
+		to_chat(src,"<span class='notice'>You are now hiding.</span>")
+		speed = 2

code/modules/mob/living/synx_powers.dm

@@ -3,18 +3,19 @@ mob/living/proc/disguise()
 	set desc = "Switch between amorphous and humanoid forms."
 	set category = "Abilities"
 
-	//Blob form
+	//Transformed form
 	if(icon_state !="bear")
 		icon_state="bear"
+		to_chat(src,"<span class='warning'>you changed back into your disguise.</span>")
 		if(icon_state== "bear")
 			to_chat(temporary_form,"<span class='warning'>You can only do this while not stunned.</span>")
 		else
 			to_chat(src,"<span class='warning'>you failed.</span>")
 
-	//Human form
+	//Normal form form
 	else if(stat)
 		to_chat(src,"<span class='warning'>You can only do this while not stunned.</span>")
 		return
 	else
-		to_chat(src,"<span class='warning'>you failed2.</span>")
+		to_chat(src,"<span class='warning'>now they see your true form.</span>")
 		icon_state="synx"