diff --git a/code/modules/cargo/packs/livestock.dm b/code/modules/cargo/packs/livestock.dm index ebfb96ec23..83b831aa37 100644 --- a/code/modules/cargo/packs/livestock.dm +++ b/code/modules/cargo/packs/livestock.dm @@ -34,10 +34,55 @@ /datum/supply_pack/critter/parrot/generate() . = ..() - for(var/i in 1 to 4) - new /mob/living/simple_animal/parrot(.) - if(prob(1)) - new /mob/living/simple_animal/parrot/clock_hawk(.) + for(var/i in 1 to 5) + switch(rand(1, 23)) + if(1) + new /mob/living/simple_animal/parrot(.) + if(2) + new /mob/living/simple_animal/parrot/clock_hawk(.) + if(3) + new /mob/living/simple_animal/parrot/kea(.) + if(4) + new /mob/living/simple_animal/parrot/eclectus(.) + if(5) + new /mob/living/simple_animal/parrot/eclectusf(.) + if(6) + new /mob/living/simple_animal/parrot/greybird(.) + if(7) + new /mob/living/simple_animal/parrot/blue_caique(.) + if(8) + new /mob/living/simple_animal/parrot/white_caique(.) + if(9) + new /mob/living/simple_animal/parrot/green_budgerigar(.) + if(10) + new /mob/living/simple_animal/parrot/blue_Budgerigar(.) + if(11) + new /mob/living/simple_animal/parrot/bluegreen_Budgerigar(.) + if(12) + new /mob/living/simple_animal/parrot/commonblackbird(.) + if(13) + new /mob/living/simple_animal/parrot/azuretit(.) + if(14) + new /mob/living/simple_animal/parrot/europeanrobin(.) + if(15) + new /mob/living/simple_animal/parrot/goldcrest(.) + if(16) + new /mob/living/simple_animal/parrot/ringneckdove(.) + if(17) + new /mob/living/simple_animal/parrot/cockatiel(.) + if(18) + new /mob/living/simple_animal/parrot/white_cockatiel(.) + if(19) + new /mob/living/simple_animal/parrot/yellowish_cockatiel(.) + if(20) + new /mob/living/simple_animal/parrot/grey_cockatiel(.) + if(21) + new /mob/living/simple_animal/parrot/too(.) + if(22) + new /mob/living/simple_animal/parrot/hooded_too(.) + if(23) + new /mob/living/simple_animal/parrot/pink_too(.) + /datum/supply_pack/critter/butterfly name = "Butterflies Crate" diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 1ff7e2f799..deb18de42c 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -1034,3 +1034,131 @@ /mob/living/simple_animal/parrot/clock_hawk/ratvar_act() return + +// Different Parrot Breeds + +/mob/living/simple_animal/parrot/kea + name = "Kea" + icon_state = "kea-flap" + icon_living = "kea-flap" + icon_dead = "kea-dead" + +/mob/living/simple_animal/parrot/eclectus + name = "Eclectus" + icon_state = "eclectus-flap" + icon_living = "eclectus-flap" + icon_dead = "eclectus-dead" + +/mob/living/simple_animal/parrot/eclectusf + name = "Eclectus" + icon_state = "eclectusf-flap" + icon_living = "eclectusf-flap" + icon_dead = "eclectusf-dead" + +/mob/living/simple_animal/parrot/greybird + name = "Grey Bird" + icon_state = "agrey-flap" + icon_living = "agrey-flap" + icon_dead = "agrey-dead" + +/mob/living/simple_animal/parrot/blue_caique + name = "Blue Caique " + icon_state = "bcaique-flap" + icon_living = "bcaique-flap" + icon_dead = "bcaique-dead" + +/mob/living/simple_animal/parrot/white_caique + name = "White caique" + icon_state = "wcaique-flap" + icon_living = "wcaique-flap" + icon_dead = "wcaique-dead" + +/mob/living/simple_animal/parrot/green_budgerigar + name = "Green Budgerigar" + icon_state = "gbudge-flap" + icon_living = "gbudge-flap" + icon_dead = "gbudge-dead" + +/mob/living/simple_animal/parrot/blue_Budgerigar + name = "Blue Budgerigar" + icon_state = "bbudge-flap" + icon_living = "bbudge-flap" + icon_dead = "bbudge-dead" + +/mob/living/simple_animal/parrot/bluegreen_Budgerigar + name = "Bluegreen Budgerigar" + icon_state = "bgbudge-flap" + icon_living = "bgbudge-flap" + icon_dead = "bgbudge-dead" + +/mob/living/simple_animal/parrot/commonblackbird + name = "Black Bird" + icon_state = "commonblackbird" + icon_living = "commonblackbird" + icon_dead = "commonblackbird-dead" + +/mob/living/simple_animal/parrot/azuretit + name = "Azure Tit" + icon_state = "azuretit" + icon_living = "azuretit" + icon_dead = "azuretit-dead" + +/mob/living/simple_animal/parrot/europeanrobin + name = "European Robin" + icon_state = "europeanrobin" + icon_living = "europeanrobin" + icon_dead = "europeanrobin-dead" + +/mob/living/simple_animal/parrot/goldcrest + name = "Goldcrest" + icon_state = "goldcrest" + icon_living = "goldcrest" + icon_dead = "goldcrest-dead" + +/mob/living/simple_animal/parrot/ringneckdove + name = "Ringneck Dove" + icon_state = "ringneckdove" + icon_living = "ringneckdove" + icon_dead = "ringneckdove-dead" + +/mob/living/simple_animal/parrot/cockatiel + name = "Cockatiel" + icon_state = "tiel-flap" + icon_living = "tiel-flap" + icon_dead = "tiel-dead" + +/mob/living/simple_animal/parrot/white_cockatiel + name = "White Cockatiel" + icon_state = "wtiel-flap" + icon_living = "wtiel-flap" + icon_dead = "wtiel-dead" + +/mob/living/simple_animal/parrot/yellowish_cockatiel + name = "Yellowish Cockatiel" + icon_state = "luttiel-flap" + icon_living = "luttiel-flap" + icon_dead = "luttiel-dead" + +/mob/living/simple_animal/parrot/grey_cockatiel + name = "Grey Cockatiel" + icon_state = "blutiel-flap" + icon_living = "blutiel-flap" + icon_dead = "blutiel-dead" + +/mob/living/simple_animal/parrot/too + name = "Too" + icon_state = "too-flap" + icon_living = "too-flap" + icon_dead = "too-dead" + +/mob/living/simple_animal/parrot/hooded_too + name = "Utoo" + icon_state = "utoo-flap" + icon_living = "utoo-flap" + icon_dead = "utoo-dead" + +/mob/living/simple_animal/parrot/pink_too + name = "Mtoo" + icon_state = "mtoo-flap" + icon_living = "mtoo-flap" + icon_dead = "mtoo-dead" \ No newline at end of file diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi index 50bf65b27f..cdb57e0e1d 100644 Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