cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-05 23:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/VOREStation/VOREStation

Browse Source 
# Conflicts:
#	code/modules/reagents/reagent_containers/food/snacks.dm
#	code/modules/vore/resizing/resize_vr.dm
#	config/custom_items.txt
This commit is contained in:
Kelshark
2017-09-23 11:40:55 -04:00
parent bd95659677 fc1f983297
commit 457ff1356a
195 changed files with 12835 additions and 26536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/reagents/reagent_containers/food/drinks.dm
View File

@@ -24,7 +24,7 @@
open(user)
/obj/item/weapon/reagent_containers/food/drinks/proc/open(mob/user)
playsound(loc,'sound/effects/canopen.ogg', rand(10,50), 1)
playsound(loc,"canopen", rand(10,50), 1)
user << "<span class='notice'>You open [src] with an audible pop!</span>"
flags |= OPENCONTAINER

40
code/modules/reagents/reagent_containers/food/snacks.dm
View File

@@ -15,6 +15,7 @@
var/list/nutriment_desc = list("food" = 1)
center_of_mass = list("x"=16, "y"=16)
w_class = ITEMSIZE_SMALL
force = 1
/obj/item/weapon/reagent_containers/food/snacks/New()
..()
@@ -79,6 +80,7 @@
if (fullness > (550 * (1 + M.overeatduration / 2000))) // The more you eat - the more you can eat
M << "<span class='danger'>You cannot force any more of [src] to go down your throat.</span>"
return 0
else
if(istype(M,/mob/living/carbon/human))
var/mob/living/carbon/human/H = M
@@ -2980,6 +2982,32 @@
/obj/item/weapon/reagent_containers/food/snacks/slice/vegetablepizza/filled
filled = TRUE
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/oldpizza
name = "moldy pizza"
desc = "This pizza might actually be alive. There's mold all over."
icon_state = "oldpizza"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/oldpizza
slices_num = 6
center_of_mass = list("x"=16, "y"=11)
nutriment_desc = list("stale pizza crust" = 10, "moldy tomato" = 10, "moldy cheese" = 5)
nutriment_amt = 10
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/oldpizza/New()
..()
reagents.add_reagent("protein", 5)
reagents.add_reagent("tomatojuice", 6)
reagents.add_reagent("mold", 8)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/slice/oldpizza
name = "moldy pizza slice"
desc = "This used to be pizza..."
icon_state = "old_pizza"
filling_color = "#BAA14C"
bitesize = 2
center_of_mass = list("x"=16, "y"=13)
whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/oldpizza
/obj/item/pizzabox
name = "pizza box"
desc = "A box suited for pizzas."
@@ -3156,6 +3184,10 @@
pizza = new /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza(src)
boxtag = "Meatlover's Supreme"
/obj/item/pizzabox/old/New()
pizza = new /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/oldpizza(src)
boxtag = "Deluxe Gourmet"
/obj/item/weapon/reagent_containers/food/snacks/dionaroast
name = "roast diona"
desc = "It's like an enormous, leathery carrot. With an eye."
@@ -3353,6 +3385,14 @@
..()
reagents.add_reagent("protein", 6)
/obj/item/weapon/reagent_containers/food/snacks/hotdog/old
name = "old hotdog"
desc = "Covered in mold. You're not gonna eat that, are you?"
/obj/item/weapon/reagent_containers/food/snacks/hotdog/old/New()
..()
reagents.add_reagent("mold", 6)
/obj/item/weapon/reagent_containers/food/snacks/flatbread
name = "flatbread"
desc = "Bland but filling."