diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 67fa2e18475..50a03307add 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -30,9 +30,6 @@ for(var/i=0;i<7;i++) // 2 for medHUDs and 5 for secHUDs hud_list += image('icons/mob/hud.dmi', src, "hudunknown") - if(real_name == "John McClane") - ventcrawler = 2 - ..() /mob/living/carbon/human/Destroy() diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm index e1a62f88c67..3efbcf57757 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm @@ -331,15 +331,13 @@ name = "Ian" real_name = "Ian" //Intended to hold the name without altering it. gender = MALE - desc = "wow" + desc = "It's a corgi." 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() ..() @@ -384,9 +382,6 @@ 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) @@ -394,7 +389,6 @@ dir = i sleep(1) - /mob/living/simple_animal/corgi/Ian/Bump(atom/movable/AM as mob|obj, yes) if ((!( yes ) || now_pushing)) return @@ -423,22 +417,10 @@ 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 73d0abc6e0b..710f8bc9543 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -197,7 +197,6 @@ 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")