Merge remote-tracking branch 'upstream/master'

code/__DEFINES/colors.dm

@@ -17,6 +17,7 @@
 
 #define COLOR_FLOORTILE_GRAY   "#8D8B8B"
 #define COLOR_ALMOST_BLACK	   "#333333"
+#define COLOR_SILVER	       "#C0C0C0"
 #define COLOR_BLACK            "#000000"
 #define COLOR_RED              "#FF0000"
 #define COLOR_RED_LIGHT        "#FF3333"
@@ -63,4 +64,4 @@
 #define COLOR_ASSEMBLY_LBLUE   "#5D99BE"
 #define COLOR_ASSEMBLY_BLUE    "#38559E"
 #define COLOR_ASSEMBLY_PURPLE  "#6F6192"
-#define COLOR_ASSEMBLY_PINK    "#ff4adc"
+#define COLOR_ASSEMBLY_PINK    "#ff4adc"

code/__DEFINES/layers.dm

@@ -6,6 +6,10 @@
 #define PLANE_SPACE -95
 #define PLANE_SPACE_PARALLAX -90
 
+#define OPENSPACE_LAYER 17 //Openspace layer over all
+#define OPENSPACE_PLANE -4 //Openspace plane below all turfs
+#define OPENSPACE_BACKDROP_PLANE -3 //Black square just over openspace plane to guaranteed cover all in openspace turf
+
 #define FLOOR_PLANE -2
 #define GAME_PLANE -1
 #define BLACKNESS_PLANE 0 //To keep from conflicts with SEE_BLACKNESS internals
@@ -87,9 +91,6 @@
 #define ABOVE_LIGHTING_PLANE 16
 #define ABOVE_LIGHTING_LAYER 16
 
-#define FLOOR_OPENSPACE_PLANE 17
-#define OPENSPACE_LAYER 17
-
 #define BYOND_LIGHTING_PLANE 18
 #define BYOND_LIGHTING_LAYER 18
 

code/_onclick/hud/parallax.dm

@@ -8,7 +8,7 @@
 	var/last_parallax_shift //world.time of last update
 	var/parallax_throttle = 0 //ds between updates
 	var/parallax_movedir = 0
-	var/parallax_layers_max = 3
+	var/parallax_layers_max = 4
 	var/parallax_animate_timer
 
 /datum/hud/proc/create_parallax(mob/viewmob)
@@ -22,6 +22,8 @@
 		C.parallax_layers_cached += new /obj/screen/parallax_layer/layer_1(null, C.view)
 		C.parallax_layers_cached += new /obj/screen/parallax_layer/layer_2(null, C.view)
 		C.parallax_layers_cached += new /obj/screen/parallax_layer/planet(null, C.view)
+		if(SSparallax.random_layer)
+			C.parallax_layers_cached += new SSparallax.random_layer
 		C.parallax_layers_cached += new /obj/screen/parallax_layer/layer_3(null, C.view)
 
 	C.parallax_layers = C.parallax_layers_cached.Copy()
@@ -64,12 +66,12 @@
 		switch(C.prefs.parallax)
 			if (PARALLAX_INSANE)
 				C.parallax_throttle = FALSE
-				C.parallax_layers_max = 4
+				C.parallax_layers_max = 5
 				return TRUE
 
 			if (PARALLAX_MED)
 				C.parallax_throttle = PARALLAX_DELAY_MED
-				C.parallax_layers_max = 2
+				C.parallax_layers_max = 3
 				return TRUE
 
 			if (PARALLAX_LOW)
@@ -81,7 +83,7 @@
 				return FALSE
 
 	C.parallax_throttle = PARALLAX_DELAY_DEFAULT
-	C.parallax_layers_max = 3
+	C.parallax_layers_max = 4
 	return TRUE
 
 /datum/hud/proc/update_parallax_pref(mob/viewmob)
@@ -167,7 +169,7 @@
 /datum/hud/proc/update_parallax()
 	var/client/C = mymob.client
 	var/turf/posobj = get_turf(C.eye)
-	if(!posobj) 
+	if(!posobj)	
 		return
 	var/area/areaobj = posobj.loc
 
@@ -296,6 +298,20 @@
 	speed = 1.4
 	layer = 3
 
+/obj/screen/parallax_layer/random
+	blend_mode = BLEND_OVERLAY
+	speed = 3
+	layer = 3
+
+/obj/screen/parallax_layer/random/space_gas
+	icon_state = "space_gas"
+
+/obj/screen/parallax_layer/random/space_gas/Initialize(mapload, view)
+	src.add_atom_colour(SSparallax.random_parallax_color, ADMIN_COLOUR_PRIORITY)
+
+/obj/screen/parallax_layer/random/asteroids
+	icon_state = "asteroids"
+
 /obj/screen/parallax_layer/planet
 	icon_state = "planet"
 	blend_mode = BLEND_OVERLAY
