Merge pull request #1193 from Fox-McCloud/mobs-pets-stuffs

Simple Animal Refactor+Update+Fixes and Pet Collars
This commit is contained in:
ZomgPonies
2015-05-28 22:45:03 -04:00
58 changed files with 619 additions and 361 deletions
+1 -1
View File
@@ -1416,7 +1416,7 @@ datum/mind
..()
mind.assigned_role = "Animal"
/mob/living/simple_animal/corgi/mind_initialize()
/mob/living/simple_animal/pet/corgi/mind_initialize()
..()
mind.assigned_role = "Corgi"
+4
View File
@@ -857,24 +857,28 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
name = "Corgi Crate"
cost = 50
containertype = /obj/structure/closet/critter/corgi
contains = list(/obj/item/clothing/accessory/petcollar)
containername = "corgi crate"
/datum/supply_packs/organic/cat
name = "Cat Crate"
cost = 50 //Cats are worth as much as corgis.
containertype = /obj/structure/closet/critter/cat
contains = list(/obj/item/clothing/accessory/petcollar)
containername = "cat crate"
/datum/supply_packs/organic/pug
name = "Pug Crate"
cost = 50
containertype = /obj/structure/closet/critter/pug
contains = list(/obj/item/clothing/accessory/petcollar)
containername = "pug crate"
/datum/supply_packs/organic/fox
name = "Fox Crate"
cost = 55 //Foxes are cool.
containertype = /obj/structure/closet/critter/fox
contains = list(/obj/item/clothing/accessory/petcollar)
containername = "fox crate"
/datum/supply_packs/organic/butterfly