Merge pull request #13570 from Heroman3003/altevian-foods

Adds Altevian cuisine
This commit is contained in:
Casey
2022-08-25 18:58:45 -04:00
committed by CHOMPStation2
parent eb55c960fd
commit 85cf31f79c
13 changed files with 122 additions and 10 deletions
@@ -48,6 +48,11 @@
name = "Ration Station Vendor Refill Cartridge"
cost = 10
/datum/supply_pack/vending_refills/altevian
contains = list(/obj/item/weapon/refill_cartridge/autoname/food/altevian)
name = "Altevian Vendor Refill Cartridge"
cost = 10
/datum/supply_pack/vending_refills/coffee
contains = list(/obj/item/weapon/refill_cartridge/autoname/drink/coffee)
name = "Hot Drinks Vendor Refill Cartridge"
+15
View File
@@ -30,3 +30,18 @@
name = "dirty fancy plate"
icon = 'icons/obj/trash_vr.dmi'
icon_state = "fancyplate"
/obj/item/trash/ratcheese
name = "\improper Flavor Unit package"
icon = 'icons/obj/trash_vr.dmi'
icon_state = "altevian_cheese_block-trash"
/obj/item/trash/ratveg
name = "\improper Premium Ration packet"
icon = 'icons/obj/trash_vr.dmi'
icon_state = "altevian_veggies-trash"
/obj/item/trash/ratjuice
name = "\improper Space-Safe Meal package"
icon = 'icons/obj/trash_vr.dmi'
icon_state = "altevian_juice-trash"
+2 -1
View File
@@ -97,7 +97,8 @@
/obj/machinery/vending/weeb,
/obj/machinery/vending/sol,
/obj/machinery/vending/snix,
/obj/machinery/vending/snlvend)
/obj/machinery/vending/snlvend,
/obj/machinery/vending/altevian)
/obj/random/vendordrink //Random drink vendors for station use
name = "random drink vending machine"
+17 -2
View File
@@ -638,7 +638,7 @@
/obj/item/clothing/mask/surgical = 5,
/obj/item/clothing/accessory/pride/bi = 5,
/obj/item/clothing/accessory/pride/trans = 5,
/obj/item/clothing/accessory/pride/ace = 5,
/obj/item/clothing/accessory/pride/ace = 5,
/obj/item/clothing/accessory/pride/enby = 5,
/obj/item/clothing/accessory/pride/pan = 5,
/obj/item/clothing/accessory/pride/lesbian = 5,
@@ -763,7 +763,7 @@
/obj/item/clothing/mask/surgical = 50,
/obj/item/clothing/accessory/pride/bi = 50,
/obj/item/clothing/accessory/pride/trans = 50,
/obj/item/clothing/accessory/pride/ace = 50,
/obj/item/clothing/accessory/pride/ace = 50,
/obj/item/clothing/accessory/pride/enby = 50,
/obj/item/clothing/accessory/pride/pan = 50,
/obj/item/clothing/accessory/pride/lesbian = 50,
@@ -3538,3 +3538,18 @@
/obj/item/weapon/reagent_containers/food/drinks/cans/root_beer = 1)
idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
vending_sound = "machines/vending/vending_cans.ogg"
/obj/machinery/vending/altevian
name = "Altevian Imported Meals"
desc = "A vending machine containing imported foods from Altevian Hegemony. Delicious and nutritious. No natural ingridients guaranteed!"
icon = 'icons/obj/vending_vr.dmi'
icon_state = "rattevendor"
product_slogans = "Spacer's choice!;Voidborn food for voidborn people!;Most processed foods ever!"
product_ads = "Perfectly edible!;Squeaky clean foods!;Cheesed to meet you!;Made for spacers, by spacers, of spacers!"
products = list(/obj/item/weapon/reagent_containers/food/snacks/ratprotein = 15,
/obj/item/weapon/reagent_containers/food/snacks/ratveggies = 15,
/obj/item/weapon/reagent_containers/food/snacks/ratliquid = 15)
prices = list(/obj/item/weapon/reagent_containers/food/snacks/ratprotein = 8,
/obj/item/weapon/reagent_containers/food/snacks/ratveggies = 8,
/obj/item/weapon/reagent_containers/food/snacks/ratliquid = 8)
+5 -1
View File
@@ -54,7 +54,8 @@
/obj/machinery/vending/sol,
/obj/machinery/vending/snix,
/obj/machinery/vending/snlvend,
/obj/machinery/vending/sovietvend)
/obj/machinery/vending/sovietvend,
/obj/machinery/vending/altevian)
/obj/item/weapon/refill_cartridge/multitype/drink
name = "drinks vendor refill cartridge"
@@ -121,6 +122,9 @@
/obj/item/weapon/refill_cartridge/autoname/food/sovietvend
refill_type = /obj/machinery/vending/sovietvend
/obj/item/weapon/refill_cartridge/autoname/food/altevian
refill_type = /obj/machinery/vending/altevian
/obj/item/weapon/refill_cartridge/autoname/drink
icon_state = "rc_drink"
+53 -1
View File
@@ -773,4 +773,56 @@
/obj/item/weapon/reagent_containers/food/snacks/donkpocket/ascended/Initialize()
. = ..()
reagents.add_reagent("uranium", 3)
reagents.add_reagent("pyrotoxin", 3)
reagents.add_reagent("pyrotoxin", 3)
// Altevian Foobs
/obj/item/weapon/reagent_containers/food/snacks/ratprotein
name = "AN Flavor Unit C"
desc = "A snack made from a group of space-faring rodents that is packed with the maximized potential of caloric intake to cubic inch. This one seems to be flavored of smoked cheddar and salami."
icon = 'icons/obj/food_vr.dmi'
icon_state = "altevian_cheese_block"
package_open_state = "altevian_cheese_block-open"
package = TRUE
trash = /obj/item/trash/ratcheese
nutriment_amt = 5
nutriment_desc = list("smoked cheese" = 4)
/obj/item/weapon/reagent_containers/food/snacks/ratveggies
name = "Premium Ration Packet - VEG"
desc = "A package of a mixture of somehow still fresh from day 1 greens with a light hint of vinegar dressing to add extra kick."
icon = 'icons/obj/food_vr.dmi'
icon_state = "altevian_veggies"
package_open_state = "altevian_veggies-open"
package = TRUE
trash = /obj/item/trash/ratveg
nutriment_amt = 3
nutriment_desc = list("fresh mixed veggies" = 3, "vinegar" = 1)
/obj/item/weapon/reagent_containers/food/snacks/ratliquid
name = "Admiral's Choice Space-Safe Meal"
desc = "A vacuum sealed pouch of a liquid meal. This one seems to be flavored with the accent of steak."
icon = 'icons/obj/food_vr.dmi'
icon_state = "altevian_juice"
package_open_state = "altevian_juice-open"
package = TRUE
trash = /obj/item/trash/ratjuice
nutriment_amt = 2
nutriment_desc = list("essence of steak" = 6)
/obj/item/weapon/reagent_containers/food/snacks/ratliquid/Initialize()
. = ..()
reagents.add_reagent("protein", 4)
/obj/item/weapon/reagent_containers/food/snacks/ratsteak
name = "altevian traditional steak"
desc = "This abomination of processed foods resembles a steak plate. Probably contains nothing a normal steak does, but mimics its flavor and nutrition well-enough."
icon = 'icons/obj/food_vr.dmi'
icon_state = "altevian_steak"
trash = /obj/item/trash/plate
nutriment_amt = 8
nutriment_desc = list("steak" = 5, "smoked cheese" = 2, "veggies" = 1)
/obj/item/weapon/reagent_containers/food/snacks/ratsteak/Initialize()
. = ..()
reagents.add_reagent("protein", 3)
@@ -185,3 +185,11 @@
reagents = list("sugar" = 5, "nutriment" = 5)
items = list()
result = /obj/item/weapon/reagent_containers/food/snacks/honey_candy
/datum/recipe/altevian_steak
items = list(
/obj/item/weapon/reagent_containers/food/snacks/ratprotein,
/obj/item/weapon/reagent_containers/food/snacks/ratveggies,
/obj/item/weapon/reagent_containers/food/snacks/ratliquid
)
result = /obj/item/weapon/reagent_containers/food/snacks/ratsteak
Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 347 B

