From 0854f75f7be5cd4447d371de3c34e5a5848da5a3 Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Fri, 6 Sep 2019 19:06:41 -0400 Subject: [PATCH] Fixes Pugs --- code/game/objects/structures/crates_lockers/crittercrate.dm | 2 +- code/modules/mob/living/simple_animal/friendly/dog.dm | 2 +- code/modules/mob/transform_procs.dm | 2 +- code/modules/research/experimentor.dm | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/crittercrate.dm b/code/game/objects/structures/crates_lockers/crittercrate.dm index f1d58cd334a..a476440629c 100644 --- a/code/game/objects/structures/crates_lockers/crittercrate.dm +++ b/code/game/objects/structures/crates_lockers/crittercrate.dm @@ -75,7 +75,7 @@ /obj/structure/closet/critter/pug name = "pug crate" - content_mob = /mob/living/simple_animal/pet/pug + content_mob = /mob/living/simple_animal/pet/dog/pug /obj/structure/closet/critter/fox name = "fox crate" diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm index caa8eece169..5ba2440d3f5 100644 --- a/code/modules/mob/living/simple_animal/friendly/dog.dm +++ b/code/modules/mob/living/simple_animal/friendly/dog.dm @@ -756,7 +756,7 @@ gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY collar_type = "pug" -/mob/living/simple_animal/pet/pug/handle_automated_movement() +/mob/living/simple_animal/pet/dog/pug/handle_automated_movement() . = ..() if(!resting && !buckled) if(prob(1)) diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index ba54db9b415..565f5f2fd23 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -293,7 +293,7 @@ return 1 if(ispath(MP, /mob/living/simple_animal/chick)) return 1 - if(ispath(MP, /mob/living/simple_animal/pet/pug)) + if(ispath(MP, /mob/living/simple_animal/pet/dog/pug)) return 1 if(ispath(MP, /mob/living/simple_animal/butterfly)) return 1 diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index 581f4983d03..1548125b785 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -620,7 +620,7 @@ /obj/item/relic/New() icon_state = pick("shock_kit","armor-igniter-analyzer","infra-igniter0","infra-igniter1","radio-multitool","prox-radio1","radio-radio","timer-multitool0","radio-igniter-tank") realName = "[pick("broken","twisted","spun","improved","silly","regular","badly made")] [pick("device","object","toy","suspicious tech","gear")]" - floof = pick(/mob/living/simple_animal/pet/dog/corgi, /mob/living/simple_animal/pet/cat, /mob/living/simple_animal/pet/dog/fox, /mob/living/simple_animal/mouse, /mob/living/simple_animal/pet/pug, /mob/living/simple_animal/lizard, /mob/living/simple_animal/diona, /mob/living/simple_animal/butterfly, /mob/living/carbon/human/monkey) + floof = pick(/mob/living/simple_animal/pet/dog/corgi, /mob/living/simple_animal/pet/cat, /mob/living/simple_animal/pet/dog/fox, /mob/living/simple_animal/mouse, /mob/living/simple_animal/pet/dog/pug, /mob/living/simple_animal/lizard, /mob/living/simple_animal/diona, /mob/living/simple_animal/butterfly, /mob/living/carbon/human/monkey) /obj/item/relic/proc/reveal() @@ -677,7 +677,7 @@ to_chat(user, message) var/animals = rand(1,25) var/counter - var/list/valid_animals = list(/mob/living/simple_animal/parrot,/mob/living/simple_animal/butterfly,/mob/living/simple_animal/pet/cat,/mob/living/simple_animal/pet/dog/corgi,/mob/living/simple_animal/crab,/mob/living/simple_animal/pet/dog/fox,/mob/living/simple_animal/lizard,/mob/living/simple_animal/mouse,/mob/living/simple_animal/pet/pug,/mob/living/simple_animal/hostile/bear,/mob/living/simple_animal/hostile/poison/bees,/mob/living/simple_animal/hostile/carp) + var/list/valid_animals = list(/mob/living/simple_animal/parrot,/mob/living/simple_animal/butterfly,/mob/living/simple_animal/pet/cat,/mob/living/simple_animal/pet/dog/corgi,/mob/living/simple_animal/crab,/mob/living/simple_animal/pet/dog/fox,/mob/living/simple_animal/lizard,/mob/living/simple_animal/mouse,/mob/living/simple_animal/pet/dog/pug,/mob/living/simple_animal/hostile/bear,/mob/living/simple_animal/hostile/poison/bees,/mob/living/simple_animal/hostile/carp) for(counter = 1; counter < animals; counter++) var/mobType = pick(valid_animals) new mobType(get_turf(src))