From 83176c5ee255363b07658e37b44cd8971bf9df14 Mon Sep 17 00:00:00 2001 From: Miauw Date: Sun, 30 Mar 2014 20:06:06 +0200 Subject: [PATCH] improves le corgis immensely xd --- .../living/simple_animal/friendly/corgi.dm | 20 ++++++++++++++++++- .../reagent_containers/food/snacks.dm | 1 + 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm index 18dc43a104e..d311bfe2e80 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm @@ -325,13 +325,15 @@ name = "Ian" real_name = "Ian" //Intended to hold the name without altering it. gender = MALE - desc = "It's a corgi." + desc = "wow" var/turns_since_scan = 0 var/obj/movement_target response_help = "pets" response_disarm = "bops" response_harm = "kicks" + speak = list("wow", "such corgi", "much cute", "very pet") + /mob/living/simple_animal/corgi/Ian/Life() ..() @@ -376,6 +378,9 @@ if(prob(20)) emote("stares at [movement_target.loc]'s [movement_target] with a sad puppy-face") + if(prob(2)) + say(pick("wow", "such dog", "much corgi", "very cute")) + if(prob(1)) emote(pick("dances around","chases its tail")) spawn(0) @@ -383,6 +388,7 @@ dir = i sleep(1) + /mob/living/simple_animal/corgi/Ian/Bump(atom/movable/AM as mob|obj, yes) if ((!( yes ) || now_pushing)) return @@ -411,10 +417,22 @@ now_pushing = null //PC stuff-Sieve +/mob/living/simple_animal/corgi/Ian/Die() + say(pick("wow", "much die", "very dead", "such afterlife")) + ..() + +/mob/living/simple_animal/corgi/Ian/gib(animation) + say(pick("wow", "such gore", "much graphic", "very gib")) + ..() + +/mob/living/simple_animal/corgi/Ian/adjustBruteLoss(damage) + say(pick("wow", "much hurt", "very pain", "such damage")) + /mob/living/simple_animal/corgi/attackby(var/obj/item/O as obj, var/mob/user as mob) //Marker -Agouri if(istype(O, /obj/item/weapon/newspaper)) if(!stat) user.visible_message("\blue [user] baps [name] on the nose with the rolled up [O]") + say(pick("much pain", "very hurt", "such sad")) spawn(0) for(var/i in list(1,2,4,8,4,2,1,2)) dir = i diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index b32a18371b6..dfcf80dab74 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -194,6 +194,7 @@ if(iscorgi(M)) if(bitecount == 0 || prob(50)) M.emote("nibbles away at the [src]") + M.say(pick("wow", "such taste", "much food", "very eat")) bitecount++ if(bitecount >= 5) var/sattisfaction_text = pick("burps from enjoyment", "yaps for more", "woofs twice", "looks at the area where the [src] was")