After

Width:  |  Height:  |  Size: 853 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 147 KiB

After

Width:  |  Height:  |  Size: 149 KiB

+5 -1
View File
@@ -5102,6 +5102,10 @@ lel
/obj/machinery/meter,
/turf/simulated/floor/tiled,
/area/groundbase/engineering/atmos)
"mA" = (
/obj/machinery/vending/altevian,
/turf/simulated/floor/tiled,
/area/groundbase/civilian/foodplace)
"mC" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -36262,7 +36266,7 @@ Lt
Lt
Uf
Uf
Aq
mA
pA
Aq
Uf
+7 -3
View File
@@ -124,6 +124,10 @@
},
/turf/simulated/floor/tiled,
/area/holodeck_control)
"ap" = (
/obj/machinery/vending/altevian,
/turf/simulated/floor,
/area/maintenance/stellardelight/deck3/forestarroomb)
"at" = (
/obj/structure/table/darkglass,
/turf/simulated/floor/tiled/dark,
@@ -7027,7 +7031,7 @@
/obj/machinery/power/apc{
pixel_y = -28;
req_access = null;
req_one_access = list(11, 67)
req_one_access = list(11,67)
},
/obj/structure/cable/green,
/obj/effect/floor_decal/fancy_shuttle{
@@ -9956,7 +9960,7 @@
/obj/machinery/power/apc{
pixel_y = -28;
req_access = null;
req_one_access = list(11, 67)
req_one_access = list(11,67)
},
/obj/structure/cable/green{
icon_state = "0-4"
@@ -26091,7 +26095,7 @@ tF
Sb
Nz
Jx
FE
ap
sR
FE
Ef
+5 -1
View File
@@ -25188,6 +25188,10 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering/pumpstation)
"aSZ" = (
/obj/machinery/vending/altevian,
/turf/simulated/floor/plating,
/area/maintenance/lower/south)
"aTa" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -49082,7 +49086,7 @@ aVp
aWl
aXg
aVP
aZr
aSZ
ayY
aZr
aZr