diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index df870eb3715..48453278986 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -878,6 +878,12 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine containertype = /obj/structure/closet/critter/chick containername = "chicken crate" +/datum/supply_packs/organic/turkey + name = "Turkey Crate" + cost = 20 + containertype = /obj/structure/closet/critter/turkey + containername = "turkey crate" + /datum/supply_packs/organic/corgi name = "Corgi Crate" cost = 50 diff --git a/code/game/objects/effects/decals/misc.dm b/code/game/objects/effects/decals/misc.dm index e7f0fb03cad..6731c0f57da 100644 --- a/code/game/objects/effects/decals/misc.dm +++ b/code/game/objects/effects/decals/misc.dm @@ -36,3 +36,19 @@ /obj/effect/decal/snow/sand/surround icon_state="gravsnow_surround" + +/obj/effect/decal/leaves + name="fall leaves" + density = 0 + anchored = 1 + layer = 2 + icon='icons/obj/flora/plants.dmi' + icon_state = "fallleaves" + +/obj/effect/decal/straw + name="scattered straw" + density = 0 + anchored = 1 + layer = 2 + icon='icons/obj/flora/plants.dmi' + icon_state = "strawscattered" \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/crittercrate.dm b/code/game/objects/structures/crates_lockers/crittercrate.dm index 19c3c2614ed..e0c07307373 100644 --- a/code/game/objects/structures/crates_lockers/crittercrate.dm +++ b/code/game/objects/structures/crates_lockers/crittercrate.dm @@ -57,6 +57,10 @@ name = "goat crate" content_mob = /mob/living/simple_animal/hostile/retaliate/goat +/obj/structure/closet/critter/turkey + name = "turkey crate" + content_mob = /mob/living/simple_animal/turkey + /obj/structure/closet/critter/chick name = "chicken crate" content_mob = /mob/living/simple_animal/chick diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 4922ca9c788..1dc18de23ba 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -229,4 +229,30 @@ /obj/structure/flora/rock/pile/New() ..() - icon_state = "rockpile[rand(1,5)]" \ No newline at end of file + icon_state = "rockpile[rand(1,5)]" + +/obj/structure/flora/corn_stalk + name = "corn stalk" + icon = 'icons/obj/flora/plants.dmi' + icon_state = "cornstalk1" + anchored = 0 + layer = 5 + +/obj/structure/flora/corn_stalk/alt_1 + icon_state = "cornstalk2" + +/obj/structure/flora/corn_stalk/alt_2 + icon_state = "cornstalk3" + +/obj/structure/flora/straw_bail + name = "straw bail" + icon = 'icons/obj/flora/plants.dmi' + icon_state = "strawbail1" + density = 1 + climbable = 1 // you can climb all over them. + +/obj/structure/flora/straw_bail/alt_1 + icon_state = "strawbail2" + +/obj/structure/flora/straw_bail/alt_2 + icon_state = "strawbail3" \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index 070e61ef284..1aa802bfb1a 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -298,6 +298,27 @@ var/global/chicken_count = 0 attacktext = "kicks" health = 50 +/mob/living/simple_animal/turkey + name = "turkey" + desc = "Benjamin Franklin would be proud." + icon_state = "turkey" + icon_living = "turkey" + icon_dead = "turkey_dead" + icon_resting = "turkey_rest" + speak = list("gobble?","gobble","GOBBLE") + speak_emote = list("gobble") + emote_see = list("struts around") + speak_chance = 1 + turns_per_move = 5 + see_in_dark = 6 + meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat //enough to make one turkey + meat_amount = 4 + response_help = "pets the" + response_disarm = "gently pushes aside the" + response_harm = "kicks the" + attacktext = "pecks" + health = 50 + /mob/living/simple_animal/goose name = "goose" desc = "A pretty goose. Would make a nice comforter." diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi index 69822c8706f..3829370cf4f 100644 Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ diff --git a/icons/obj/flora/plants.dmi b/icons/obj/flora/plants.dmi index fbc2d62dcad..0d66e6e9f24 100644 Binary files a/icons/obj/flora/plants.dmi and b/icons/obj/flora/plants.dmi differ diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index f3721033609..b0a652de4f5 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