From 540a6e8ed65ceb62673867beb23115e2211605bf Mon Sep 17 00:00:00 2001 From: bgobandit Date: Sat, 27 Feb 2016 19:00:47 -0500 Subject: [PATCH 1/5] Space cats have a full set of sprites. Player controlled cats can now properly lie down. --- .../mob/living/simple_animal/friendly/cat.dm | 23 +++++++++++++++--- icons/mob/pets.dmi | Bin 30681 -> 31349 bytes 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index 2ed5b6404db..9b5a9cd8fb4 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -30,6 +30,18 @@ var/mob/living/simple_animal/mouse/movement_target gold_core_spawnable = 2 +/mob/living/simple_animal/pet/cat/New() + ..() + verbs += /mob/living/proc/lay_down + +/mob/living/simple_animal/pet/cat/update_canmove() + ..() + if(resting) + icon_state = "[icon_living]_rest" + else + icon_state = "[icon_living]" + + /mob/living/simple_animal/pet/cat/space name = "space cat" desc = "It's a cat... in space!" @@ -124,20 +136,23 @@ /mob/living/simple_animal/pet/cat/Life() if(!stat && !buckled) if(prob(1)) - emote("me", 1, pick("stretches out for a belly rub.", "wags its tail.")) + emote("me", 1, pick("stretches out for a belly rub.", "wags its tail.", "lies down.")) icon_state = "[icon_living]_rest" resting = 1 + canmove = 0 else if (prob(1)) - emote("me", 1, pick("sits down.", "crouches on its hind legs.")) + emote("me", 1, pick("sits down.", "crouches on its hind legs.", "looks alert.")) icon_state = "[icon_living]_sit" resting = 1 + canmove = 0 else if (prob(1)) if (resting) - emote("me", 1, pick("gets up and meows.", "walks around.")) + emote("me", 1, pick("gets up and meows.", "walks around.", "stops resting.")) icon_state = "[icon_living]" resting = 0 + canmove = 1 else - emote("me", 1, pick("grooms its fur.", "twitches its whiskers.")) + emote("me", 1, pick("grooms its fur.", "twitches its whiskers.", "shakes out its coat.")) //MICE! if((src.loc) && isturf(src.loc)) diff --git a/icons/mob/pets.dmi b/icons/mob/pets.dmi index 2552baf06fe484305e93777f90b0cdead68d0abd..d32dc5faa11b1418a3cf6288cafbbc889a99e769 100644 GIT binary patch delta 10482 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 From 7788ef5f078e0fb096b05d63192ec239158e5c48 Mon Sep 17 00:00:00 2001 From: bgobandit Date: Tue, 1 Mar 2016 09:13:44 -0500 Subject: [PATCH 2/5] changes procs --- code/modules/mob/living/simple_animal/friendly/cat.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index 9b5a9cd8fb4..44df9b15496 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -134,23 +134,23 @@ gold_core_spawnable = 0 /mob/living/simple_animal/pet/cat/Life() - if(!stat && !buckled) + if(!stat && !buckled && !client) if(prob(1)) emote("me", 1, pick("stretches out for a belly rub.", "wags its tail.", "lies down.")) icon_state = "[icon_living]_rest" resting = 1 - canmove = 0 + update_canmove() else if (prob(1)) emote("me", 1, pick("sits down.", "crouches on its hind legs.", "looks alert.")) icon_state = "[icon_living]_sit" resting = 1 - canmove = 0 + update_canmove() else if (prob(1)) if (resting) emote("me", 1, pick("gets up and meows.", "walks around.", "stops resting.")) icon_state = "[icon_living]" resting = 0 - canmove = 1 + update_canmove() else emote("me", 1, pick("grooms its fur.", "twitches its whiskers.", "shakes out its coat.")) From 92d762c8f478f2f9eac0908261bad36ad38b4b22 Mon Sep 17 00:00:00 2001 From: bgobandit Date: Mon, 7 Mar 2016 06:54:26 -0500 Subject: [PATCH 3/5] test --- icons/mob/pets.dmi | Bin 31349 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 icons/mob/pets.dmi diff --git a/icons/mob/pets.dmi b/icons/mob/pets.dmi deleted file mode 100644 index d32dc5faa11b1418a3cf6288cafbbc889a99e769..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31349 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 Un`xs*gn*x{)JMs33B#}d3!qb(nE(I) From 128cf1e19d478bf39c8ce3c94193ae47d73272b1 Mon Sep 17 00:00:00 2001 From: bgobandit Date: Mon, 7 Mar 2016 07:07:34 -0500 Subject: [PATCH 4/5] test --- code/modules/mob/living/simple_animal/friendly/cat.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index 44df9b15496..2092f99c934 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -54,7 +54,7 @@ /mob/living/simple_animal/pet/cat/kitten name = "kitten" - desc = "D'aaawwww" + desc = "D'aaawwww." icon_state = "kitten" icon_living = "kitten" icon_dead = "kitten_dead" From dbd01d8a43e0967ffd7bb17cd910238df8753fb9 Mon Sep 17 00:00:00 2001 From: bgobandit Date: Mon, 7 Mar 2016 12:28:35 -0500 Subject: [PATCH 5/5] fixed --- code/modules/mob/living/simple_animal/friendly/cat.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index a7ba54fb4b6..bd3419fc0a4 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -36,10 +36,11 @@ /mob/living/simple_animal/pet/cat/update_canmove() ..() - if(client && resting) - icon_state = "[icon_living]_rest" - else - icon_state = "[icon_living]" + if(client) + if (resting) + icon_state = "[icon_living]_rest" + else + icon_state = "[icon_living]" /mob/living/simple_animal/pet/cat/space