Add resting animations for syndifox, syndicat, cats and dionas

This commit is contained in:
Markolie
2015-08-17 21:07:19 +02:00
parent 7dc1b6ee93
commit c688fd1c52
5 changed files with 18 additions and 2 deletions
@@ -5,6 +5,7 @@
icon_state = "cat2"
icon_living = "cat2"
icon_dead = "cat2_dead"
icon_resting = "cat_rest"
gender = MALE
speak = list("Meow!", "Esp!", "Purr!", "HSSSSS")
speak_emote = list("purrs", "meows")
@@ -76,6 +77,7 @@
icon_state = "kitten"
icon_living = "kitten"
icon_dead = "kitten_dead"
icon_resting = null
gender = NEUTER
density = 0
pass_flags = PASSMOB
@@ -86,6 +88,7 @@
icon_state = "Syndicat"
icon_living = "Syndicat"
icon_dead = "Syndicat_dead"
icon_resting = "Syndicat_rest"
gender = FEMALE
flags = IS_SYNTHETIC|NO_BREATHE
faction = list("syndicate")
@@ -6,7 +6,10 @@
/mob/living/simple_animal/diona
name = "diona nymph"
icon = 'icons/mob/monkey.dmi'
icon_state = "nymph1"
icon_state = "nymph"
icon_living = "nymph"
icon_dead = "nymph_dead"
icon_resting = "nymph_sleep"
pass_flags = PASSTABLE
small = 1
ventcrawler = 2
@@ -30,5 +30,6 @@
icon_state = "Syndifox"
icon_living = "Syndifox"
icon_dead = "Syndifox_dead"
icon_resting = "Syndifox_rest"
flags = IS_SYNTHETIC|NO_BREATHE
faction = list("syndicate")
@@ -8,6 +8,7 @@
var/icon_living = ""
var/icon_dead = ""
var/icon_resting = ""
var/icon_gib = null //We only try to show a gibbing animation if this exists.
var/oxygen_alert = 0
@@ -86,6 +87,10 @@
return
/mob/living/simple_animal/Life()
if(paralysis || stunned || weakened || buckled || resting)
canmove = 0
else
canmove = 1
//Health
if(stat == DEAD)
@@ -97,12 +102,16 @@
density = 1
return 0
if(health < 1)
Die()
if(health > maxHealth)
health = maxHealth
if(resting && icon_resting && stat != DEAD)
icon_state = icon_resting
else if(stat != DEAD)
icon_state = icon_living
if(sleeping)
sleeping = max(sleeping-1, 0)