mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 02:09:41 +00:00
[MIRROR] Adds a turkey mob and reworks regular Turkey recipe (#9548)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
59646ea376
commit
9c41fc4b92
@@ -109,6 +109,7 @@
|
||||
#define FACTION_TYR "tyr" //CHOMPAdd
|
||||
#define FACTION_TYR_ANT "tyr_ants" //CHOMPAdd
|
||||
#define FACTION_TUNNELCLOWN "tunnelclown"
|
||||
#define FACTION_TURKEY "turkey"
|
||||
#define FACTION_WILD_ANIMAL "wild animal"
|
||||
#define FACTION_WOLFGIRL "wolfgirl"
|
||||
#define FACTION_WOLFTAUR "wolftaur"
|
||||
|
||||
@@ -95,6 +95,13 @@
|
||||
containername = "Chicken crate"
|
||||
access = access_hydroponics
|
||||
|
||||
/datum/supply_pack/hydro/turkey
|
||||
name = "Turkey crate"
|
||||
cost = 25
|
||||
containertype = /obj/structure/largecrate/animal/turkey
|
||||
containername = "Turkey crate"
|
||||
access = access_hydroponics
|
||||
|
||||
/datum/supply_pack/hydro/seeds
|
||||
name = "Seeds crate"
|
||||
contains = list(
|
||||
|
||||
@@ -115,6 +115,12 @@
|
||||
drop_sound = 'sound/items/drop/food.ogg'
|
||||
pickup_sound = 'sound/items/pickup/food.ogg'
|
||||
|
||||
/obj/item/trash/turkeybones
|
||||
name = "turkey bones"
|
||||
icon_state = "turkeybones"
|
||||
drop_sound = 'sound/items/drop/food.ogg'
|
||||
pickup_sound = 'sound/items/pickup/food.ogg'
|
||||
|
||||
/obj/item/trash/pistachios
|
||||
name = "pistachios packet"
|
||||
icon_state = "pistachios_pack"
|
||||
|
||||
@@ -127,6 +127,10 @@
|
||||
name = "chicken crate"
|
||||
starts_with = list(/mob/living/simple_mob/animal/passive/chick = 5)
|
||||
|
||||
/obj/structure/largecrate/animal/turkey
|
||||
name = "turkey crate"
|
||||
starts_with = list(/mob/living/simple_mob/vore/turkey)
|
||||
|
||||
/obj/structure/largecrate/animal/catslug
|
||||
name = "catslug carrier"
|
||||
starts_with = list(/mob/living/simple_mob/vore/alienanimals/catslug)
|
||||
|
||||
@@ -409,10 +409,14 @@
|
||||
S.food_inserted_micros = list()
|
||||
S.food_inserted_micros += F
|
||||
food_inserted_micros -= F
|
||||
on_slice_extra()
|
||||
|
||||
qdel(src)
|
||||
return
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/proc/on_slice_extra()
|
||||
return
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/MouseDrop_T(mob/living/M, mob/user)
|
||||
if(!user.stat && istype(M) && (M == user) && Adjacent(M) && (M.get_effective_size(TRUE) <= 0.50) && food_can_insert_micro)
|
||||
if(!food_inserted_micros)
|
||||
@@ -3770,6 +3774,7 @@
|
||||
trash = /obj/item/trash/plate
|
||||
bitesize = 2
|
||||
|
||||
/* OLD RECIPE
|
||||
/obj/item/reagent_containers/food/snacks/sliceable/turkey
|
||||
name = "turkey"
|
||||
desc = "Tastes like chicken."
|
||||
@@ -3796,6 +3801,51 @@
|
||||
icon_state = "turkey_drumstick"
|
||||
trash = /obj/item/trash/plate
|
||||
bitesize = 2
|
||||
*/
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/sliceable/turkey
|
||||
name = "turkey"
|
||||
desc = "Tastes like chicken."
|
||||
icon = 'icons/obj/food.dmi'
|
||||
icon_state = "roastturkey"
|
||||
slice_path = /obj/item/reagent_containers/food/snacks/turkeyslice
|
||||
slices_num = 6
|
||||
w_class = 2
|
||||
nutriment_amt = 20
|
||||
nutriment_desc = list("turkey" = 20)
|
||||
bitesize = 5
|
||||
trash = /obj/item/trash/turkeybones
|
||||
var/list/extra_product = list(/obj/item/reagent_containers/food/snacks/turkeydrumstick = 2,
|
||||
/obj/item/trash/turkeybones = 1)
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/sliceable/turkey/Initialize()
|
||||
. = ..()
|
||||
reagents.add_reagent("blackpepper", 1)
|
||||
reagents.add_reagent("sodiumchloride", 1)
|
||||
reagents.add_reagent("cookingoil", 1)
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/sliceable/turkey/on_slice_extra()
|
||||
for(var/i in extra_product)
|
||||
for(var/j=1 to extra_product[i])
|
||||
new i(src.loc)
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/turkeyslice
|
||||
name = "turkey'n'mash"
|
||||
desc = "Turkey slices with some delicious stuffing."
|
||||
icon = 'icons/obj/food.dmi'
|
||||
icon_state = "roastturkeynmash"
|
||||
trash = /obj/item/trash/plate
|
||||
bitesize = 2
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/turkeydrumstick
|
||||
name = "turkey drumstick"
|
||||
desc = "The best part!"
|
||||
icon = 'icons/obj/food.dmi'
|
||||
icon_state = "roastturkeydrumstick"
|
||||
trash = null
|
||||
nutriment_amt = 8
|
||||
nutriment_desc = list("turkey" = 20)
|
||||
bitesize = 2
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/sliceable/suppermatter
|
||||
name = "suppermatter"
|
||||
|
||||
@@ -137,6 +137,16 @@
|
||||
reagents.add_reagent("spidertoxin",6)
|
||||
reagents.remove_reagent("pacid",6)
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/rawturkey
|
||||
name = "raw turkey"
|
||||
desc = "Naked and hollow."
|
||||
icon_state = "rawturkey"
|
||||
bitesize = 2.5
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/rawturkey/Initialize()
|
||||
. = ..()
|
||||
reagents.add_reagent("protein", 10)
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/meat/fox
|
||||
name = "foxmeat"
|
||||
desc = "The fox doesn't say a goddamn thing, now."
|
||||
|
||||
@@ -33,6 +33,7 @@
|
||||
reagent_mix = RECIPE_REAGENT_REPLACE
|
||||
result = /obj/item/reagent_containers/food/snacks/ribplate
|
||||
|
||||
/* OLD RECIPE
|
||||
/datum/recipe/turkey
|
||||
appliance = OVEN
|
||||
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
|
||||
@@ -41,6 +42,17 @@
|
||||
/obj/item/reagent_containers/food/snacks/stuffing
|
||||
)
|
||||
result = /obj/item/reagent_containers/food/snacks/sliceable/turkey
|
||||
*/
|
||||
|
||||
/datum/recipe/turkey
|
||||
appliance = OVEN
|
||||
fruit = list("potato" = 1)
|
||||
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
|
||||
items = list(
|
||||
/obj/item/reagent_containers/food/snacks/rawturkey,
|
||||
/obj/item/reagent_containers/food/snacks/stuffing
|
||||
)
|
||||
result = /obj/item/reagent_containers/food/snacks/sliceable/turkey
|
||||
|
||||
/datum/recipe/tofurkey
|
||||
appliance = OVEN
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
/mob/living
|
||||
var/meat_amount = 0 // How much meat to drop from this mob when butchered
|
||||
var/obj/meat_type // The meat object to drop
|
||||
var/name_the_meat = TRUE
|
||||
|
||||
var/gib_on_butchery = FALSE
|
||||
var/butchery_drops_organs = TRUE // Do we spawn and/or drop organs when butchered?
|
||||
@@ -17,7 +18,8 @@
|
||||
being_butchered = TRUE
|
||||
while(meat_amount > 0 && do_after(user, 0.5 SECONDS * (mob_size / 10), src))
|
||||
var/obj/item/meat = new meat_type(get_turf(src))
|
||||
meat.name = "[src.name] [meat.name]"
|
||||
if(name_the_meat)
|
||||
meat.name = "[src.name] [meat.name]"
|
||||
new /obj/effect/decal/cleanable/blood/splatter(get_turf(src))
|
||||
meat_amount--
|
||||
being_butchered = FALSE
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
icon_rest = "wah_rest"
|
||||
icon = 'icons/mob/vore.dmi'
|
||||
|
||||
faction = FACTION_REDPANDA //stop naming stuff vaguely
|
||||
faction = FACTION_REDPANDA
|
||||
maxHealth = 30
|
||||
health = 30
|
||||
|
||||
|
||||
43
code/modules/mob/living/simple_mob/subtypes/vore/turkey.dm
Normal file
43
code/modules/mob/living/simple_mob/subtypes/vore/turkey.dm
Normal file
@@ -0,0 +1,43 @@
|
||||
/mob/living/simple_mob/vore/turkey
|
||||
name = "turkey"
|
||||
desc = "A large turkey, all ready for stuffing."
|
||||
tt_desc = "Meleagris gallopavo"
|
||||
|
||||
icon_state = "turkey"
|
||||
icon_living = "turkey"
|
||||
icon_dead = "turkeydead"
|
||||
icon_rest = "turkeyrest"
|
||||
icon = 'icons/mob/vore.dmi'
|
||||
|
||||
faction = FACTION_TURKEY
|
||||
maxHealth = 25
|
||||
health = 25
|
||||
|
||||
meat_amount = 1
|
||||
meat_type = /obj/item/reagent_containers/food/snacks/rawturkey
|
||||
name_the_meat = FALSE
|
||||
|
||||
response_help = "pats"
|
||||
response_disarm = "gently pushes aside"
|
||||
response_harm = "hits"
|
||||
|
||||
harm_intent_damage = 3
|
||||
melee_damage_lower = 3
|
||||
melee_damage_upper = 1
|
||||
attacktext = list("pecked")
|
||||
|
||||
say_list_type = /datum/say_list/turkey
|
||||
ai_holder_type = /datum/ai_holder/simple_mob/passive
|
||||
|
||||
allow_mind_transfer = TRUE
|
||||
|
||||
vore_active = 1
|
||||
vore_bump_chance = 10
|
||||
vore_bump_emote = "greedily leaps at"
|
||||
vore_default_mode = DM_HOLD
|
||||
vore_icons = SA_ICON_LIVING
|
||||
|
||||
/datum/say_list/turkey
|
||||
speak = list("GOBBLEGOBBLE!","Gobble?","Gobblegobble...")
|
||||
emote_hear = list("gobbles!")
|
||||
emote_see = list("flaps its wings","pecks something on the floor","puffs up its feathers")
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 438 KiB After Width: | Height: | Size: 444 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 213 KiB After Width: | Height: | Size: 215 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 43 KiB After Width: | Height: | Size: 44 KiB |
@@ -3423,7 +3423,6 @@
|
||||
#include "code\modules\mob\living\simple_mob\taming.dm"
|
||||
#include "code\modules\mob\living\simple_mob\subtypes\animal\animal.dm"
|
||||
#include "code\modules\mob\living\simple_mob\subtypes\animal\squirrel.dm"
|
||||
#include "code\modules\mob\living\simple_mob\subtypes\animal\turkeygirl.dm"
|
||||
#include "code\modules\mob\living\simple_mob\subtypes\animal\vox.dm"
|
||||
#include "code\modules\mob\living\simple_mob\subtypes\animal\alien animals\catslug.dm"
|
||||
#include "code\modules\mob\living\simple_mob\subtypes\animal\alien animals\jellyfish.dm"
|
||||
@@ -3661,6 +3660,7 @@
|
||||
#include "code\modules\mob\living\simple_mob\subtypes\vore\sonadile.dm"
|
||||
#include "code\modules\mob\living\simple_mob\subtypes\vore\stalker.dm"
|
||||
#include "code\modules\mob\living\simple_mob\subtypes\vore\succubi.dm"
|
||||
#include "code\modules\mob\living\simple_mob\subtypes\vore\turkey.dm"
|
||||
#include "code\modules\mob\living\simple_mob\subtypes\vore\vampire.dm"
|
||||
#include "code\modules\mob\living\simple_mob\subtypes\vore\vore.dm"
|
||||
#include "code\modules\mob\living\simple_mob\subtypes\vore\vore_hostile.dm"
|
||||
|
||||
Reference in New Issue
Block a user