cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 05:27:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes frozen pizzas, also ports polaris fix

Browse Source
This commit is contained in:
Heroman3003
2019-04-08 09:22:03 +10:00
parent 70628015e5
commit 35208e6e48
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food/food/snacks.dm
+6 -6
View File
@@ -3181,7 +3181,7 @@
icon_state = "pizzabox_open"
if( pizza )
var/image/pizzaimg = image("food.dmi", icon_state = pizza.icon_state)
var/image/pizzaimg = image(icon = pizza.icon, icon_state = pizza.icon_state) //VOREStation Edit: Icons for bad pizza
pizzaimg.pixel_y = -3
overlays += pizzaimg
@@ -3301,23 +3301,23 @@
return
..()
/obj/item/pizzabox/margherita/New()
/obj/item/pizzabox/margherita/Initialize()
pizza = new /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margherita(src)
boxtag = "Margherita Deluxe"
/obj/item/pizzabox/vegetable/New()
/obj/item/pizzabox/vegetable/Initialize()
pizza = new /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza(src)
boxtag = "Gourmet Vegatable"
/obj/item/pizzabox/mushroom/New()
/obj/item/pizzabox/mushroom/Initialize()
pizza = new /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushroompizza(src)
boxtag = "Mushroom Special"
/obj/item/pizzabox/meat/New()
/obj/item/pizzabox/meat/Initialize()
pizza = new /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza(src)
boxtag = "Meatlover's Supreme"
/obj/item/pizzabox/old/New()
/obj/item/pizzabox/old/Initialize()
pizza = new /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/oldpizza(src)
boxtag = "Deluxe Gourmet"
code/modules/food/food/snacks_vr.dm
+7 -7
View File
@@ -308,7 +308,7 @@
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/wolpincube
name = "wolpin cube"
monkey_type = "Wolpin"
/obj/item/weapon/reagent_containers/food/snacks/pizza/margfrozen
name = "frozen margherita pizza"
desc = "It's frozen rock solid, better thaw it in a microwave."
@@ -317,7 +317,7 @@
center_of_mass = list("x"=16, "y"=11)
nutriment_amt = 15
nutriment_desc = list("ice" = 5, "toothache" = 1, "frozen cheese" = 5, "frozen tomato" = 5)
/obj/item/weapon/reagent_containers/food/snacks/pizza/margfrozen/Initialize()
..()
bitesize = 20
@@ -353,7 +353,7 @@
/obj/item/weapon/reagent_containers/food/snacks/slice/margcargo/filled
filled = TRUE
/obj/item/weapon/reagent_containers/food/snacks/pizza/meatfrozen
name = "frozen meat pizza"
desc = "It's frozen rock solid, better thaw it in a microwave."
@@ -362,7 +362,7 @@
center_of_mass = list("x"=16, "y"=11)
nutriment_amt = 15
nutriment_desc = list("ice" = 5, "toothache" = 1, "frozen meat" = 5, "frozen cow screams" = 5)
/obj/item/weapon/reagent_containers/food/snacks/pizza/meatfrozen/Initialize()
..()
bitesize = 20
@@ -398,7 +398,7 @@
/obj/item/weapon/reagent_containers/food/snacks/slice/meatcargo/filled
filled = TRUE
/obj/item/weapon/reagent_containers/food/snacks/pizza/mushfrozen
name = "frozen mushroom pizza"
desc = "It's frozen rock solid, better thaw it in a microwave."
@@ -407,7 +407,7 @@
center_of_mass = list("x"=16, "y"=11)
nutriment_amt = 15
nutriment_desc = list("ice" = 5, "toothache" = 1, "frozen mushrooms" = 5, "frozen cream" = 5)
/obj/item/weapon/reagent_containers/food/snacks/pizza/mushfrozen/Initialize()
..()
bitesize = 20
@@ -451,7 +451,7 @@
center_of_mass = list("x"=16, "y"=11)
nutriment_amt = 15
nutriment_desc = list("ice" = 5, "toothache" = 1, "frozen vegtable chunks" = 5)
/obj/item/weapon/reagent_containers/food/snacks/pizza/vegfrozen/Initialize()
..()
bitesize = 20