diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm
index 7b594ce7ad..f25000c00e 100644
--- a/code/WorkInProgress/Chemistry-Tools.dm
+++ b/code/WorkInProgress/Chemistry-Tools.dm
@@ -2234,6 +2234,12 @@
 	icon_state = "flask"
 	volume = 60
 
+/obj/item/weapon/reagent_containers/food/drinks/britcup
+	name = "cup"
+	desc = "A cup with the british flag emblazoned on it."
+	icon_state = "britcup"
+	volume = 30
+
 /obj/item/weapon/reagent_containers/food/drinks/drinkingglass
 	name = "glass"
 	desc = "Your standard drinking glass."
diff --git a/code/modules/admin/verbs/massmodvar.dm b/code/modules/admin/verbs/massmodvar.dm
index ea36692cf8..0e54d1d2cb 100644
--- a/code/modules/admin/verbs/massmodvar.dm
+++ b/code/modules/admin/verbs/massmodvar.dm
@@ -145,23 +145,37 @@
 						A.vars[variable] = O.vars[variable]
 
 		if("num")
-			O.vars[variable] = input("Enter new number:","Num",\
-				O.vars[variable]) as num
+			var/new_value = input("Enter new number:","Num",\
+					O.vars[variable]) as num
+
+			if(variable=="luminosity")
+				O.sd_SetLuminosity(new_value)
+			else
+				O.vars[variable] = new_value
 
 			if(istype(O, /mob))
 				for(var/mob/M in world)
 					if (M.type == O.type)
-						M.vars[variable] = O.vars[variable]
+						if(variable=="luminosity")
+							M.sd_SetLuminosity(new_value)
+						else
+							M.vars[variable] = O.vars[variable]
 
 			else if(istype(O, /obj))
 				for(var/obj/A in world)
 					if (A.type == O.type)
-						A.vars[variable] = O.vars[variable]
+						if(variable=="luminosity")
+							A.sd_SetLuminosity(new_value)
+						else
+							A.vars[variable] = O.vars[variable]
 
 			else if(istype(O, /turf))
 				for(var/turf/A in world)
 					if (A.type == O.type)
-						A.vars[variable] = O.vars[variable]
+						if(variable=="luminosity")
+							A.sd_SetLuminosity(new_value)
+						else
+							A.vars[variable] = O.vars[variable]
 
 		if("type")
 			O.vars[variable] = input("Enter type:","Type",O.vars[variable]) \
diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm
index f064d8a41d..f06a88148e 100644
--- a/code/modules/admin/verbs/modifyvariables.dm
+++ b/code/modules/admin/verbs/modifyvariables.dm
@@ -93,7 +93,6 @@
 		if("No")
 			L += var_value
 
-
 /client/proc/mod_list(var/list/L)
 	if(!istype(L,/list)) src << "Not a List."
 
@@ -343,8 +342,13 @@
 				O.vars[variable]) as text
 
 		if("num")
-			O.vars[variable] = input("Enter new number:","Num",\
-				O.vars[variable]) as num
+			if(variable=="luminosity")
+				var/new_value = input("Enter new number:","Num",\
+					O.vars[variable]) as num
+				O.sd_SetLuminosity(new_value)
+			else
+				O.vars[variable] = input("Enter new number:","Num",\
+					O.vars[variable]) as num
 
 		if("type")
 			O.vars[variable] = input("Enter type:","Type",O.vars[variable]) \
diff --git a/config/admins.txt b/config/admins.txt
index 4cd04437a6..c1619c36b1 100644
--- a/config/admins.txt
+++ b/config/admins.txt
@@ -5,6 +5,8 @@ herpa - Game Master
 scaredofshadows - Game Master
 chicagoted - Game Master
 neofite - Game Master
+uristmcdorf - Game Master
+cinless - Game Master
 
 mport2004 - Game Admin
 lj82 - Game Admin
diff --git a/data/mode.txt b/data/mode.txt
index 076bf8fa12..ae791fed36 100644
--- a/data/mode.txt
+++ b/data/mode.txt
@@ -1 +1 @@
-traitor
+extended
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index e737d46094..4045ede6b7 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ
diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi
index d568a9872b..91ffb8d823 100644
Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ
diff --git a/icons/obj/mining.dmi b/icons/obj/mining.dmi
index d645d7b4e1..c030d1b4a0 100644
Binary files a/icons/obj/mining.dmi and b/icons/obj/mining.dmi differ
diff --git a/interface/skin.dmf b/interface/skin.dmf
index 7b53e952b0..363585e9a5 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -133,7 +133,7 @@ menu "menu"
 		is-checked = false
 		can-check = true
 		group = "size"
-		is-disabled = true
+		is-disabled = false
 		saved-params = "is-checked"
 	elem 
 		name = ""
diff --git a/maps/tgstation.2.0.7.dmm b/maps/tgstation.2.0.7.dmm
index fac3b25609..912a4d55f0 100644
--- a/maps/tgstation.2.0.7.dmm
+++ b/maps/tgstation.2.0.7.dmm
@@ -1531,7 +1531,7 @@
 "aDw" = (/obj/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/wall,/area/library)
 "aDx" = (/obj/machinery/atmospherics/pipe/simple,/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
 "aDy" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/turf/simulated/wall,/area/hydroponics)
-"aDz" = (/obj/table{icon_state = "tabledir"; dir = 4},/obj/item/device/analyzer/plant_analyzer,/obj/item/weapon/paper/hydroponics,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
+"aDz" = (/obj/table{icon_state = "tabledir"; dir = 4},/obj/item/device/analyzer/plant_analyzer,/obj/item/weapon/paper/hydroponics,/obj/item/weapon/reagent_containers/food/drinks/britcup{desc = "Kingston's personal cup."; layer = 4},/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
 "aDA" = (/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
 "aDB" = (/obj/machinery/light,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
 "aDC" = (/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/disposalpipe/segment{dir = 1},/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)