Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3

# Conflicts:
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi

code/modules/reagents/Chemistry-Machinery.dm

@@ -21,7 +21,7 @@
 	var/obj/item/weapon/storage/pill_bottle/loaded_pill_bottle = null
 	var/mode = 0
 	var/condi = 0
-	var/useramount = 30 // Last used amount
+	var/useramount = 15 // Last used amount
 	var/pillamount = 10
 	var/bottlesprite = "bottle-1" //yes, strings
 	var/pillsprite = "1"
@@ -265,6 +265,8 @@
 				dat += "<A href='?src=\ref[src];add=[G.id];amount=1'>(1)</A> "
 				dat += "<A href='?src=\ref[src];add=[G.id];amount=5'>(5)</A> "
 				dat += "<A href='?src=\ref[src];add=[G.id];amount=10'>(10)</A> "
+				dat += "<A href='?src=\ref[src];add=[G.id];amount=30'>(30)</A> "
+				dat += "<A href='?src=\ref[src];add=[G.id];amount=60'>(60)</A> "
 				dat += "<A href='?src=\ref[src];add=[G.id];amount=[G.volume]'>(All)</A> "
 				dat += "<A href='?src=\ref[src];addcustom=[G.id]'>(Custom)</A><BR>"
 
@@ -276,6 +278,8 @@
 				dat += "<A href='?src=\ref[src];remove=[N.id];amount=1'>(1)</A> "
 				dat += "<A href='?src=\ref[src];remove=[N.id];amount=5'>(5)</A> "
 				dat += "<A href='?src=\ref[src];remove=[N.id];amount=10'>(10)</A> "
+				dat += "<A href='?src=\ref[src];remove=[N.id];amount=30'>(30)</A> "
+				dat += "<A href='?src=\ref[src];remove=[N.id];amount=60'>(60)</A> "
 				dat += "<A href='?src=\ref[src];remove=[N.id];amount=[N.volume]'>(All)</A> "
 				dat += "<A href='?src=\ref[src];removecustom=[N.id]'>(Custom)</A><BR>"
 		else

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm

@@ -476,9 +476,11 @@
 /datum/reagent/slimetoxin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
 	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
-		if(H.species.name != "Slime")
+		if(H.species.name != "Promethean")
 			M << "<span class='danger'>Your flesh rapidly mutates!</span>"
-			H.set_species("Slime")
+			H.set_species("Promethean")
+			H.shapeshifter_set_colour("#05FF9B")
+			H.verbs -= /mob/living/carbon/human/proc/shapeshifter_select_colour
 
 /datum/reagent/aslimetoxin
 	name = "Advanced Mutation Toxin"

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

@@ -8,6 +8,7 @@
 	volume = 30
 	unacidable = 1 //glass
 	center_of_mass = list("x"=16, "y"=10)
+	matter = list("glass" = 500)
 
 	on_reagent_change()
 		/*if(reagents.reagent_list.len > 1 )

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -2892,6 +2892,19 @@
 	var/list/boxes = list() // If the boxes are stacked, they come here
 	var/boxtag = ""
 
+
+/obj/item/pizzabox/proc/closepizzabox()
+
+	if( boxes.len > 0 )
+		return
+
+	open = !open
+
+	if( open && pizza )
+		ismessy = 1
+
+	update_icon()
+
 /obj/item/pizzabox/update_icon()
 
 	overlays = list()
@@ -2970,15 +2983,12 @@
 
 /obj/item/pizzabox/attack_self( mob/user as mob )
 
-	if( boxes.len > 0 )
-		return
+	closepizzabox()
 
-	open = !open
+/obj/item/pizzabox/AltClick()
 
-	if( open && pizza )
-		ismessy = 1
-
-	update_icon()
+	if(Adjacent(usr))
+		closepizzabox()
 
 /obj/item/pizzabox/attackby( obj/item/I as obj, mob/user as mob )
 	if( istype(I, /obj/item/pizzabox/) )