Mob Refactor+Update and Pet Collars

This commit is contained in:
Fox-McCloud
2015-05-28 00:20:25 -04:00
parent e2f867e896
commit 5d3e837b4a
58 changed files with 646 additions and 389 deletions
+4 -4
View File
@@ -47,7 +47,7 @@
A.real_name = O.real_name
A.name = O.name
if(iscorgi(O))
var/mob/living/simple_animal/corgi/C = O
var/mob/living/simple_animal/pet/corgi/C = O
if(C.inventory_head)
C.inventory_head.loc = C.loc
if(C.inventory_back)
@@ -194,15 +194,15 @@ proc/wabbajack(mob/living/M)
var/animal = pick("parrot","corgi","crab","pug","cat","tomato","mouse","chicken","cow","lizard","chick","fox")
switch(animal)
if("parrot") new_mob = new /mob/living/simple_animal/parrot(M.loc)
if("corgi") new_mob = new /mob/living/simple_animal/corgi(M.loc)
if("corgi") new_mob = new /mob/living/simple_animal/pet/corgi(M.loc)
if("crab") new_mob = new /mob/living/simple_animal/crab(M.loc)
if("cat") new_mob = new /mob/living/simple_animal/cat(M.loc)
if("cat") new_mob = new /mob/living/simple_animal/pet/cat(M.loc)
if("tomato") new_mob = new /mob/living/simple_animal/tomato(M.loc)
if("mouse") new_mob = new /mob/living/simple_animal/mouse(M.loc)
if("chicken") new_mob = new /mob/living/simple_animal/chicken(M.loc)
if("cow") new_mob = new /mob/living/simple_animal/cow(M.loc)
if("lizard") new_mob = new /mob/living/simple_animal/lizard(M.loc)
if("fox") new_mob = new /mob/living/simple_animal/fox(M.loc)
if("fox") new_mob = new /mob/living/simple_animal/pet/fox(M.loc)
else new_mob = new /mob/living/simple_animal/chick(M.loc)
new_mob.universal_speak = 1
if("human")