@@ -304,11 +320,11 @@
 	layer = 30
 
 /obj/screen/parallax_layer/planet/update_status(mob/M)
-	var/turf/T = get_turf(M)
-	if(is_station_level(T.z))
-		invisibility = 0
-	else
-		invisibility = INVISIBILITY_ABSTRACT
+	var/client/C = M.client
+	var/turf/posobj = get_turf(C.eye)
+	if(!posobj)
+		return
+	invisibility = is_station_level(posobj.z) ? 0 : INVISIBILITY_ABSTRACT
 
 /obj/screen/parallax_layer/planet/update_o()
 	return //Shit wont move

code/_onclick/hud/plane_master.dm

@@ -18,7 +18,7 @@
 
 /obj/screen/plane_master/openspace
 	name = "open space plane master"
-	plane = FLOOR_OPENSPACE_PLANE
+	plane = OPENSPACE_BACKDROP_PLANE
 	appearance_flags = PLANE_MASTER
 	blend_mode = BLEND_MULTIPLY
 	alpha = 255

code/controllers/subsystem/parallax.dm

@@ -7,9 +7,15 @@ SUBSYSTEM_DEF(parallax)
 	var/list/currentrun
 	var/planet_x_offset = 128
 	var/planet_y_offset = 128
+	var/random_layer
+	var/random_parallax_color
 
-/datum/controller/subsystem/parallax/Initialize(timeofday)
+//These are cached per client so needs to be done asap so people joining at roundstart do not miss these.
+/datum/controller/subsystem/parallax/PreInit()
 	. = ..()
+	if(prob(70))	//70% chance to pick a special extra layer
+		random_layer = pick(/obj/screen/parallax_layer/random/space_gas, /obj/screen/parallax_layer/random/asteroids)
+		random_parallax_color = pick(COLOR_TEAL, COLOR_GREEN, COLOR_SILVER, COLOR_YELLOW, COLOR_CYAN, COLOR_ORANGE, COLOR_PURPLE)//Special color for random_layer1. Has to be done here so everyone sees the same color.
 	planet_y_offset = rand(100, 160)
 	planet_x_offset = rand(100, 160)
 

code/game/area/areas/ruins/space.dm

@@ -58,6 +58,9 @@
 /area/ruin/space/has_grav/powered/cat_man
 	name = "Kitty Den"
 
+/area/ruin/space/has_grav/powered/wiz_home/area/ruin/space/has_grav/powered/wiz_home
+	name = "Wizard's Cabin"
+
 /area/ruin/space/has_grav/powered/authorship
 	name = "Authorship"
 
@@ -178,13 +181,6 @@
 	name = "Mech Transport"
 	icon_state = "green"
 
-
-//Ruin of gas the lizard
-
-/area/ruin/space/has_grav/gasthelizard
-	name = "Gas the lizard"
-
-
 //Ruin of Deep Storage
 
 /area/ruin/space/has_grav/deepstorage

code/game/objects/objs.dm

@@ -31,6 +31,8 @@
 
 	var/renamedByPlayer = FALSE //set when a player uses a pen on a renamable object
 
+	vis_flags = VIS_INHERIT_PLANE //when this be added to vis_contents of something it inherit something.plane, important for visualisation of obj in openspace.
+
 /obj/vv_edit_var(vname, vval)
 	switch(vname)
 		if("anchored")

code/game/turfs/openspace/openspace.dm

@@ -1,7 +1,20 @@
+GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdrop, new)
+
+/atom/movable/openspace_backdrop
+	name			= "openspace_backdrop"
+
+	anchored		= TRUE
+
+	icon            = 'icons/turf/floors.dmi'
+	icon_state      = "grey"
+	plane           = OPENSPACE_BACKDROP_PLANE
+	mouse_opacity 	= MOUSE_OPACITY_TRANSPARENT
+	layer           = SPLASHSCREEN_LAYER
+
 /turf/open/openspace
 	name = "open space"
 	desc = "Watch your step!"
-	icon_state = "grey"
+	icon_state = "transparent"
 	baseturfs = /turf/open/openspace
 	CanAtmosPassVertical = ATMOS_PASS_YES
 	//mouse_opacity = MOUSE_OPACITY_TRANSPARENT
@@ -14,8 +27,11 @@
 
 /turf/open/openspace/Initialize() // handle plane and layer here so that they don't cover other obs/turfs in Dream Maker
 	. = ..()
-	plane = FLOOR_OPENSPACE_PLANE
+	plane = OPENSPACE_PLANE
 	layer = OPENSPACE_LAYER
