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

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19

Browse Source 
# Conflicts:
#	code/_onclick/hud/hud.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
This commit is contained in:
Leshana
2018-01-19 17:52:25 -05:00
parent 169a188ad0 8255744c2b
commit 3c3dac7102
81 changed files with 2358 additions and 16423 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+16 -5
View File
@@ -524,6 +524,17 @@
glass_name = "lemon juice"
glass_desc = "Sour..."
/datum/reagent/drink/juice/apple
name = "Apple Juice"
id = "applejuice"
description = "The most basic juice."
taste_description = "crispness"
taste_mult = 1.1
color = "#E2A55F"
glass_name = "apple juice"
glass_desc = "An earth favorite."
/datum/reagent/drink/juice/lime
name = "Lime Juice"
id = "limejuice"
@@ -1327,7 +1338,7 @@
glass_name = "Ent's Draught"
glass_desc = "You can almost smell the tranquility emanating from this."
/datum/reagent/drink/lovepotion
name = "Love Potion"
id = "lovepotion"
@@ -2783,7 +2794,7 @@
glass_name = "Pisco Sour"
glass_desc = "South American bliss, served ice cold."
/datum/reagent/ethanol/coldfront
name = "Cold Front"
id = "coldfront"
@@ -2793,10 +2804,10 @@
strength = 30
adj_temp = -20
targ_temp = 220 //Dangerous to certain races. Drink in moderation.
glass_name = "Cold Front"
glass_desc = "Minty, rich, and painfully cold. It's a blizzard in a cup."
/datum/reagent/ethanol/mintjulep
name = "Mint Julep"
id = "mintjulep"
@@ -2805,6 +2816,6 @@
color = "#bbfc8a" // rgb(187, 252, 138)
strength = 25
adj_temp = -5
glass_name = "Mint Julep"
glass_desc = "Minty and refreshing, perfect for a hot day."
code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm
+3
View File
@@ -90,6 +90,9 @@ Drinks Data
/datum/reagent/drink/juice/lemon
glass_icon_state = "lemonjuice"
/datum/reagent/drink/juice/apple
glass_icon_state = "applejuice"
/datum/reagent/drink/juice/lime
glass_icon_state = "glass_green"
code/modules/reagents/reagent_containers/glass.dm
+12 -9
View File
@@ -19,6 +19,8 @@
var/label_text = ""
var/list/prefill = null //Reagents to fill the container with on New(), formatted as "reagentID" = quantity
var/list/can_be_placed_into = list(
/obj/machinery/chem_master/,
/obj/machinery/chemical_dispenser,
@@ -47,6 +49,11 @@
/obj/item/weapon/reagent_containers/glass/New()
..()
if(LAZYLEN(prefill))
for(var/R in prefill)
reagents.add_reagent(R,prefill[R])
prefill = null
update_icon()
base_name = name
base_desc = desc
@@ -222,18 +229,14 @@
volume = 30
w_class = ITEMSIZE_TINY
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,25)
possible_transfer_amounts = list(5,10,15,30)
flags = OPENCONTAINER
/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone/New()
..()
reagents.add_reagent("cryoxadone", 30)
update_icon()
/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone
prefill = list("cryoxadone" = 30)
/obj/item/weapon/reagent_containers/glass/beaker/sulphuric/New()
..()
reagents.add_reagent("sacid", 60)
update_icon()
/obj/item/weapon/reagent_containers/glass/beaker/sulphuric
prefill = list("sacid" = 60)
/obj/item/weapon/reagent_containers/glass/bucket
desc = "It's a bucket."
code/modules/reagents/reagent_containers/glass/bottle.dm
+16 -82
View File
@@ -61,11 +61,7 @@
desc = "A small bottle. Contains inaprovaline - used to stabilize patients."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline/New()
..()
reagents.add_reagent("inaprovaline", 60)
update_icon()
prefill = list("inaprovaline" = 60)
/obj/item/weapon/reagent_containers/glass/bottle/toxin
@@ -73,11 +69,7 @@
desc = "A small bottle of toxins. Do not drink, it is poisonous."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-3"
/obj/item/weapon/reagent_containers/glass/bottle/toxin/New()
..()
reagents.add_reagent("toxin", 60)
update_icon()
prefill = list("toxin" = 60)
/obj/item/weapon/reagent_containers/glass/bottle/cyanide
@@ -85,23 +77,15 @@
desc = "A small bottle of cyanide. Bitter almonds?"
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-3"
prefill = list("cyanide" = 30) //volume changed to match chloral
/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"
desc = "A small bottle of soporific. Just the fumes make you sleepy."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-3"
/obj/item/weapon/reagent_containers/glass/bottle/stoxin/New()
..()
reagents.add_reagent("stoxin", 60)
update_icon()
prefill = list("stoxin" = 60)
/obj/item/weapon/reagent_containers/glass/bottle/chloralhydrate
@@ -109,11 +93,7 @@
desc = "A small bottle of Choral Hydrate. Mickey's Favorite!"
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-3"
/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()
prefill = list("chloralhydrate" = 30) //Intentionally low since it is so strong. Still enough to knock someone out.
/obj/item/weapon/reagent_containers/glass/bottle/antitoxin
@@ -121,11 +101,7 @@
desc = "A small bottle of dylovene. Counters poisons, and repairs damage. A wonder drug."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
/obj/item/weapon/reagent_containers/glass/bottle/antitoxin/New()
..()
reagents.add_reagent("anti_toxin", 60)
update_icon()
prefill = list("anti_toxin" = 60)
/obj/item/weapon/reagent_containers/glass/bottle/mutagen
@@ -133,11 +109,7 @@
desc = "A small bottle of unstable mutagen. Randomly changes the DNA structure of whoever comes in contact."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-1"
/obj/item/weapon/reagent_containers/glass/bottle/mutagen/New()
..()
reagents.add_reagent("mutagen", 60)
update_icon()
prefill = list("mutagen" = 60)
/obj/item/weapon/reagent_containers/glass/bottle/ammonia
@@ -145,11 +117,7 @@
desc = "A small bottle."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-1"
/obj/item/weapon/reagent_containers/glass/bottle/ammonia/New()
..()
reagents.add_reagent("ammonia", 60)
update_icon()
prefill = list("ammonia" = 60)
/obj/item/weapon/reagent_containers/glass/bottle/eznutrient
@@ -157,11 +125,7 @@
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()
prefill = list("eznutrient" = 60)
/obj/item/weapon/reagent_containers/glass/bottle/left4zed
@@ -169,11 +133,7 @@
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()
prefill = list("left4zed" = 60)
/obj/item/weapon/reagent_containers/glass/bottle/robustharvest
@@ -181,11 +141,7 @@
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()
prefill = list("robustharvest" = 60)
/obj/item/weapon/reagent_containers/glass/bottle/diethylamine
@@ -193,23 +149,14 @@
desc = "A small bottle."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
/obj/item/weapon/reagent_containers/glass/bottle/diethylamine/New()
..()
reagents.add_reagent("diethylamine", 60)
update_icon()
prefill = list("diethylamine" = 60)
/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"
/obj/item/weapon/reagent_containers/glass/bottle/pacid/New()
..()
reagents.add_reagent("pacid", 60)
update_icon()
prefill = list("pacid" = 60)
/obj/item/weapon/reagent_containers/glass/bottle/adminordrazine
@@ -217,12 +164,7 @@
desc = "A small bottle. Contains the liquid essence of the gods."
icon = 'icons/obj/drinks.dmi'
icon_state = "holyflask"
/obj/item/weapon/reagent_containers/glass/bottle/adminordrazine/New()
..()
reagents.add_reagent("adminordrazine", 60)
update_icon()
prefill = list("adminordrazine" = 60)
/obj/item/weapon/reagent_containers/glass/bottle/capsaicin
@@ -230,11 +172,7 @@
desc = "A small bottle. Contains hot sauce."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
/obj/item/weapon/reagent_containers/glass/bottle/capsaicin/New()
..()
reagents.add_reagent("capsaicin", 60)
update_icon()
prefill = list("capsaicin" = 60)
/obj/item/weapon/reagent_containers/glass/bottle/frostoil
@@ -242,8 +180,4 @@
desc = "A small bottle. Contains cold sauce."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
/obj/item/weapon/reagent_containers/glass/bottle/frostoil/New()
..()
reagents.add_reagent("frostoil", 60)
update_icon()
prefill = list("frostoil" = 60)
code/modules/reagents/reagent_containers/glass/bottle/robot.dm
+2 -11
View File
@@ -13,11 +13,7 @@
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
reagent = "inaprovaline"
/obj/item/weapon/reagent_containers/glass/bottle/robot/inaprovaline/New()
..()
reagents.add_reagent("inaprovaline", 60)
update_icon()
prefill = list("inaprovaline" = 60)
/obj/item/weapon/reagent_containers/glass/bottle/robot/antitoxin
@@ -26,9 +22,4 @@
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
reagent = "anti_toxin"
/obj/item/weapon/reagent_containers/glass/bottle/robot/antitoxin/New()
..()
reagents.add_reagent("anti_toxin", 60)
update_icon()
prefill = list("anti_toxin" = 60)