Hard upstream sync (#6951)

* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
This commit is contained in:
deathride58
2018-05-31 23:03:18 +00:00
committed by kevinz000
parent b6e608cb4c
commit 2f9e3e403d
395 changed files with 134016 additions and 26287 deletions
@@ -235,40 +235,3 @@
required_reagents = list("anaphro" = 5, "acetone" = 1)
required_temp = 300
mix_message = "The mixture thickens and heats up slighty..."
//=========Drinks and Stuff!============//
/datum/reagent/consumable/ethanol/sake
name = "Sake"
id = "sake"
description = "A sweet rice wine of questionable legality and extreme potency."
color = "#DDDDDD"
boozepwr = 70
taste_description = "sweet rice wine"
glass_icon_state = "sakecup"
glass_name = "glass of sake"
glass_desc = "A traditional cup of sake."
/datum/chemical_reaction/sake
name = "sake"
id = "sake"
results = list("sake" = 20)
required_reagents = list("rice" = 15, "sugar" = 5)
required_temp = 400
mix_message = "The rice grains ferment with the sugar into a clear, sweet-smelling liquid."
/obj/item/reagent_containers/food/drinks/bottle/sake
name = "Traditional Sake"
desc = "Sweet as can be, and burns like foxfire going down."
icon = 'modular_citadel/icons/obj/drinks.dmi'
icon_state = "sakebottle"
list_reagents = list("sake" = 100)
/obj/item/reagent_containers/food/drinks/bottle/sake/Initialize()
. = ..()
if(prob(30))
name = "Tetravulpine Sake"
desc += " On the bottle is a picture of a kitsune with four tails."
else if(prob(30))
name = "Inubashiri's Home Brew"
desc += " Awoo."