Merge pull request #257 from Meowykins/master

Stuff for stuff.

code/modules/clothing/glasses/glasses.dm

@@ -106,6 +106,8 @@
 	icon_state = "sun"
 	item_state = "sunglasses"
 	darkness_view = -1
+	g_amt = 1000
+	m_amt = 500
 
 /obj/item/clothing/glasses/welding
 	name = "welding goggles"

code/modules/mining/mine_items.dm

@@ -170,6 +170,8 @@ proc/move_mining_shuttle()
 	name = "lantern"
 	icon_state = "lantern"
 	desc = "A mining lantern."
+	m_amt = 1000
+	g_amt = 500
 	brightness_on = 6			// luminosity when on
 
 /*****************************Pickaxe********************************/

code/modules/mob/living/carbon/human/life.dm

@@ -1812,6 +1812,8 @@
 					holder.icon_state = "huddeathsquad"
 				if("Ninja")
 					holder.icon_state = "hudninja"
+				if("Vampire")
+					holder.icon_state = "hudvampire"
 
 			hud_list[SPECIALROLE_HUD] = holder
 	hud_updateflag = 0

code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm

@@ -5,6 +5,7 @@
 	desc = "Your standard drinking glass."
 	icon_state = "glass_empty"
 	amount_per_transfer_from_this = 10
+	g_amt = 500
 	volume = 50
 
 	on_reagent_change()