+
+	vis_contents += GLOB.openspace_backdrop_one_for_all //Special grey square for projecting backdrop darkness filter on it.
+
 	return INITIALIZE_HINT_LATELOAD
 
 /turf/open/openspace/LateInitialize()

code/game/turfs/space/space.dm

@@ -18,7 +18,7 @@
 	light_power = 0.25
 	dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
 	bullet_bounce_sound = null
-
+	vis_flags = VIS_INHERIT_ID	//when this be added to vis_contents of something it be associated with something on clicking, important for visualisation of turf in openspace and interraction with openspace that show you turf.
 
 /turf/open/space/basic/New()	//Do not convert to Initialize
 	//This is used to optimize the map loader

code/game/turfs/turf.dm

@@ -32,6 +32,8 @@
 							//IE if the turf is supposed to be water, set TRUE.
 
 	var/tiled_dirt = FALSE // use smooth tiled dirt decal
+	
+	vis_flags = VIS_INHERIT_PLANE|VIS_INHERIT_ID	//when this be added to vis_contents of something it inherit something.plane and be associated with something on clicking, important for visualisation of turf in openspace and interraction with openspace that show you turf.
 
 /turf/vv_edit_var(var_name, new_value)
 	var/static/list/banned_edits = list("x", "y", "z")

code/modules/atmospherics/gasmixtures/gas_types.dm

