cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 03:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10342 from Ketrai/fennetreatstwo

Browse Source 
Adds some fennec treats
This commit is contained in:
Aronai Sieyes
2021-05-20 15:54:05 -04:00
committed by GitHub
parent 6d8b8ea590 627200efed
commit 20e0fcd2d9
13 changed files with 276 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/supplypacks/hydroponics_vr.dm
+23 -1
View File
@@ -48,4 +48,26 @@
)
cost = 20
containertype = /obj/structure/closet/crate/freezer
containername = "Fish crate"
containername = "Fish crate"
/datum/supply_pack/hydro/fennec_food
name = "Fennec treats crate"
contains = list(
/obj/item/weapon/reagent_containers/food/snacks/locust = 6,
/obj/item/weapon/storage/box/wings/bucket = 2,
/obj/item/weapon/reagent_containers/food/snacks/grub_pink = 2,
/obj/item/weapon/reagent_containers/food/snacks/grub_blue = 2,
/obj/item/weapon/reagent_containers/food/snacks/grub_purple = 2,
/obj/item/weapon/reagent_containers/food/snacks/honey_candy = 4,
/obj/item/weapon/reagent_containers/food/snacks/scorpion = 4,
/obj/item/weapon/reagent_containers/food/snacks/ant = 4
)
cost = 20
containertype = /obj/structure/closet/crate/fennec
containername = "Fennec treats crate"
/datum/supply_pack/hydro/jerboa
name = "Jerboa crate"
cost = 10
containertype = /obj/structure/largecrate/animal/jerboa
containername = "Jerboa crate"
code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm
+6 -1
View File
@@ -93,4 +93,9 @@
"stripe_vertical_left_full" = COLOR_GRAY20,
"stripe_vertical_right_full" = COLOR_GRAY20,
"exped" = COLOR_GRAY20
)
)
/decl/closet_appearance/crate/fennec
base_icon = 'icons/obj/closets/bases/fencrate_vr.dmi'
decal_icon = 'icons/obj/closets/decals/crate.dmi'
color = "#ffffff"
code/game/objects/structures/crates_lockers/crates_vr.dm
+8 -1
View File
@@ -34,4 +34,11 @@
return
/obj/structure/closet/crate/medical/blood
closet_appearance = /decl/closet_appearance/cart/biohazard/alt
closet_appearance = /decl/closet_appearance/cart/biohazard/alt
/obj/structure/closet/crate/fennec
name = "fennec treats crate"
desc = "A colorful crate filled with specialties catering to fennecs."
icon = 'icons/obj/closets/bases/fencrate_vr.dmi'
closet_appearance = /decl/closet_appearance/crate/fennec
points_per_crate = 0
code/game/objects/structures/crates_lockers/largecrate_vr.dm
+5
View File
@@ -134,3 +134,8 @@
starts_with = list(pick(/mob/living/simple_mob/vore/fennec,
/mob/living/simple_mob/vore/fennix;0.5))
return ..()
/obj/structure/largecrate/animal/jerboa
name = "Jerboa Crate"
desc = "Lots, and lots of squeaking."
starts_with = list(/mob/living/simple_mob/animal/passive/mouse/jerboa)
code/modules/food/food/snacks_vr.dm
+157
View File
@@ -600,4 +600,161 @@
. = ..()
bitesize = 3
//Fennec foods
/obj/item/weapon/storage/box/wings/bucket
name = "Bucket o' grubs"
desc = "A bucket full of writhing grubs."
icon_state = "bucket6"
icon_base = "bucket"
startswith = 6
w_class = ITEMSIZE_LARGE
max_storage_space = ITEMSIZE_COST_SMALL * 6
starts_with = list(
/obj/item/weapon/reagent_containers/food/snacks/grub = 6
)
can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/grub)
/obj/item/weapon/reagent_containers/food/snacks/grub
name = "grub"
desc = "a still writhing grub, soft and squishy."
icon = 'icons/obj/food_vr.dmi'
icon_state = "grub"
nutriment_amt = 3
nutriment_desc = list("goo" = 1, "slime" = 1)
/obj/item/weapon/reagent_containers/food/snacks/grub/Initialize()
. = ..()
reagents.add_reagent("protein", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/grub_pink
name = "pink candy grub"
desc = "a thoroughly candied grub, it smells of raspberry."
icon = 'icons/obj/food_vr.dmi'
icon_state = "grub_pink"
nutriment_amt = 5
nutriment_desc = list("raspberry" = 4, "goo" = 1)
/obj/item/weapon/reagent_containers/food/snacks/grub_pink/Initialize()
. = ..()
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/grub_purple
name = "pink candy grub"
desc = "a thoroughly candied grub, it smells of grape."
icon = 'icons/obj/food_vr.dmi'
icon_state = "grub_purple"
nutriment_amt = 5
nutriment_desc = list("grape" = 4, "goo" = 1)
/obj/item/weapon/reagent_containers/food/snacks/grub_purple/Initialize()
. = ..()
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/grub_blue
name = "pink candy grub"
desc = "a thoroughly candied grub, it smells of blueberry."
icon = 'icons/obj/food_vr.dmi'
icon_state = "grub_blue"
nutriment_amt = 5
nutriment_desc = list("blueberry" = 4, "goo" = 1)
/obj/item/weapon/reagent_containers/food/snacks/grub_blue/Initialize()
. = ..()
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/scorpion
name = "scorpion"
desc = "a scorpion from the sandy deserts, don't get stung!"
icon = 'icons/obj/food_vr.dmi'
icon_state = "scorpion"
nutriment_amt = 8
nutriment_desc = list("crunchy" = 4, "shell bits" = 1)
/obj/item/weapon/reagent_containers/food/snacks/scorpion/Initialize()
. = ..()
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/scorpion_cooked
name = "fried scorpion"
desc = "a scorpion baked nice and crispy"
icon = 'icons/obj/food_vr.dmi'
icon_state = "scorpion_cooked"
nutriment_amt = 6
nutriment_desc = list("crispy" = 4, "exotic meat" = 1)
/obj/item/weapon/reagent_containers/food/snacks/scorpion_cooked/Initialize()
. = ..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("protein", 4)
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/ant
name = "giant honey ant"
desc = "a sweetly scented honey ant. it has a huge swollen abdomen full of yummy."
icon = 'icons/obj/food_vr.dmi'
icon_state = "honeyant"
nutriment_amt = 2
nutriment_desc = list("crunchy" = 1, "goo" = 1)
slice_path = /obj/item/weapon/reagent_containers/food/snacks/antball
slices_num = 1
/obj/item/weapon/reagent_containers/food/snacks/ant/Initialize()
. = ..()
reagents.add_reagent("honey", 2)
reagents.add_reagent("protein", 3)
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/antball
name = "giant honey ball"
desc = "a sweetly scented honey ball, minus the ant. For those who don't like bug bits between their teeth."
icon = 'icons/obj/food_vr.dmi'
icon_state = "honeyant_clean"
nutriment_amt = 4
nutriment_desc = list("goo" = 1)
/obj/item/weapon/reagent_containers/food/snacks/antball/Initialize()
. = ..()
reagents.add_reagent("honey", 2)
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/honey_candy
name = "honey candy"
desc = "a clever mimicery of a honey ant abdomen, but it's just a piece of candy. Does not contain actual honey"
icon = 'icons/obj/food_vr.dmi'
icon_state = "candy_honey"
nutriment_amt = 4
nutriment_desc = list("goo" = 1, "honey" = 1)
slice_path = /obj/item/weapon/reagent_containers/food/snacks/antball
slices_num = 1
/obj/item/weapon/reagent_containers/food/snacks/honey_candy/Initialize()
. = ..()
reagents.add_reagent("sugar", 2)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/locust
name = "yellow jacket locust"
desc = "a vibrant bug that looks like a wasp, but is in fact a locust. Crunchy"
icon = 'icons/obj/food_vr.dmi'
icon_state = "locust"
nutriment_amt = 4
nutriment_desc = list("crunchy" = 1, "goo" = 1)
/obj/item/weapon/reagent_containers/food/snacks/locust/Initialize()
. = ..()
reagents.add_reagent("protein", 1)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/locust_cooked
name = "fried locust"
desc = "a fried locust, extremely crunchy"
icon = 'icons/obj/food_vr.dmi'
icon_state = "locust_cooked"
nutriment_amt = 2
nutriment_desc = list("crunchy" = 4)
/obj/item/weapon/reagent_containers/food/snacks/locust_cooked/Initialize()
. = ..()
reagents.add_reagent("protein", 3)
bitesize = 2
code/modules/food/recipes_fryer_vr.dm
+17
View File
@@ -17,3 +17,20 @@
/obj/item/weapon/reagent_containers/food/snacks/meat
)
result = /obj/item/weapon/storage/box/wings //This is kinda like the donut box.
/datum/recipe/chickenwings
appliance = FRYER
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat
)
result = /obj/item/weapon/reagent_containers/food/snacks/generalschicken
/datum/recipe/locust
reagents = list("batter" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/locust
)
/obj/item/weapon/reagent_containers/food/snacks/locust_cooked
code/modules/food/recipes_microwave_vr.dm
+36
View File
@@ -148,3 +148,39 @@
reagents = list("enzyme" = 20, "virusfood" = 5, "nutriment" = 15, "protein" = 15) // labor intensive
items = list()
result = /obj/item/weapon/storage/box/wings/tray
/datum/recipe/bucket
fruit = list("potato" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat
)
result = /obj/item/weapon/storage/box/wings/bucket
/datum/recipe/grub_pink
fruit = list("cherry" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/grub
)
/obj/item/weapon/reagent_containers/food/snacks/grub_pink
/datum/recipe/grub_blue
fruit = list("berries" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/grub
)
/obj/item/weapon/reagent_containers/food/snacks/grub_blue
/datum/recipe/grub_purple
fruit = list("grapes" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/grub
)
/obj/item/weapon/reagent_containers/food/snacks/grub_purple
/datum/recipe/honey_candy
reagents = list("sugar" = 5, "nutriment" = 5)
items = list()
/obj/item/weapon/reagent_containers/food/snacks/honey_candy
code/modules/food/recipes_oven_vr.dm
+7
View File
@@ -0,0 +1,7 @@
/datum/recipe/scorpion
appliance = OVEN
reagents = list("batter" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/scorpion
)
/obj/item/weapon/reagent_containers/food/snacks/scorpion_cooked
code/modules/mob/living/simple_mob/subtypes/animal/passive/jerboa_vr.dm
+15
View File
@@ -0,0 +1,15 @@
/mob/living/simple_mob/animal/passive/mouse/jerboa
name = "jerboa"
real_name = "jerboa"
desc = "It's a jerboa, a particularly fast desert mouse"
tt_desc = "E Dipodidae musculus"
icon = 'icons/mob/animal_vr.dmi'
icon_state = "mouse_brown"
item_state = "mouse_brown"
icon_living = "mouse_brown"
icon_dead = "mouse_brown_dead"
kitchen_tag = "rodent"
movement_cooldown = 0.5
body_color = "brown"
icons/mob/animal_vr.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 26 KiB

