cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-10 22:55:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1303 from Hubblenaut/hydro

Browse Source 
Full fertilizer bottles of type glass/bottle
This commit is contained in:
Datraen
2016-04-20 11:31:31 -04:00
parent 3ba51b21e1 2b44de88b1
commit 2b53efdfd5
6 changed files with 166 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/glass/bottle.dm
+106 -52
View File
@@ -55,16 +55,18 @@
var/image/lid = image(icon, src, "lid_bottle")
overlays += lid
/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline
name = "inaprovaline bottle"
desc = "A small bottle. Contains inaprovaline - used to stabilize patients."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
New()
..()
reagents.add_reagent("inaprovaline", 60)
update_icon()
/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline/New()
..()
reagents.add_reagent("inaprovaline", 60)
update_icon()
/obj/item/weapon/reagent_containers/glass/bottle/toxin
name = "toxin bottle"
@@ -72,10 +74,11 @@
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-3"
New()
..()
reagents.add_reagent("toxin", 60)
update_icon()
/obj/item/weapon/reagent_containers/glass/bottle/toxin/New()
..()
reagents.add_reagent("toxin", 60)
update_icon()
/obj/item/weapon/reagent_containers/glass/bottle/cyanide
name = "cyanide bottle"
@@ -83,10 +86,11 @@
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-3"
New()
..()
reagents.add_reagent("cyanide", 30) //volume changed to match chloral
update_icon()
/obj/item/weapon/reagent_containers/glass/bottle/cyanide/New()
..()
reagents.add_reagent("cyanide", 30) //volume changed to match chloral
update_icon()
/obj/item/weapon/reagent_containers/glass/bottle/stoxin
name = "soporific bottle"
@@ -94,10 +98,11 @@
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-3"
New()
..()
reagents.add_reagent("stoxin", 60)
update_icon()
/obj/item/weapon/reagent_containers/glass/bottle/stoxin/New()
..()
reagents.add_reagent("stoxin", 60)
update_icon()
/obj/item/weapon/reagent_containers/glass/bottle/chloralhydrate
name = "Chloral Hydrate Bottle"
@@ -105,10 +110,11 @@
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-3"
New()
..()
reagents.add_reagent("chloralhydrate", 30) //Intentionally low since it is so strong. Still enough to knock someone out.
update_icon()
/obj/item/weapon/reagent_containers/glass/bottle/chloralhydrate/New()
..()
reagents.add_reagent("chloralhydrate", 30) //Intentionally low since it is so strong. Still enough to knock someone out.
update_icon()
/obj/item/weapon/reagent_containers/glass/bottle/antitoxin
name = "dylovene bottle"
@@ -116,10 +122,11 @@
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
New()
..()
reagents.add_reagent("anti_toxin", 60)
update_icon()
/obj/item/weapon/reagent_containers/glass/bottle/antitoxin/New()
..()
reagents.add_reagent("anti_toxin", 60)
update_icon()
/obj/item/weapon/reagent_containers/glass/bottle/mutagen
name = "unstable mutagen bottle"
@@ -127,10 +134,11 @@
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-1"
New()
..()
reagents.add_reagent("mutagen", 60)
update_icon()
/obj/item/weapon/reagent_containers/glass/bottle/mutagen/New()
..()
reagents.add_reagent("mutagen", 60)
update_icon()
/obj/item/weapon/reagent_containers/glass/bottle/ammonia
name = "ammonia bottle"
@@ -138,10 +146,47 @@
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-1"
New()
..()
reagents.add_reagent("ammonia", 60)
update_icon()
/obj/item/weapon/reagent_containers/glass/bottle/ammonia/New()
..()
reagents.add_reagent("ammonia", 60)
update_icon()
/obj/item/weapon/reagent_containers/glass/bottle/eznutrient
name = "\improper EZ NUtrient bottle"
desc = "A small bottle."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
/obj/item/weapon/reagent_containers/glass/bottle/eznutrient/New()
..()
reagents.add_reagent("eznutrient", 60)
update_icon()
/obj/item/weapon/reagent_containers/glass/bottle/left4zed
name = "\improper Left-4-Zed bottle"
desc = "A small bottle."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
/obj/item/weapon/reagent_containers/glass/bottle/left4zed/New()
..()
reagents.add_reagent("left4zed", 60)
update_icon()
/obj/item/weapon/reagent_containers/glass/bottle/robustharvest
name = "\improper Robust Harvest"
desc = "A small bottle."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
/obj/item/weapon/reagent_containers/glass/bottle/robustharvest/New()
..()
reagents.add_reagent("robustharvest", 60)
update_icon()
/obj/item/weapon/reagent_containers/glass/bottle/diethylamine
name = "diethylamine bottle"
@@ -149,47 +194,56 @@
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
New()
..()
reagents.add_reagent("diethylamine", 60)
update_icon()
/obj/item/weapon/reagent_containers/glass/bottle/diethylamine/New()
..()
reagents.add_reagent("diethylamine", 60)
update_icon()
/obj/item/weapon/reagent_containers/glass/bottle/pacid
name = "Polytrinic Acid Bottle"
desc = "A small bottle. Contains a small amount of Polytrinic Acid"
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
New()
..()
reagents.add_reagent("pacid", 60)
update_icon()
/obj/item/weapon/reagent_containers/glass/bottle/pacid/New()
..()
reagents.add_reagent("pacid", 60)
update_icon()
/obj/item/weapon/reagent_containers/glass/bottle/adminordrazine
name = "Adminordrazine Bottle"
desc = "A small bottle. Contains the liquid essence of the gods."
icon = 'icons/obj/drinks.dmi'
icon_state = "holyflask"
New()
..()
reagents.add_reagent("adminordrazine", 60)
update_icon()
/obj/item/weapon/reagent_containers/glass/bottle/adminordrazine/New()
..()
reagents.add_reagent("adminordrazine", 60)
update_icon()
/obj/item/weapon/reagent_containers/glass/bottle/capsaicin
name = "Capsaicin Bottle"
desc = "A small bottle. Contains hot sauce."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
New()
..()
reagents.add_reagent("capsaicin", 60)
update_icon()
/obj/item/weapon/reagent_containers/glass/bottle/capsaicin/New()
..()
reagents.add_reagent("capsaicin", 60)
update_icon()
/obj/item/weapon/reagent_containers/glass/bottle/frostoil
name = "Frost Oil Bottle"
desc = "A small bottle. Contains cold sauce."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
New()
..()
reagents.add_reagent("frostoil", 60)
update_icon()
/obj/item/weapon/reagent_containers/glass/bottle/frostoil/New()
..()
reagents.add_reagent("frostoil", 60)
update_icon()