@@ -203,6 +203,7 @@ GLOBAL_LIST_INIT(nonreactive_gases, typecacheof(list(/datum/gas/oxygen, /datum/g
 	anchored = TRUE  // should only appear in vis_contents, but to be safe
 	layer = FLY_LAYER
 	appearance_flags = TILE_BOUND
+	vis_flags = NONE
 
 /obj/effect/overlay/gas/New(state, alph)
 	. = ..()

code/modules/mob/mob_defines.dm

@@ -142,3 +142,5 @@
 	var/typing_indicator_timerid
 	/// Current state of our typing indicator. Used for cut overlay, DO NOT RUNTIME ASSIGN OTHER THAN FROM SHOW/CLEAR. Used to absolutely ensure we do not get stuck overlays.
 	var/mutable_appearance/typing_indicator_current
+
+	vis_flags = VIS_INHERIT_PLANE //when this be added to vis_contents of something it inherit something.plane, important for visualisation of mob in openspace.

code/modules/reagents/chemistry/reagents/alcohol_reagents.dm

@@ -14,7 +14,7 @@
 	taste_description = "alcohol"
 	var/boozepwr = 65 //Higher numbers equal higher hardness, higher hardness equals more intense alcohol poisoning
 	pH = 7.33
-	hydration = 1 * REAGENTS_METABOLISM
+	hydration = 1
 
 /*
 Boozepwr Chart

code/modules/reagents/chemistry/reagents/drink_reagents.dm

@@ -11,7 +11,7 @@
 	glass_icon_state = "glass_orange"
 	glass_name = "glass of orange juice"
 	glass_desc = "Vitamins! Yay!"
-	hydration = 4 * REAGENTS_METABOLISM
+	hydration = 4
 	pH = 3.3
 
 /datum/reagent/consumable/orangejuice/on_mob_life(mob/living/carbon/M)
@@ -28,7 +28,7 @@
 	glass_icon_state = "glass_red"
 	glass_name = "glass of tomato juice"
 	glass_desc = "Are you sure this is tomato juice?"
-	hydration = 4 * REAGENTS_METABOLISM
+	hydration = 4
 
 /datum/reagent/consumable/tomatojuice/on_mob_life(mob/living/carbon/M)
 	if(M.getFireLoss() && prob(20))
@@ -45,7 +45,7 @@
 	glass_name = "glass of lime juice"
 	glass_desc = "A glass of sweet-sour lime juice."
 	pH = 2.2
-	hydration = 3 * REAGENTS_METABOLISM
+	hydration = 4
 
 /datum/reagent/consumable/limejuice/on_mob_life(mob/living/carbon/M)
 	if(M.getToxLoss() && prob(20))
@@ -61,7 +61,7 @@
 	glass_icon_state = "carrotjuice"
 	glass_name = "glass of  carrot juice"
 	glass_desc = "It's just like a carrot but without crunching."
-	hydration = 4 * REAGENTS_METABOLISM
+	hydration = 4
 
 /datum/reagent/consumable/carrotjuice/on_mob_life(mob/living/carbon/M)
 	M.adjust_blurriness(-1)
@@ -83,7 +83,7 @@
 	glass_icon_state = "berryjuice"
 	glass_name = "glass of berry juice"
 	glass_desc = "Berry juice. Or maybe it's jam. Who cares?"
-	hydration = 4 * REAGENTS_METABOLISM
+	hydration = 4
 
 /datum/reagent/consumable/applejuice
 	name = "Apple Juice"
@@ -91,7 +91,7 @@
 	color = "#ECFF56" // rgb: 236, 255, 86
 	taste_description = "apples"
 	pH = 3.2 // ~ 2.7 -> 3.7
-	hydration = 4 * REAGENTS_METABOLISM
+	hydration = 4
 
 /datum/reagent/consumable/poisonberryjuice
 	name = "Poison Berry Juice"
@@ -101,7 +101,7 @@
 	glass_icon_state = "poisonberryjuice"
 	glass_name = "glass of berry juice"
 	glass_desc = "Berry juice. Or maybe it's poison. Who cares?"
-	hydration = 2 * REAGENTS_METABOLISM
+	hydration = 4
 
 /datum/reagent/consumable/poisonberryjuice/on_mob_life(mob/living/carbon/M)
 	M.adjustToxLoss(1, 0)
@@ -116,7 +116,7 @@
 	glass_icon_state = "glass_red"
 	glass_name = "glass of watermelon juice"
 	glass_desc = "A glass of watermelon juice."
-	hydration = 4 * REAGENTS_METABOLISM
+	hydration = 4
 
 /datum/reagent/consumable/lemonjuice
 	name = "Lemon Juice"
@@ -127,7 +127,7 @@
 	glass_name = "glass of lemon juice"
 	glass_desc = "Sour..."
 	pH = 2
-	hydration = 4 * REAGENTS_METABOLISM
+	hydration = 4
 
 /datum/reagent/consumable/strawberryjuice
 	name = "Strawberry Juice"
@@ -136,7 +136,7 @@
 	taste_description = "strawberry"
 	glass_name = "glass of strawberry juice"
 	glass_desc = "Refreshing seasonal summer drink."
-	hydration = 4 * REAGENTS_METABOLISM
+	hydration = 4
 
 /datum/reagent/consumable/banana
 	name = "Banana Juice"
@@ -146,7 +146,7 @@
 	glass_icon_state = "banana"
 	glass_name = "glass of banana juice"
 	glass_desc = "The raw essence of a banana. HONK."
-	hydration = 1 * REAGENTS_METABOLISM
+	hydration = 4
 
 /datum/reagent/consumable/banana/on_mob_life(mob/living/carbon/M)
 	if((ishuman(M) && M.job == "Clown") || ismonkey(M))
@@ -210,7 +210,7 @@
 	description = "The juice of a bunch of grapes. Guaranteed non-alcoholic."
 	color = "#290029" // dark purple
 	taste_description = "grape soda"
-	hydration = 2 * REAGENTS_METABOLISM
+	hydration = 4
 
 /datum/reagent/consumable/milk
 	name = "Milk"
@@ -221,7 +221,7 @@
 	glass_name = "milk drum"
 	glass_desc = "White and nutritious goodness!"
 	pH = 6.5
-	hydration = 2 * REAGENTS_METABOLISM
+	hydration = 3
 
 /datum/reagent/consumable/milk/on_mob_life(mob/living/carbon/M)
 	if(HAS_TRAIT(M, TRAIT_CALCIUM_HEALER))
@@ -243,7 +243,7 @@
 	glass_icon_state = "glass_white"
 	glass_name = "glass of soy milk"
 	glass_desc = "White and nutritious soy goodness!"
-	hydration = 2 * REAGENTS_METABOLISM
+	hydration = 3
 
 /datum/reagent/consumable/soymilk/on_mob_life(mob/living/carbon/M)
 	if(M.getBruteLoss() && prob(20))
@@ -260,7 +260,7 @@
 	glass_icon_state = "glass_white"
 	glass_name = "glass of coconut milk"
 	glass_desc = "White and nutritious goodness!"
-	hydration = 4 * REAGENTS_METABOLISM
+	hydration = 3
 
 /datum/reagent/consumable/coconutmilk/on_mob_life(mob/living/carbon/M)
 	if(M.getBruteLoss() && prob(20))
@@ -276,7 +276,7 @@
 	glass_icon_state  = "glass_white"
 	glass_name = "glass of cream"
 	glass_desc = "Ewwww..."
-	hydration = 2 * REAGENTS_METABOLISM
+	hydration = 3
 
 /datum/reagent/consumable/cream/on_mob_life(mob/living/carbon/M)
 	if(M.getBruteLoss() && prob(20))
@@ -294,7 +294,7 @@
 	glass_icon_state = "glass_brown"
 	glass_name = "glass of coffee"
 	glass_desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere."
-	hydration = 2 * REAGENTS_METABOLISM
+	hydration = 3
 
 /datum/reagent/consumable/coffee/overdose_process(mob/living/M)
 	M.Jitter(5)
@@ -320,7 +320,7 @@
 	glass_icon_state = "teaglass"
 	glass_name = "glass of tea"
 	glass_desc = "Drinking it from here would not seem right."
-	hydration = 2 * REAGENTS_METABOLISM
+	hydration = 4
 
 /datum/reagent/consumable/tea/on_mob_life(mob/living/carbon/M)
 	M.dizziness = max(0,M.dizziness-2)
@@ -341,7 +341,7 @@
 	glass_icon_state = "lemonpitcher"
 	glass_name = "pitcher of lemonade"
 	glass_desc = "This drink leaves you feeling nostalgic for some reason."
-	hydration = 4 * REAGENTS_METABOLISM
+	hydration = 4
 
 /datum/reagent/consumable/tea/arnold_palmer
 	name = "Arnold Palmer"
@@ -353,7 +353,7 @@
 	glass_icon_state = "arnold_palmer"
 	glass_name = "Arnold Palmer"
 	glass_desc = "You feel like taking a few golf swings after a few swigs of this."
-	hydration = 4 * REAGENTS_METABOLISM
+	hydration = 4
 
 /datum/reagent/consumable/tea/arnold_palmer/on_mob_life(mob/living/carbon/M)
 	if(prob(5))
@@ -370,7 +370,7 @@
 	glass_icon_state = "icedcoffeeglass"
 	glass_name = "iced coffee"
 	glass_desc = "A drink to perk you up and refresh you!"
-	hydration = 2 * REAGENTS_METABOLISM
+	hydration = 3
 
 /datum/reagent/consumable/icecoffee/on_mob_life(mob/living/carbon/M)
 	M.dizziness = max(0,M.dizziness-5)
@@ -390,7 +390,7 @@
 	glass_icon_state = "icedteaglass"
 	glass_name = "iced tea"
 	glass_desc = "All natural, antioxidant-rich flavour sensation."
-	hydration = 2 * REAGENTS_METABOLISM
+	hydration = 3
 
 /datum/reagent/consumable/icetea/on_mob_life(mob/living/carbon/M)
 	M.dizziness = max(0,M.dizziness-2)
@@ -410,7 +410,7 @@
 	glass_icon_state  = "glass_brown"
 	glass_name = "glass of Space Cola"
 	glass_desc = "A glass of refreshing Space Cola."
-	hydration = 2 * REAGENTS_METABOLISM
+	hydration = 3
 
 /datum/reagent/consumable/space_cola/on_mob_life(mob/living/carbon/M)
 	M.drowsyness = max(0,M.drowsyness-5)
@@ -426,7 +426,7 @@
 	glass_icon_state = "nuka_colaglass"
 	glass_name = "glass of Nuka Cola"
 	glass_desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland."
-	hydration = 2 * REAGENTS_METABOLISM
+	hydration = 3
 
 /datum/reagent/consumable/nuka_cola/on_mob_metabolize(mob/living/L)
 	..()
@@ -471,7 +471,7 @@
 	glass_icon_state = "dr_gibb_glass"
 	glass_name = "glass of Dr. Gibb"
 	glass_desc = "Dr. Gibb. Not as dangerous as the glass_name might imply."
-	hydration = 2 * REAGENTS_METABOLISM
+	hydration = 3
 
 /datum/reagent/consumable/dr_gibb/on_mob_life(mob/living/carbon/M)
 	M.drowsyness = max(0,M.drowsyness-6)
@@ -486,7 +486,7 @@
 	glass_icon_state = "space-up_glass"
 	glass_name = "glass of Space-Up"
 	glass_desc = "Space-up. It helps you keep your cool."
-	hydration = 5 * REAGENTS_METABOLISM
+	hydration = 3
 
 /datum/reagent/consumable/space_up/on_mob_life(mob/living/carbon/M)
 	M.adjust_bodytemperature(-8 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
@@ -500,7 +500,7 @@
 	glass_icon_state = "glass_yellow"
 	glass_name = "glass of lemon-lime"
 	glass_desc = "You're pretty certain a real fruit has never actually touched this."
-	hydration = 2 * REAGENTS_METABOLISM
+	hydration = 3
 
 /datum/reagent/consumable/lemon_lime/on_mob_life(mob/living/carbon/M)
 	M.adjust_bodytemperature(-8 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
@@ -514,7 +514,7 @@
 	glass_icon_state = "glass_red"
 	glass_name = "glass of Pwr Game"
 	glass_desc = "Goes well with a Vlad's salad."
-	hydration = 2 * REAGENTS_METABOLISM
+	hydration = 3
 
 /datum/reagent/consumable/pwr_game/on_mob_life(mob/living/carbon/M)
 	M.adjust_bodytemperature(-8 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
@@ -528,7 +528,7 @@
 	glass_icon_state = "glass_red"
 	glass_name = "glass of Shambler's juice"
 	glass_desc = "Mmm mm, shambly."
-	hydration = 2 * REAGENTS_METABOLISM
+	hydration = 3
 
 /datum/reagent/consumable/shamblers/on_mob_life(mob/living/carbon/M)
 	M.adjust_bodytemperature(-8 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
@@ -543,7 +543,7 @@
 	glass_icon_state = "grey_bull_glass"
 	glass_name = "glass of Grey Bull"
 	glass_desc = "Surprisingly it isnt grey."
-	hydration = 2 * REAGENTS_METABOLISM
+	hydration = 3
 
 /datum/reagent/consumable/grey_bull/on_mob_metabolize(mob/living/L)
 	..()
@@ -569,7 +569,7 @@
 	glass_icon_state = "glass_clear"
 	glass_name = "glass of soda water"
 	glass_desc = "Soda water. Why not make a scotch and soda?"
-	hydration = 4 * REAGENTS_METABOLISM
+	hydration = 4
 
 /datum/reagent/consumable/sodawater/on_mob_life(mob/living/carbon/M)
 	M.dizziness = max(0,M.dizziness-5)
@@ -585,7 +585,7 @@
 	glass_icon_state = "glass_clear"
 	glass_name = "glass of tonic water"
 	glass_desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
-	hydration = 4 * REAGENTS_METABOLISM
+	hydration = 4
 
 /datum/reagent/consumable/tonic/on_mob_life(mob/living/carbon/M)
 	M.dizziness = max(0,M.dizziness-5)
@@ -604,7 +604,7 @@
 	glass_icon_state = "iceglass"
 	glass_name = "glass of ice"
 	glass_desc = "Generally, you're supposed to put something else in there too..."
-	hydration = 5 * REAGENTS_METABOLISM //ice is water dummy, just as good.
+	hydration = 5
 
 /datum/reagent/consumable/ice/on_mob_life(mob/living/carbon/M)
 	M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
@@ -619,7 +619,7 @@
 	glass_icon_state = "soy_latte"
 	glass_name = "soy latte"
 	glass_desc = "A nice and refreshing beverage while you're reading."
-	hydration = 2 * REAGENTS_METABOLISM
+	hydration = 3
 
 /datum/reagent/consumable/soy_latte/on_mob_life(mob/living/carbon/M)
 	M.dizziness = max(0,M.dizziness-5)
@@ -641,7 +641,7 @@
 	glass_icon_state = "cafe_latte"
 	glass_name = "cafe latte"
 	glass_desc = "A nice, strong and refreshing beverage while you're reading."
-	hydration = 2 * REAGENTS_METABOLISM
+	hydration = 3
 
 /datum/reagent/consumable/cafe_latte/on_mob_life(mob/living/carbon/M)
 	M.dizziness = max(0,M.dizziness-5)
@@ -663,7 +663,7 @@
 	glass_icon_state = "doctorsdelightglass"
 	glass_name = "Doctor's Delight"
 	glass_desc = "The space doctor's favorite. Guaranteed to restore bodily injury; side effects include cravings and hunger."
-	hydration = 2 * REAGENTS_METABOLISM
+	hydration = 3
 
 /datum/reagent/consumable/doctor_delight/on_mob_life(mob/living/carbon/M)
 	M.adjustBruteLoss(-0.5, 0)
@@ -730,7 +730,7 @@
 	glass_icon_state = "pumpkin_latte"
 	glass_name = "pumpkin latte"
 	glass_desc = "A mix of coffee and pumpkin juice."
-	hydration = 2 * REAGENTS_METABOLISM
+	hydration = 3
 
 /datum/reagent/consumable/gibbfloats
 	name = "Gibb Floats"
@@ -742,14 +742,14 @@
 	glass_icon_state = "gibbfloats"
 	glass_name = "Gibbfloat"
 	glass_desc = "Dr. Gibb with ice cream on top."
-	hydration = 3 * REAGENTS_METABOLISM
+	hydration = 3
 
 /datum/reagent/consumable/pumpkinjuice
 	name = "Pumpkin Juice"
 	description = "Juiced from real pumpkin."
 	color = "#FFA500"
 	taste_description = "pumpkin"
-	hydration = 2 * REAGENTS_METABOLISM
+	hydration = 3
 
 /datum/reagent/consumable/blumpkinjuice
 	name = "Blumpkin Juice"
@@ -766,7 +766,7 @@
 	glass_icon_state = "triplecitrus" //needs own sprite mine are trash
 	glass_name = "glass of triple citrus"
 	glass_desc = "A mixture of citrus juices. Tangy, yet smooth."
-	hydration = 2 * REAGENTS_METABOLISM
+	hydration = 3
 
 /datum/reagent/consumable/grape_soda
 	name = "Grape soda"
@@ -775,7 +775,7 @@
 	taste_description = "grape soda"
 	glass_name = "glass of grape juice"
 	glass_desc = "It's grape (soda)!"
-	hydration = 2 * REAGENTS_METABOLISM
+	hydration = 3
 
 /datum/reagent/consumable/grape_soda/on_mob_life(mob/living/carbon/M)
 	M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
@@ -788,7 +788,7 @@
 	color = "#7D4E29"
 	quality = DRINK_NICE
 	taste_description = "chocolate milk"
-	hydration = 2 * REAGENTS_METABOLISM
+	hydration = 3
 
 /datum/reagent/consumable/menthol
 	name = "Menthol"
@@ -810,7 +810,7 @@
 	taste_description = "sweet pomegranates"
 	glass_name = "glass of grenadine"
 	glass_desc = "Delicious flavored syrup."
-	hydration = 1 * REAGENTS_METABOLISM
+	hydration = 4
 
 /datum/reagent/consumable/parsnipjuice
 	name = "Parsnip Juice"
@@ -818,7 +818,7 @@
 	color = "#FFA500"
 	taste_description = "parsnip"
 	glass_name = "glass of parsnip juice"
-	hydration = 1 * REAGENTS_METABOLISM
+	hydration = 4
 
 /datum/reagent/consumable/pineapplejuice
 	name = "Pineapple Juice"
@@ -827,7 +827,7 @@
 	taste_description = "pineapple"
 	glass_name = "glass of pineapple juice"
 	glass_desc = "Tart, tropical, and hotly debated."
-	hydration = 2 * REAGENTS_METABOLISM
+	hydration = 4
 
 /datum/reagent/consumable/peachjuice //Intended to be extremely rare due to being the limiting ingredients in the blazaam drink
 	name = "Peach Juice"
@@ -835,7 +835,7 @@
 	color = "#E78108"
 	taste_description = "peaches"
 	glass_name = "glass of peach juice"
-	hydration = 2 * REAGENTS_METABOLISM
+	hydration = 4
 
 /datum/reagent/consumable/cream_soda
 	name = "Cream Soda"
@@ -846,7 +846,7 @@
 	glass_icon_state = "cream_soda"
 	glass_name = "Cream Soda"
 	glass_desc = "A classic space-American vanilla flavored soft drink."
-	hydration = 2 * REAGENTS_METABOLISM
+	hydration = 4
 
 /datum/reagent/consumable/cream_soda/on_mob_life(mob/living/carbon/M)
 	M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
@@ -888,7 +888,7 @@
 	taste_description = "sweet strawberry and milk cream"
 	glass_name = "tall glass of strawberry milk"
 	glass_desc = "Delicious flavored strawberry syrup mixed with milk."
-	hydration = 3 * REAGENTS_METABOLISM
+	hydration = 4
 
 /datum/reagent/consumable/pinkmilk/on_mob_life(mob/living/carbon/M)
 	if(prob(15))
@@ -905,7 +905,7 @@
 	taste_description = "sweet tea with a hint of strawberry"
 	glass_name = "mug of strawberry tea"
 	glass_desc = "Delicious traditional tea flavored with strawberries."
-	hydration = 2 * REAGENTS_METABOLISM
+	hydration = 4
 
 /datum/reagent/consumable/tea/pinktea/on_mob_life(mob/living/carbon/M)
 	if(prob(10))
@@ -921,7 +921,7 @@
 	glass_icon_state = "monkey_energy_glass"
 	glass_name = "glass of Monkey Energy"
 	glass_desc = "You can unleash the ape, but without the pop of the can?"
-	hydration = 1 * REAGENTS_METABOLISM
+	hydration = 4
 
 /datum/reagent/consumable/monkey_energy/on_mob_life(mob/living/carbon/M)
 	M.Jitter(20)
@@ -939,7 +939,7 @@
 	glass_icon_state = "glass_yellow"
 	glass_name = "glass of bungo juice"
 	glass_desc = "Exotic! You feel like you are on vacation already."
-	hydration = 1 * REAGENTS_METABOLISM
+	hydration = 5
 
 /datum/reagent/consumable/aloejuice
 	name = "Aloe Juice"
@@ -949,7 +949,7 @@
 	glass_icon_state = "glass_yellow"
 	glass_name = "glass of aloe juice"
 	glass_desc = "A healthy and refreshing juice."
-	hydration = 2 * REAGENTS_METABOLISM
+	hydration = 5
 
 /datum/reagent/consumable/aloejuice/on_mob_life(mob/living/M)
 	if(prob(30))
@@ -984,7 +984,7 @@
 	glass_icon_state = "wockyslush"
 	glass_name = "Wocky Slush"
 	glass_desc = "That thang bleedin' to the-... ya know I mean?"
-	hydration = 3 * REAGENTS_METABOLISM
+	hydration = 3
 
 /datum/reagent/consumable/wockyslush/on_mob_life(mob/living/carbon/M)
 	M.emote(pick("twitch","giggle","stare"))

code/modules/reagents/chemistry/reagents/food_reagents.dm

@@ -18,6 +18,7 @@
 /datum/reagent/consumable/on_mob_life(mob/living/carbon/M)
 	current_cycle++
 	M.nutrition += nutriment_factor
+	M.thirst += hydration
 	holder.remove_reagent(type, metabolization_rate)
 
 /datum/reagent/consumable/reaction_mob(mob/living/M, method=TOUCH, reac_volume)

code/modules/reagents/chemistry/reagents/other_reagents.dm

@@ -258,7 +258,7 @@
 	glass_name = "glass of water"
 	glass_desc = "The father of all refreshments."
 	shot_glass_icon_state = "shotglassclear"
-	hydration = 10 * REAGENTS_METABOLISM
+	hydration = 5
 
 /*
  *	Water reaction to turf

code/modules/uplink/uplink_items.dm

@@ -1773,7 +1773,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
 	cost = 2
 	restricted_roles = list("Curator")
 	limited_stock = 1 //please don't spam deadchat
-
+/* Disabled because this is waaaay too chaotic for hyper
 /datum/uplink_item/role_restricted/his_grace
 	name = "His Grace"
 	desc = "An incredibly dangerous weapon recovered from a station overcome by the grey tide. Once activated, He will thirst for blood and must be used to kill to sate that thirst. \
@@ -1784,24 +1784,24 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
 	cost = 20
 	restricted_roles = list("Chaplain")
 	surplus = 5 //Very low chance to get it in a surplus crate even without being the chaplain
-
-///datum/uplink_item/role_restricted/clockwork_slab
-/datum/uplink_item/dangerous/clockwork_slab
+*/
+/datum/uplink_item/role_restricted/clockwork_slab
 	name = "Clockwork Slab"
 	desc = "A reverse engineered clockwork slab. Is this really a good idea?"
 	item = /obj/item/clockwork/slab/traitor
 	cost = 20
 	refundable = TRUE
-	//restricted_roles = list("Chaplain","Curator")
+	restricted_roles = list("Chaplain","Curator")
+	cant_discount = TRUE
 
-///datum/uplink_item/role_restricted/arcane_tome
-/datum/uplink_item/dangerous/arcane_tome
+/datum/uplink_item/role_restricted/arcane_tome
 	name = "Arcane Tome"
 	desc = "A 'replica' of a Nar'sian tome. This is probably a bad idea..."
 	item = /obj/item/tome/traitor
 	cost = 20
 	refundable = TRUE
-	//restricted_roles = list("Chaplain","Curator")
+	restricted_roles = list("Chaplain","Curator")
+	cant_discount = TRUE
 
 /datum/uplink_item/role_restricted/explosive_hot_potato
 	name = "Exploding Hot Potato"

code/modules/vending/magivend.dm

@@ -16,3 +16,22 @@
 	contraband = list(/obj/item/reagent_containers/glass/bottle/wizarditis = 1)	//No one can get to the machine to hack it anyways; for the lulz - Microwave
 	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50, "magic" = 100)
 	resistance_flags = FIRE_PROOF
+
+/obj/machinery/vending/magivend_novirus
+	name = "\improper MagiVend"
+	desc = "A magic vending machine."
+	icon_state = "MagiVend"
+	product_slogans = "Sling spells the proper way with MagiVend!;Be your own Houdini! Use MagiVend!"
+	vend_reply = "Have an enchanted evening!"
+	product_ads = "EI NATH;Destroy the station!;Admin conspiracies since forever!;Space-time bending hardware!;Now-magic proofing venders!"
+	products = list(/obj/item/clothing/head/wizard = 1,
+		            /obj/item/clothing/suit/wizrobe = 1,
+		            /obj/item/clothing/head/wizard/red = 1,
+		            /obj/item/clothing/suit/wizrobe/red = 1,
+		            /obj/item/clothing/head/wizard/yellow = 1,
+		            /obj/item/clothing/suit/wizrobe/yellow = 1,
+		            /obj/item/clothing/shoes/sandal/magic = 1,
+		            /obj/item/staff = 2)
+	contraband = list(/obj/item/coin/antagtoken = 1)
+	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50, "magic" = 100)
+	resistance_flags = FIRE_PROOF