cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 12:37:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

half of the food and drinks

Browse Source
This commit is contained in:
Kashargul
2024-12-08 01:14:10 +01:00
parent 5d14c2affa
commit e9550345d2
109 changed files with 2084 additions and 1790 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/chewables.dm
+3 -3
View File
@@ -226,7 +226,7 @@
/obj/item/clothing/mask/chewable/candy/gum/Initialize()
. = ..()
reagents.add_reagent(pick("banana","berryjuice","grapejuice","lemonjuice","limejuice","orangejuice","watermelonjuice"),10)
reagents.add_reagent(pick(REAGENT_ID_BANANA,REAGENT_ID_BERRYJUICE,REAGENT_ID_GRAPEJUICE,REAGENT_ID_LEMONJUICE,REAGENT_ID_LIMEJUICE,REAGENT_ID_ORANGEJUICE,REAGENT_ID_WATERMELONJUICE),10)
color = reagents.get_color()
update_icon()
@@ -263,7 +263,7 @@
/obj/item/clothing/mask/chewable/candy/lolli/Initialize()
. = ..()
reagents.add_reagent(pick("banana","berryjuice","grapejuice","lemonjuice","limejuice","orangejuice","watermelonjuice"),20)
reagents.add_reagent(pick(REAGENT_ID_BANANA,REAGENT_ID_BERRYJUICE,REAGENT_ID_GRAPEJUICE,REAGENT_ID_LEMONJUICE,REAGENT_ID_LIMEJUICE,REAGENT_ID_ORANGEJUICE,REAGENT_ID_WATERMELONJUICE),20)
color = reagents.get_color()
update_icon()
@@ -287,7 +287,7 @@
desc = "A chocolate-coated biscuit stick."
icon_state = "pockystick"
item_state = "pocky"
filling = list(REAGENT_ID_SUGAR = 2, "chocolate" = 5)
filling = list(REAGENT_ID_SUGAR = 2, REAGENT_ID_CHOCOLATE = 5)
type_butt = null
/obj/item/clothing/mask/chewable/candy/pocky/process()
code/game/objects/items/weapons/ecigs.dm
+5 -5
View File
@@ -196,7 +196,7 @@
..()
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent("orangejuice", 5)
reagents.add_reagent(REAGENT_ID_ORANGEJUICE, 5)
/obj/item/reagent_containers/ecig_cartridge/mint
name = "mint flavour cartridge"
@@ -214,7 +214,7 @@
..()
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent("watermelonjuice", 5)
reagents.add_reagent(REAGENT_ID_WATERMELONJUICE, 5)
/obj/item/reagent_containers/ecig_cartridge/grape
name = "grape flavour cartridge"
@@ -223,7 +223,7 @@
..()
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent("grapejuice", 5)
reagents.add_reagent(REAGENT_ID_GRAPEJUICE, 5)
/obj/item/reagent_containers/ecig_cartridge/lemonlime
name = "lemon-lime flavour cartridge"
@@ -232,7 +232,7 @@
..()
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent("lemon_lime", 5)
reagents.add_reagent(REAGENT_ID_LEMONLIME, 5)
/obj/item/reagent_containers/ecig_cartridge/coffee
name = "coffee flavour cartridge"
@@ -241,7 +241,7 @@
..()
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent("coffee", 5)
reagents.add_reagent(REAGENT_ID_COFFEE, 5)
/*
/obj/item/reagent_containers/ecig_cartridge/cannabis
name = "herb flavour cartridge"
code/game/objects/items/weapons/grenades/chem_grenade.dm
+2 -2
View File
@@ -306,9 +306,9 @@
B1.reagents.add_reagent(REAGENT_ID_PHOSPHORUS, 40)
B1.reagents.add_reagent(REAGENT_ID_POTASSIUM, 40)
B1.reagents.add_reagent("condensedcapsaicin", 40)
B1.reagents.add_reagent(REAGENT_ID_CONDENSEDCAPSAICIN, 40)
B2.reagents.add_reagent(REAGENT_ID_SUGAR, 40)
B2.reagents.add_reagent("condensedcapsaicin", 80)
B2.reagents.add_reagent(REAGENT_ID_CONDENSEDCAPSAICIN, 80)
detonator = new/obj/item/assembly_holder/timer_igniter(src)
code/game/objects/items/weapons/storage/fancy.dm
+1 -1
View File
@@ -50,7 +50,7 @@
/obj/item/storage/fancy/egg_box
icon = 'icons/obj/food.dmi'
icon_state = "eggbox"
icon_type = "egg"
icon_type = REAGENT_ID_EGG
name = "egg box"
center_of_mass = list("x" = 16,"y" = 7)
storage_slots = 12
code/game/objects/items/weapons/storage/firstaid_vr.dm
+20 -20
View File
@@ -154,7 +154,7 @@
/obj/item/reagent_containers/pill/copper = 5)
/obj/item/storage/pill_bottle/adminordrazine
name = "pill bottle (Adminordrazine)"
name = "pill bottle (" + REAGENT_ADMINORDRAZINE + ")"
desc = "It's magic. We don't have to explain it."
starts_with = list(/obj/item/reagent_containers/pill/adminordrazine = 21)
@@ -164,37 +164,37 @@
starts_with = list(/obj/item/reagent_containers/pill/nutriment = 7, /obj/item/reagent_containers/pill/protein = 7)
/obj/item/storage/pill_bottle/rezadone
name = "pill bottle (Rezadone)"
name = "pill bottle (" + REAGENT_REZADONE + ")"
desc = "A powder with almost magical properties, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects."
starts_with = list(/obj/item/reagent_containers/pill/rezadone = 14)
wrapper_color = COLOR_GREEN_GRAY
/obj/item/storage/pill_bottle/peridaxon
name = "pill bottle (Peridaxon)"
name = "pill bottle (" + REAGENT_PERIDAXON + ")"
desc = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously."
starts_with = list(/obj/item/reagent_containers/pill/peridaxon = 14)
wrapper_color = COLOR_PURPLE
/obj/item/storage/pill_bottle/carthatoline
name = "pill bottle (Carthatoline)"
desc = "Carthatoline is strong evacuant used to treat severe poisoning."
name = "pill bottle (" + REAGENT_CARTHATOLINE + ")"
desc = REAGENT_CARTHATOLINE + " is strong evacuant used to treat severe poisoning."
starts_with = list(/obj/item/reagent_containers/pill/carthatoline = 14)
wrapper_color = COLOR_GREEN_GRAY
/obj/item/storage/pill_bottle/alkysine
name = "pill bottle (Alkysine)"
desc = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
name = "pill bottle (" + REAGENT_ALKYSINE + ")"
desc = REAGENT_ALKYSINE + " is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
starts_with = list(/obj/item/reagent_containers/pill/alkysine = 14)
wrapper_color = COLOR_YELLOW
/obj/item/storage/pill_bottle/imidazoline
name = "pill bottle (Imidazoline)"
name = "pill bottle (" + REAGENT_IMIDAZOLINE + ")"
desc = "Heals eye damage."
starts_with = list(/obj/item/reagent_containers/pill/imidazoline = 14)
wrapper_color = COLOR_PURPLE_GRAY
/obj/item/storage/pill_bottle/osteodaxon
name = "pill bottle (Osteodaxon)"
name = "pill bottle (" + REAGENT_OSTEODAXON + ")"
desc = "An experimental drug used to heal bone fractures."
starts_with = list(/obj/item/reagent_containers/pill/osteodaxon = 14)
wrapper_color = COLOR_WHITE
@@ -206,36 +206,36 @@
wrapper_color = COLOR_PALE_PURPLE_GRAY
/obj/item/storage/pill_bottle/hyronalin
name = "pill bottle (Hyronalin)"
desc = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning."
name = "pill bottle (" + REAGENT_HYRONALIN + ")"
desc = REAGENT_HYRONALIN + " is a medicinal drug used to counter the effect of radiation poisoning."
starts_with = list(/obj/item/reagent_containers/pill/hyronalin = 14)
wrapper_color = COLOR_TEAL
/obj/item/storage/pill_bottle/arithrazine
name = "pill bottle (Arithrazine)"
desc = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning."
name = "pill bottle (" + REAGENT_ARITHRAZINE + ")"
desc = REAGENT_ARITHRAZINE + " is an unstable medication used for the most extreme cases of radiation poisoning."
starts_with = list(/obj/item/reagent_containers/pill/arithrazine = 14)
wrapper_color = COLOR_TEAL
/obj/item/storage/pill_bottle/corophizine
name = "pill bottle (Corophizine)"
name = "pill bottle (" + REAGENT_COROPHIZINE + ")"
desc = "A wide-spectrum antibiotic drug. Powerful and uncomfortable in equal doses."
starts_with = list(/obj/item/reagent_containers/pill/corophizine = 14)
wrapper_color = COLOR_PALE_GREEN_GRAY
/obj/item/storage/pill_bottle/vermicetol
name = "pill bottle (Vermicetol)"
name = "pill bottle (" + REAGENT_VERMICETOL + ")"
desc = "Contains pills used to stabilize the extremely injured."
starts_with = list(/obj/item/reagent_containers/pill/vermicetol = 14)
wrapper_color = COLOR_MAROON
/obj/item/storage/pill_bottle/healing_nanites
name = "pill bottle (Healing nanites)"
name = "pill bottle (" + REAGENT_HEALINGNANITES + ")"
desc = "Miniature medical robots that swiftly restore bodily damage."
starts_with = list(/obj/item/reagent_containers/pill/healing_nanites = 14)
/obj/item/storage/pill_bottle/sleevingcure
name = "pill bottle (Kitsuhanan Cure)"
name = "pill bottle (" + REAGENT_SLEEVINGCURE + ")"
desc = "A rare cure provided by KHI that helps counteract negative side effects of using imperfect resleeving machinery."
starts_with = list(/obj/item/reagent_containers/pill/sleevingcure = 7)
@@ -250,18 +250,18 @@
can_hold = list(/obj/item/reagent_containers/pill)
/obj/item/storage/mrebag/pill/sleevingcure
name = "vacuum-sealed pill (Kitsuhanan Cure)"
name = "vacuum-sealed pill (" + REAGENT_SLEEVINGCURE + ")"
desc = "A small vacuum-sealed package containing a singular pill. For emergencies only."
starts_with = list(/obj/item/reagent_containers/pill/sleevingcure)
/obj/item/storage/pill_bottle/paracetamol
name = "pill bottle (Paracetamol)"
name = "pill bottle (" + REAGENT_PARACETAMOL + ")"
desc = "Contains over the counter medicine to treat pain."
starts_with = list(/obj/item/reagent_containers/pill/paracetamol = 14)
wrapper_color = COLOR_GRAY
/obj/item/storage/pill_bottle/dexalin
name = "pill bottle (Dexalin)"
name = "pill bottle (" + REAGENT_DEXALIN + ")"
desc = "Contains pills used to treat oxygen deprivation."
starts_with = list(/obj/item/reagent_containers/pill/dexalin = 14)
wrapper_color = "#3366cc"