Hard upstream sync (#6951)

* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath

modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -45,6 +45,7 @@
 		/obj/item/clockwork/weapon/ratvarian_spear)
 	cyborg_base_icon = "k9"
 	moduleselect_icon = "k9"
+	moduleselect_alternate_icon = 'modular_citadel/icons/ui/screen_cyborg.dmi'
 	can_be_pushed = FALSE
 	hat_offset = INFINITY
 	sleeper_overlay = "ksleeper"
@@ -76,6 +77,7 @@
 		/obj/item/clockwork/weapon/ratvarian_spear)
 	cyborg_base_icon = "medihound"
 	moduleselect_icon = "medihound"
+	moduleselect_alternate_icon = 'modular_citadel/icons/ui/screen_cyborg.dmi'
 	can_be_pushed = FALSE
 	hat_offset = INFINITY
 	sleeper_overlay = "msleeper"
@@ -133,6 +135,7 @@
 		/obj/item/clockwork/replica_fabricator/cyborg)
 	cyborg_base_icon = "borgi"
 	moduleselect_icon = "borgi"
+	moduleselect_alternate_icon = 'modular_citadel/icons/ui/screen_cyborg.dmi'
 	hat_offset = INFINITY
 	cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
 	has_snowflake_deadsprite = TRUE
@@ -239,4 +242,4 @@
 			cyborg_base_icon = "miner"
 			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
 			hat_offset = 4
-	return ..()
+	return ..()

modular_citadel/code/modules/reagents/reagents/cit_reagents.dm

@@ -235,40 +235,3 @@
 	required_reagents = list("anaphro" = 5, "acetone" = 1)
 	required_temp = 300
 	mix_message = "The mixture thickens and heats up slighty..."
-
-//=========Drinks and Stuff!============//
-
-/datum/reagent/consumable/ethanol/sake
-	name = "Sake"
-	id = "sake"
-	description = "A sweet rice wine of questionable legality and extreme potency."
-	color = "#DDDDDD"
-	boozepwr = 70
-	taste_description = "sweet rice wine"
-	glass_icon_state = "sakecup"
-	glass_name = "glass of sake"
-	glass_desc = "A traditional cup of sake."
-
-/datum/chemical_reaction/sake
-	name = "sake"
-	id = "sake"
-	results = list("sake" = 20)
-	required_reagents = list("rice" = 15, "sugar" = 5)
-	required_temp = 400
-	mix_message = "The rice grains ferment with the sugar into a clear, sweet-smelling liquid."
-
-/obj/item/reagent_containers/food/drinks/bottle/sake
-	name = "Traditional Sake"
-	desc = "Sweet as can be, and burns like foxfire going down."
-	icon = 'modular_citadel/icons/obj/drinks.dmi'
-	icon_state = "sakebottle"
-	list_reagents = list("sake" = 100)
-
-/obj/item/reagent_containers/food/drinks/bottle/sake/Initialize()
-	. = ..()
-	if(prob(30))
-		name = "Tetravulpine Sake"
-		desc += " On the bottle is a picture of a kitsune with four tails."
-	else if(prob(30))
-		name = "Inubashiri's Home Brew"
-		desc += " Awoo."