icons/obj/closets/bases/fencrate_vr.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 647 B

icons/obj/food_vr.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 32 KiB

vorestation.dme
+2
View File
@@ -2186,6 +2186,7 @@
#include "code\modules\food\recipes_microwave.dm"
#include "code\modules\food\recipes_microwave_vr.dm"
#include "code\modules\food\recipes_oven.dm"
#include "code\modules\food\recipes_oven_vr.dm"
#include "code\modules\food\drinkingglass\drinkingglass.dm"
#include "code\modules\food\drinkingglass\extras.dm"
#include "code\modules\food\drinkingglass\glass_boxes.dm"
@@ -2884,6 +2885,7 @@
#include "code\modules\mob\living\simple_mob\subtypes\animal\passive\crab.dm"
#include "code\modules\mob\living\simple_mob\subtypes\animal\passive\fish.dm"
#include "code\modules\mob\living\simple_mob\subtypes\animal\passive\fish_vr.dm"
#include "code\modules\mob\living\simple_mob\subtypes\animal\passive\jerboa_vr.dm"
#include "code\modules\mob\living\simple_mob\subtypes\animal\passive\lizard.dm"
#include "code\modules\mob\living\simple_mob\subtypes\animal\passive\misc.dm"
#include "code\modules\mob\living\simple_mob\subtypes\animal\passive\mouse.dm"