Tg port 2 15 (#230)

* defines/helpers

* globalvars, onclick, controllers

* datums and game

* woooooooooorld. Uh. dm

* modules sans mobs client admin

* modules/admin

* pref shit

* modules/mob

* icon updates

* extra things

* Cherrypicked fixes from open PRs

* metastation.tgm fix

* a better meta fix

* reverts async breakings

code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm

@@ -637,16 +637,21 @@
 		desc = "A shot glass - the universal symbol for bad decisions."
 		return
 
-// for /obj/machinery/vending/sovietsoda
 /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/filled/New()
 	..()
 	on_reagent_change()
 
 /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/filled/soda
+	name = "Soda Water"
 	list_reagents = list("sodawater" = 50)
 
 /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/filled/cola
+	name = "Space Cola"
 	list_reagents = list("cola" = 50)
+	
+/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola
+	name = "Nuka Cola"
+	list_reagents = list("nuka_cola" = 50)
 
 /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/attackby(obj/item/I, mob/user, params)
 	if(istype(I,/obj/item/weapon/reagent_containers/food/snacks/egg)) //breaking eggs

code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm

@@ -77,7 +77,7 @@ insert ascii eagle on american flag background here
 	if(frying)
 		cook_time++
 		if(cook_time == 30)
-			playsound(src.loc, "sound/machines/ding.ogg", 50, 1)
+			playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
 			visible_message("[src] dings!")
 		else if (cook_time == 60)
 			visible_message("[src] emits an acrid smell!")
@@ -133,4 +133,4 @@ insert ascii eagle on american flag background here
 		reagents.remove_any((reagents.total_volume/2))
 		C.Weaken(3)
 		user.changeNext_move(CLICK_CD_MELEE)
-	..()
+	..()

code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm

@@ -399,7 +399,7 @@
 	desc = "A refrigerated storage unit for medicine storage."
 	var/list/spawn_meds = list(
 		/obj/item/weapon/reagent_containers/pill/epinephrine = 12,
-		/obj/item/weapon/reagent_containers/pill/charcoal = 1,
+		/obj/item/weapon/reagent_containers/pill/charcoal = 5,
 		/obj/item/weapon/reagent_containers/glass/bottle/epinephrine = 1,
 		/obj/item/weapon/reagent_containers/glass/bottle/charcoal = 1)