diff --git a/GainStation13/code/modules/mob/living/brap.dm b/GainStation13/code/modules/mob/living/brap.dm
new file mode 100644
index 00000000..b51e368b
--- /dev/null
+++ b/GainStation13/code/modules/mob/living/brap.dm
@@ -0,0 +1,39 @@
+/datum/emote/living/brap
+    key = "brap"
+    key_third_person = "braps"
+    message = " "
+    emote_type = EMOTE_AUDIBLE
+
+/datum/emote/living/brap/select_message_type(mob/user)
+    return pick("farts loudly!", "cuts a fat one!", "rips absolute ass!")
+   
+
+
+/datum/emote/living/brap/run_emote(mob/living/user, params)
+	if(!ishuman(user))
+		return FALSE	
+
+	var/fartSoundChoice = rand(7)
+	switch(fartSoundChoice)
+		if(0) 
+			playsound(user, 'GainStation13/sound/voice/brap3.ogg', 50, 1, -1)
+		if(1)
+			playsound(user, 'GainStation13/sound/voice/brap4.ogg', 50, 1, -1)
+		if(2)
+			playsound(user, 'GainStation13/sound/voice/brap2.ogg', 50, 1, -1)
+		if(3)
+			playsound(user, 'GainStation13/sound/voice/brap1.ogg', 50, 1, -1)
+		if(4)
+			playsound(user, 'GainStation13/sound/voice/brap5.ogg', 50, 1, -1)
+		if(5) 
+			playsound(user, 'GainStation13/sound/voice/brap6.ogg', 50, 1, -1)
+		if(6)
+			playsound(user, 'GainStation13/sound/voice/brap7.ogg', 50, 1, -1)
+		if(7) 
+			playsound(user, 'GainStation13/sound/voice/brap8.ogg', 50, 1, -1)
+
+	. = ..()	
+
+
+
+
diff --git a/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm b/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm
index cb556971..c4d8bacd 100644
--- a/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm
+++ b/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm
@@ -53,3 +53,25 @@
 	else
 		M.fullness -= 0
 	..()
+
+//FARTY CHEM
+
+/datum/reagent/consumable/flatulose
+	name = "Flatulose"
+	description = "A sugar largely indigestible to most known organic organisms. Causes frequent flatulence."
+	color = "#634500"
+	reagent_state = LIQUID
+	taste_description = "sulfury sweetness"
+	metabolization_rate = 0.5 * REAGENTS_METABOLISM //Done by Zestyspy, Jan 2023
+
+/datum/reagent/consumable/flatulose/on_mob_life(mob/living/carbon/M)
+	if(M && M?.client?.prefs.weight_gain_chems)
+		if(M.reagents.get_reagent_amount(/datum/reagent/consumable/flatulose) < 1)
+			to_chat(M,"<span class='notice'>You feel substantially bloated...</span>")
+		if(M.reagents.get_reagent_amount(/datum/reagent/consumable/flatulose) > 3)
+			to_chat(M,"<span class='notice'>You feel pretty gassy...</span>")
+			M.emote(pick("brap","fart"))
+		..()
+	else
+		return ..()
+
diff --git a/GainStation13/code/modules/reagents/chemistry/reagents/dwarverndrinks.dm b/GainStation13/code/modules/reagents/chemistry/reagents/dwarverndrinks.dm
new file mode 100644
index 00000000..22afcd02
--- /dev/null
+++ b/GainStation13/code/modules/reagents/chemistry/reagents/dwarverndrinks.dm
@@ -0,0 +1,28 @@
+///GS13 drinks!
+
+/datum/reagent/consumable/ethanol/oily_oafs
+	name = "Oily oafs"
+	description = "The oily oaf. while it isn't as strong as some of the other drinks on station, Its buttery aftertaste and affordability make it a staple of any good miner's diet."
+	color = "#ffc75f"
+	boozepwr = 30
+	taste_description = "rich butter and red sugar"
+	//quality = DRINK_NICE we need to get drink quality implemented in our drink files -Eye
+	glass_icon_state = "oily_oafs"
+	glass_name = "oily oafs"
+	glass_desc = "The oily oaf. A dwarvern classic beloved by miners around the cosmos."
+	shot_glass_icon_state = "shotglassbrown"
+	pH = 4.5
+	value = 0.1
+
+/datum/reagent/consumable/ethanol/glyphid_slammer
+	name = "Glyphid slammer"
+	description = "A mixture of strong beer and energy drink. How it manages to be as strong as it is baffles scientists to this day"
+	color = "#FF8A33"
+	boozepwr = 60
+	taste_description = "Cheap booze and adventure"
+	glass_icon_state = "glyphid_slammer"
+	glass_name = "Glyphid slammer"
+	glass_desc = "A bold mixture of cheap energy drink, and even cheaper ale. Beloved by partygoers and daredevils across the galaxy. Beloathed by bugpeople"
+	shot_glass_icon_state = "shotglassbrown"
+	pH = 4.5
+	value = 0.1
\ No newline at end of file
diff --git a/GainStation13/code/modules/reagents/chemistry/recipes/ROCKANDSTONEdrinks.dm b/GainStation13/code/modules/reagents/chemistry/recipes/ROCKANDSTONEdrinks.dm
new file mode 100644
index 00000000..97adc1f1
--- /dev/null
+++ b/GainStation13/code/modules/reagents/chemistry/recipes/ROCKANDSTONEdrinks.dm
@@ -0,0 +1,17 @@
+//DRG drinks
+
+
+/datum/chemical_reaction/oily_oafs
+	name = "Oily oafs"
+	id = /datum/reagent/consumable/ethanol/oily_oafs
+	results = list(/datum/reagent/consumable/ethanol/oily_oafs = 2)
+	required_reagents = list(/datum/reagent/consumable/ethanol/beer = 1, /datum/reagent/consumable/cream = 1)
+
+/datum/chemical_reaction/glyphid_slammer
+	name = "Glyphid slammer"
+	id = /datum/reagent/consumable/ethanol/glyphid_slammer
+	results = list(/datum/reagent/consumable/ethanol/glyphid_slammer = 2)
+	required_reagents = list(/datum/reagent/consumable/pwr_game = 1, /datum/reagent/consumable/ethanol/beer = 1)
+
+
+
diff --git a/GainStation13/code/modules/vending/GBBurrito.dm b/GainStation13/code/modules/vending/GBBurrito.dm
new file mode 100644
index 00000000..a30645c3
--- /dev/null
+++ b/GainStation13/code/modules/vending/GBBurrito.dm
@@ -0,0 +1,10 @@
+/obj/item/reagent_containers/food/snacks/gbburrito
+	name = "\improper Gato Gas Giant Burrito"
+	icon_state = "gbburrito"
+	desc = "More than three pounds of beans, meat, and cheese wrapped in a greasy tortilla. It's piping hot."
+	trash = null
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/flatulose = 4, /datum/reagent/consumable/sodiumchloride = 0.5)
+	filling_color = "#74291b"
+	tastes = list("refried beans","grease" = 1)
+	foodtype = MEAT 
+	price = 3
diff --git a/GainStation13/sound/voice/brap1.ogg b/GainStation13/sound/voice/brap1.ogg
new file mode 100644
index 00000000..ec4ce11b
Binary files /dev/null and b/GainStation13/sound/voice/brap1.ogg differ
diff --git a/GainStation13/sound/voice/brap2.ogg b/GainStation13/sound/voice/brap2.ogg
new file mode 100644
index 00000000..e07ecdd3
Binary files /dev/null and b/GainStation13/sound/voice/brap2.ogg differ
diff --git a/GainStation13/sound/voice/brap3.ogg b/GainStation13/sound/voice/brap3.ogg
new file mode 100644
index 00000000..02852e47
Binary files /dev/null and b/GainStation13/sound/voice/brap3.ogg differ
diff --git a/GainStation13/sound/voice/brap4.ogg b/GainStation13/sound/voice/brap4.ogg
new file mode 100644
index 00000000..226cde3d
Binary files /dev/null and b/GainStation13/sound/voice/brap4.ogg differ
diff --git a/GainStation13/sound/voice/brap5.ogg b/GainStation13/sound/voice/brap5.ogg
new file mode 100644
index 00000000..6b815e03
Binary files /dev/null and b/GainStation13/sound/voice/brap5.ogg differ
diff --git a/GainStation13/sound/voice/brap6.ogg b/GainStation13/sound/voice/brap6.ogg
new file mode 100644
index 00000000..2288ebb5
Binary files /dev/null and b/GainStation13/sound/voice/brap6.ogg differ
diff --git a/GainStation13/sound/voice/brap7.ogg b/GainStation13/sound/voice/brap7.ogg
new file mode 100644
index 00000000..f1205c44
Binary files /dev/null and b/GainStation13/sound/voice/brap7.ogg differ
diff --git a/GainStation13/sound/voice/brap8.ogg b/GainStation13/sound/voice/brap8.ogg
new file mode 100644
index 00000000..9c17d8dc
Binary files /dev/null and b/GainStation13/sound/voice/brap8.ogg differ
diff --git a/_maps/map_files/Mining/Lavaland_Demone.dmm b/_maps/map_files/Mining/Lavaland_Demone.dmm
index d5ac23a0..7bc6750c 100644
--- a/_maps/map_files/Mining/Lavaland_Demone.dmm
+++ b/_maps/map_files/Mining/Lavaland_Demone.dmm
@@ -268,7 +268,6 @@
 "re" = (/turf/closed/wall/mineral/plastitanium,/area/lavaland/surface/outdoors)
 "rg" = (/obj/machinery/airalarm/unlocked{pixel_y = 24},/obj/effect/decal/cleanable/cobweb/cobweb2,/turf/open/floor/mineral/sandstone_floor,/area/lavaland/demone/lobby)
 "rm" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{dir = 2},/turf/open/floor/plating,/area/lavaland/surface/outdoors)
-"rp" = (/obj/item/trash/fatoray_scrap1,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
 "rq" = (/obj/structure/closet/crate,/obj/item/reagent_containers/food/snacks/donut/matcha{desc = "Are you sure you want to eat this?"; name = "Demon puke donut"},/obj/item/reagent_containers/food/snacks/donut/matcha{desc = "Are you sure you want to eat this?"; name = "Demon puke donut"},/turf/open/floor/mineral/basaltstone_floor,/area/lavaland/demone/factorystorage)
 "rr" = (/obj/structure/flora/ashtree/ashtreee,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
 "ru" = (/obj/structure/flora/ashtree/ashtreee{pixel_x = -27},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
@@ -881,7 +880,7 @@ krkrkrkrkrkrkrkrkrkrDCcXenenenenenenDCDCDCenenenenenenenenenenenenenenenenenenen
 krkrenkrkrkrkrenkrkrenenenenenenenDCDCDCDCDCenenenenenenenenenenenenenenenenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCenenenrrenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenencXDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenenenenenenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCenenenenenDCaODCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkr
 krkrenkrkrkrenenenenenenenenenenDCDCDCDCDCDCDCkrkrkrenenenenenenenDCenenenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCenenrzenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenenenenenenenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCenenenenDCenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkr
 krkrenrzenenenenenenenenenenenenDCDCDCDCDCDCDCkrkrkrkrkrenenenenDCDCDCDCenenenenenenenenenenenenenenenrzDCDCDCDCDCDCDCDCDCDCDCcXenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenrzDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenenenenenenenenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCenenenenDCenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkr
-krkrenenenenenenenenenenenenenenrpenDCDCDCDCkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCenenenenenenenenenencXenenDCDCDCDCDCDCDCDCDCDCeneniqenenenenenenenenenenrzenenenenenenenenenenenenenenenenenenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenDCDCDCenenenenenenenenenenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCenenenDCenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkr
+krkrenenenenenenenenenenenenenenenenDCDCDCDCkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCenenenenenenenenenencXenenDCDCDCDCDCDCDCDCDCDCeneniqenenenenenenenenenenrzenenenenenenenenenenenenenenenenenenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenDCDCDCenenenenenenenenenenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCenenenDCenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkr
 krkrkrenenenenenenenenenenenDCbJDvDCDCDCDCDCkrkrkrkrkrkrkrkrkrDCDCDCDCDCkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCDCDCenenenenenenenenenenenenenzVenenenrrenenenenenenenenenenenenenenenenenenenenenenenenenenrKDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenDCDCDCDCDCDCDCenenenenenenenenenenDCenenenenenenenDCDCDCDCDCDCDCDCDCDCenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkr
 krkrkrkrenenenenenenkrkrkrDCDCDCDCDCDCDCDCkrkrkrkrkrkrkrkrkrkrkrDCDCkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenmGenenenenrzenenenenenenenenenenenenenenenenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenDCDCDCDCDCDCDCDCDCenenenenenenenenDCDCDCDCenenenenenenenDCDCDCDCDCDCDCDCDCenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkr
 krkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCkrkrkrkrkrkrkrkrkrkrkrkrDCDCkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCencXenenenenenenenenenenenenzVenenenenenenenenenenenenenenenenenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenDCDCDCDCDCenenenenenenDCDCDCDCDCDCDCDCDCDCenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkr
diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm
index a69c5a6d..c3514429 100644
--- a/code/__HELPERS/global_lists.dm
+++ b/code/__HELPERS/global_lists.dm
@@ -86,18 +86,14 @@
 		var/datum/emote/E = new path()
 		E.emote_list[E.key] = E
 
+	//Crafting Recipes
 	init_subtypes(/datum/crafting_recipe, GLOB.crafting_recipes)
 
-
-
-	// Hair Gradients - Initialise all /datum/sprite_accessory/hair_gradient into an list indexed by gradient-style name
+	//Hair Gradients - Initialise all /datum/sprite_accessory/hair_gradient into a list indexed by gradient-style name
 	for(var/path in subtypesof(/datum/sprite_accessory/hair_gradient))
 		var/datum/sprite_accessory/hair_gradient/H = new path()
 		GLOB.hair_gradients_list[H.name] = H
 
-	init_subtypes(/datum/crafting_recipe, GLOB.crafting_recipes)
-
-
 //creates every subtype of prototype (excluding prototype) and adds it to list L.
 //if no list/L is provided, one is created.
 /proc/init_subtypes(prototype, list/L)
diff --git a/code/datums/components/crafting/recipes/recipes_misc.dm b/code/datums/components/crafting/recipes/recipes_misc.dm
index 7773e2f8..566acc0f 100644
--- a/code/datums/components/crafting/recipes/recipes_misc.dm
+++ b/code/datums/components/crafting/recipes/recipes_misc.dm
@@ -400,3 +400,11 @@
 	result = /obj/item/bouquet/rose
 	reqs = list(/obj/item/grown/rose = 6)
 	category = CAT_MISC
+
+// ################ GS13 things! ################
+
+/datum/crafting_recipe/caloritedancefloor
+	name = "Calorite dance floor"
+	result = /obj/item/stack/tile/mineral/calorite/dance
+	reqs = list(/obj/item/stack/cable_coil = 3, /obj/item/stack/tile/mineral/calorite = 1)
+	category = CAT_MISC
diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm
index 3a2b9d57..b79c5516 100644
--- a/code/game/objects/items/stunbaton.dm
+++ b/code/game/objects/items/stunbaton.dm
@@ -187,8 +187,8 @@
 		stunpwr *= round(stuncharge/hitcost, 0.1)
 
 
-	L.Knockdown(stunpwr)
-	L.adjustStaminaLoss(stunpwr*0.1, affected_zone = (istype(user) ? user.zone_selected : BODY_ZONE_CHEST))//CIT CHANGE - makes stunbatons deal extra staminaloss. Todo: make this also deal pain when pain gets implemented.
+	//L.Knockdown(stunpwr) GS13 change, makes stunbatons no longer oneshot people -Eye
+	L.adjustStaminaLoss(stunpwr*0.5, affected_zone = (istype(user) ? user.zone_selected : BODY_ZONE_CHEST))//CIT CHANGE - makes stunbatons deal extra staminaloss. Todo: make this also deal pain when pain gets implemented.
 	L.apply_effect(EFFECT_STUTTER, stunforce)
 	SEND_SIGNAL(L, COMSIG_LIVING_MINOR_SHOCK)
 	if(user)
@@ -211,7 +211,7 @@
 	user.visible_message("<span class='danger'>[user] accidentally hits [user.p_them()]self with [src]!</span>", \
 						"<span class='userdanger'>You accidentally hit yourself with [src]!</span>")
 	SEND_SIGNAL(user, COMSIG_LIVING_MINOR_SHOCK)
-	user.Knockdown(stunforce*3)
+	//user.Knockdown(stunforce*3)
 	playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1)
 	deductcharge(hitcost)
 
diff --git a/code/game/turfs/simulated/floor/mineral_floor.dm b/code/game/turfs/simulated/floor/mineral_floor.dm
index 789d8dc4..a2fd1256 100644
--- a/code/game/turfs/simulated/floor/mineral_floor.dm
+++ b/code/game/turfs/simulated/floor/mineral_floor.dm
@@ -243,7 +243,7 @@
 // calorite dance floor, groovy! - GS13
 
 /turf/open/floor/mineral/calorite/dance
-	name = "Calorite dancefloor"
+	name = "Calorite dance floor"
 	icon_state = "calorite_dance"
 	floor_tile = /obj/item/stack/tile/mineral/calorite/dance
 	icons = list("calorite_dance","calorite_dam")
diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
index d99ee871..db9f7bfa 100644
--- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm
+++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
@@ -917,11 +917,3 @@
     id = /datum/reagent/consumable/orange_creamsicle
     results = list(/datum/reagent/consumable/orange_creamsicle = 4)
     required_reagents = list(/datum/reagent/consumable/vanilla = 1, /datum/reagent/consumable/milk = 1, /datum/reagent/consumable/ice = 1, /datum/reagent/consumable/orangejuice = 1)
-
-/datum/chemical_reaction/oily_oafs
-	name = "Oily oafs"
-	id = /datum/reagent/consumable/ethanol/oily_oafs
-	results = list(/datum/reagent/consumable/ethanol/oily_oafs = 2)
-	required_reagents = list(/datum/reagent/consumable/ethanol/beer = 1, /datum/reagent/consumable/cream = 1)
-
-	//b
\ No newline at end of file
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 7c772c4e..a1a8c0d1 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -11,7 +11,7 @@
 	desc = "It's watching you suspiciously."
 
 /obj/structure/closet/crate/necropolis/tendril/PopulateContents()
-	var/loot = rand(1,33)
+	var/loot = rand(1,34)
 	switch(loot)
 		if(1)
 			new /obj/item/shared_storage/red(src)
@@ -91,6 +91,8 @@
 			new /obj/item/gun/energy/fatoray/cannon(src)
 		if(33)
 			new /obj/item/gun/magic/wand/food(src)
+		if(34)
+			new /obj/item/karl_pickaxe(src)
 //		if(29)
 //			new /obj/item/clothing/gloves/gauntlets(src)
 
@@ -269,6 +271,26 @@
 		if(do_after(owner, 40, target = owner))
 			MM.mori()
 
+//Karl's pickaxe
+/obj/item/karl_pickaxe //GS13 addition!
+	name = "karl's pickaxe"
+	desc = "You can never dig too deep"
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "karlpick"
+	flags_1 = CONDUCT_1
+	slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
+	force = 30
+	throwforce = 20
+	item_state = "pickaxe"
+	lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/mining_righthand.dmi'
+	w_class = WEIGHT_CLASS_SMALL
+	materials = list(MAT_METAL=2000)
+	tool_behaviour = TOOL_MINING
+	toolspeed = 0.01
+	usesound = list('sound/effects/picaxe1.ogg', 'sound/effects/picaxe2.ogg', 'sound/effects/picaxe3.ogg')
+	attack_verb = list("hit", "pierced", "sliced", "attacked", "rocked", "stoned", "power attacked")
+
 //Wisp Lantern
 /obj/item/wisp_lantern
 	name = "spooky lantern"
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index 118b66b6..dff2dfc9 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -2439,18 +2439,4 @@ datum/reagent/consumable/ethanol/creme_de_coconut
 	taste_description = "viscous cream"
 	glass_desc = "The name is probably exactly what it is."
 
-///GS13 drinks!
 
-/datum/reagent/consumable/ethanol/oily_oafs
-	name = "Oily oafs"
-	description = "The oily oaf. while it isn't as strong as some of the other drinks on station, Its buttery aftertaste and affordability make it a staple of any good miner's diet."
-	color = "#ffc75f"
-	boozepwr = 30
-	taste_description = "rich butter and red sugar"
-	quality = DRINK_NICE
-	glass_icon_state = "oily_oafs"
-	glass_name = "oily oafs"
-	glass_desc = "The oily oaf. A dwarvern classic beloved by miners around the cosmos."
-	shot_glass_icon_state = "shotglassbrown"
-	pH = 4.5
-	value = 0.1
diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm
index bdd12bb1..6183fe92 100644
--- a/code/modules/vending/snack.dm
+++ b/code/modules/vending/snack.dm
@@ -12,6 +12,7 @@
 					/obj/item/reagent_containers/food/snacks/spacetwinkie = 6,
 					/obj/item/reagent_containers/food/snacks/cheesiehonkers = 6,
 					/obj/item/reagent_containers/food/snacks/bird_seed =6,
+					/obj/item/reagent_containers/food/snacks/gbburrito = 6,
 					/obj/item/reagent_containers/food/snacks/soyfood = 6)
 	contraband = list(/obj/item/reagent_containers/food/snacks/syndicake = 6)
 	premium = list(/obj/item/storage/box/donkpockets = 1,
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index f2ea4106..046ec549 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ
diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi
index ec44e124..76756e6c 100644
Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ
diff --git a/icons/obj/mining.dmi b/icons/obj/mining.dmi
index 724b8a95..859e4ee2 100644
Binary files a/icons/obj/mining.dmi and b/icons/obj/mining.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index 1363c2f0..26b69739 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -6,253 +6,6 @@
 
 // BEGIN_FILE_DIR
 #define FILE_DIR .
-#define FILE_DIR "code"
-#define FILE_DIR "code/modules"
-#define FILE_DIR "code/modules/research"
-#define FILE_DIR "code/modules/research/xenoarch"
-#define FILE_DIR "code/modules/research/xenoarch/xenobotany"
-#define FILE_DIR "code/modules/research/xenoarch/xenobotany/icons"
-#define FILE_DIR "config"
-#define FILE_DIR "config/jukebox_music"
-#define FILE_DIR "config/jukebox_music/sounds"
-#define FILE_DIR "config/title_screens"
-#define FILE_DIR "GainStation13"
-#define FILE_DIR "GainStation13/icons"
-#define FILE_DIR "GainStation13/icons/mob"
-#define FILE_DIR "GainStation13/icons/mob/uniforms"
-#define FILE_DIR "GainStation13/icons/obj"
-#define FILE_DIR "GainStation13/icons/obj/clothing"
-#define FILE_DIR "GainStation13/icons/obj/lavaland_demone"
-#define FILE_DIR "GainStation13/icons/obj/spells"
-#define FILE_DIR "GainStation13/icons/obj/sugarland"
-#define FILE_DIR "GainStation13/icons/turf"
-#define FILE_DIR "GainStation13/sound"
-#define FILE_DIR "GainStation13/sound/voice"
-#define FILE_DIR "goon"
-#define FILE_DIR "goon/icons"
-#define FILE_DIR "goon/icons/obj"
-#define FILE_DIR "goon/sound"
-#define FILE_DIR "goon/sound/effects"
-#define FILE_DIR "goon/sound/machinery"
-#define FILE_DIR "html"
-#define FILE_DIR "hyperstation"
-#define FILE_DIR "hyperstation/icons"
-#define FILE_DIR "hyperstation/icons/chat"
-#define FILE_DIR "hyperstation/icons/decals"
-#define FILE_DIR "hyperstation/icons/effects"
-#define FILE_DIR "hyperstation/icons/mob"
-#define FILE_DIR "hyperstation/icons/mob/clothes"
-#define FILE_DIR "hyperstation/icons/mobs"
-#define FILE_DIR "hyperstation/icons/mobs/dancer"
-#define FILE_DIR "hyperstation/icons/obj"
-#define FILE_DIR "hyperstation/icons/obj/cargo"
-#define FILE_DIR "hyperstation/icons/obj/cargo/sweatshop"
-#define FILE_DIR "hyperstation/icons/obj/clothing"
-#define FILE_DIR "hyperstation/icons/obj/genitals"
-#define FILE_DIR "hyperstation/icons/obj/machinery"
-#define FILE_DIR "hyperstation/icons/obj/structures"
-#define FILE_DIR "hyperstation/sound"
-#define FILE_DIR "hyperstation/sound/ambience"
-#define FILE_DIR "hyperstation/sound/creatures"
-#define FILE_DIR "hyperstation/sound/creatures/mimic"
-#define FILE_DIR "hyperstation/sound/effects"
-#define FILE_DIR "hyperstation/sound/effects/rbmk"
-#define FILE_DIR "hyperstation/sound/effects/ship"
-#define FILE_DIR "hyperstation/sound/effects/ship/freespace2"
-#define FILE_DIR "hyperstation/sound/effects/ship/reactor"
-#define FILE_DIR "hyperstation/sound/halflife"
-#define FILE_DIR "hyperstation/sound/machines"
-#define FILE_DIR "hyperstation/sound/machines/sm"
-#define FILE_DIR "hyperstation/sound/machines/sm/accent"
-#define FILE_DIR "hyperstation/sound/machines/sm/accent/normal"
-#define FILE_DIR "hyperstation/sound/misc"
-#define FILE_DIR "icons"
-#define FILE_DIR "icons/ass"
-#define FILE_DIR "icons/effects"
-#define FILE_DIR "icons/mecha"
-#define FILE_DIR "icons/minimaps"
-#define FILE_DIR "icons/misc"
-#define FILE_DIR "icons/mob"
-#define FILE_DIR "icons/mob/actions"
-#define FILE_DIR "icons/mob/augmentation"
-#define FILE_DIR "icons/mob/inhands"
-#define FILE_DIR "icons/mob/inhands/antag"
-#define FILE_DIR "icons/mob/inhands/equipment"
-#define FILE_DIR "icons/mob/inhands/misc"
-#define FILE_DIR "icons/mob/inhands/weapons"
-#define FILE_DIR "icons/mob/jungle"
-#define FILE_DIR "icons/mob/large-worn-icons"
-#define FILE_DIR "icons/mob/large-worn-icons/64x64"
-#define FILE_DIR "icons/mob/lavaland"
-#define FILE_DIR "icons/obj"
-#define FILE_DIR "icons/obj/assemblies"
-#define FILE_DIR "icons/obj/atmospherics"
-#define FILE_DIR "icons/obj/atmospherics/components"
-#define FILE_DIR "icons/obj/atmospherics/pipes"
-#define FILE_DIR "icons/obj/clothing"
-#define FILE_DIR "icons/obj/doors"
-#define FILE_DIR "icons/obj/doors/airlocks"
-#define FILE_DIR "icons/obj/doors/airlocks/abductor"
-#define FILE_DIR "icons/obj/doors/airlocks/centcom"
-#define FILE_DIR "icons/obj/doors/airlocks/clockwork"
-#define FILE_DIR "icons/obj/doors/airlocks/cult"
-#define FILE_DIR "icons/obj/doors/airlocks/cult/runed"
-#define FILE_DIR "icons/obj/doors/airlocks/cult/unruned"
-#define FILE_DIR "icons/obj/doors/airlocks/external"
-#define FILE_DIR "icons/obj/doors/airlocks/glass_large"
-#define FILE_DIR "icons/obj/doors/airlocks/hatch"
-#define FILE_DIR "icons/obj/doors/airlocks/highsec"
-#define FILE_DIR "icons/obj/doors/airlocks/shuttle"
-#define FILE_DIR "icons/obj/doors/airlocks/station"
-#define FILE_DIR "icons/obj/doors/airlocks/station2"
-#define FILE_DIR "icons/obj/doors/airlocks/survival"
-#define FILE_DIR "icons/obj/doors/airlocks/vault"
-#define FILE_DIR "icons/obj/flora"
-#define FILE_DIR "icons/obj/food"
-#define FILE_DIR "icons/obj/guns"
-#define FILE_DIR "icons/obj/hydroponics"
-#define FILE_DIR "icons/obj/lavaland"
-#define FILE_DIR "icons/obj/machines"
-#define FILE_DIR "icons/obj/power_cond"
-#define FILE_DIR "icons/obj/smooth_structures"
-#define FILE_DIR "icons/obj/smooth_structures/alien"
-#define FILE_DIR "icons/obj/tesla_engine"
-#define FILE_DIR "icons/pda_icons"
-#define FILE_DIR "icons/program_icons"
-#define FILE_DIR "icons/rooms"
-#define FILE_DIR "icons/rooms/box"
-#define FILE_DIR "icons/stamp_icons"
-#define FILE_DIR "icons/Testing"
-#define FILE_DIR "icons/turf"
-#define FILE_DIR "icons/turf/floors"
-#define FILE_DIR "icons/turf/walls"
-#define FILE_DIR "icons/UI_Icons"
-#define FILE_DIR "icons/UI_Icons/chat"
-#define FILE_DIR "icons/UI_Icons/minesweeper_tiles"
-#define FILE_DIR "icons/UI_Icons/Pills"
-#define FILE_DIR "icons/vending_icons"
-#define FILE_DIR "modular_citadel"
-#define FILE_DIR "modular_citadel/code"
-#define FILE_DIR "modular_citadel/code/game"
-#define FILE_DIR "modular_citadel/code/game/area"
-#define FILE_DIR "modular_citadel/icons"
-#define FILE_DIR "modular_citadel/icons/effects"
-#define FILE_DIR "modular_citadel/icons/eutactic"
-#define FILE_DIR "modular_citadel/icons/eutactic/item"
-#define FILE_DIR "modular_citadel/icons/eutactic/mob"
-#define FILE_DIR "modular_citadel/icons/lavaknight"
-#define FILE_DIR "modular_citadel/icons/lavaknight/item"
-#define FILE_DIR "modular_citadel/icons/lavaknight/mob"
-#define FILE_DIR "modular_citadel/icons/misc"
-#define FILE_DIR "modular_citadel/icons/mob"
-#define FILE_DIR "modular_citadel/icons/mob/actions"
-#define FILE_DIR "modular_citadel/icons/mob/citadel"
-#define FILE_DIR "modular_citadel/icons/mob/citadel_refs"
-#define FILE_DIR "modular_citadel/icons/mob/clothing"
-#define FILE_DIR "modular_citadel/icons/mob/inhands"
-#define FILE_DIR "modular_citadel/icons/obj"
-#define FILE_DIR "modular_citadel/icons/obj/clothing"
-#define FILE_DIR "modular_citadel/icons/obj/food"
-#define FILE_DIR "modular_citadel/icons/obj/genitals"
-#define FILE_DIR "modular_citadel/icons/obj/guns"
-#define FILE_DIR "modular_citadel/icons/polyclothes"
-#define FILE_DIR "modular_citadel/icons/polyclothes/item"
-#define FILE_DIR "modular_citadel/icons/polyclothes/mob"
-#define FILE_DIR "modular_citadel/icons/ui"
-#define FILE_DIR "modular_citadel/sound"
-#define FILE_DIR "modular_citadel/sound/misc"
-#define FILE_DIR "modular_citadel/sound/voice"
-#define FILE_DIR "modular_citadel/sound/weapons"
-#define FILE_DIR "nsv13"
-#define FILE_DIR "nsv13/icons"
-#define FILE_DIR "nsv13/icons/obj"
-#define FILE_DIR "nsv13/sound"
-#define FILE_DIR "nsv13/sound/effects"
-#define FILE_DIR "nsv13/sound/effects/computer"
-#define FILE_DIR "sound"
-#define FILE_DIR "sound/AI"
-#define FILE_DIR "sound/alien"
-#define FILE_DIR "sound/alien/Effects"
-#define FILE_DIR "sound/alien/Voice"
-#define FILE_DIR "sound/ambience"
-#define FILE_DIR "sound/ambience/antag"
-#define FILE_DIR "sound/arcade"
-#define FILE_DIR "sound/bloodsucker"
-#define FILE_DIR "sound/chatter"
-#define FILE_DIR "sound/creatures"
-#define FILE_DIR "sound/effects"
-#define FILE_DIR "sound/effects/footstep"
-#define FILE_DIR "sound/FermiChem"
-#define FILE_DIR "sound/hallucinations"
-#define FILE_DIR "sound/health"
-#define FILE_DIR "sound/instruments"
-#define FILE_DIR "sound/instruments/accordion"
-#define FILE_DIR "sound/instruments/bikehorn"
-#define FILE_DIR "sound/instruments/eguitar"
-#define FILE_DIR "sound/instruments/glockenspiel"
-#define FILE_DIR "sound/instruments/guitar"
-#define FILE_DIR "sound/instruments/harmonica"
-#define FILE_DIR "sound/instruments/piano"
-#define FILE_DIR "sound/instruments/recorder"
-#define FILE_DIR "sound/instruments/saxophone"
-#define FILE_DIR "sound/instruments/trombone"
-#define FILE_DIR "sound/instruments/violin"
-#define FILE_DIR "sound/instruments/xylophone"
-#define FILE_DIR "sound/items"
-#define FILE_DIR "sound/items/equip"
-#define FILE_DIR "sound/items/geiger"
-#define FILE_DIR "sound/items/handling"
-#define FILE_DIR "sound/lavaland"
-#define FILE_DIR "sound/lewd"
-#define FILE_DIR "sound/machines"
-#define FILE_DIR "sound/machines/clockcult"
-#define FILE_DIR "sound/machines/fryer"
-#define FILE_DIR "sound/machines/generator"
-#define FILE_DIR "sound/machines/microwave"
-#define FILE_DIR "sound/machines/nuke"
-#define FILE_DIR "sound/machines/shower"
-#define FILE_DIR "sound/machines/sm"
-#define FILE_DIR "sound/magic"
-#define FILE_DIR "sound/magic/clockwork"
-#define FILE_DIR "sound/mecha"
-#define FILE_DIR "sound/misc"
-#define FILE_DIR "sound/music"
-#define FILE_DIR "sound/roundend"
-#define FILE_DIR "sound/spookoween"
-#define FILE_DIR "sound/vehicles"
-#define FILE_DIR "sound/voice"
-#define FILE_DIR "sound/voice/beepsky"
-#define FILE_DIR "sound/voice/catpeople"
-#define FILE_DIR "sound/voice/complionator"
-#define FILE_DIR "sound/voice/firebot"
-#define FILE_DIR "sound/voice/human"
-#define FILE_DIR "sound/voice/medbot"
-#define FILE_DIR "sound/voice/scream"
-#define FILE_DIR "sound/vore"
-#define FILE_DIR "sound/vore/pred"
-#define FILE_DIR "sound/vore/prey"
-#define FILE_DIR "sound/vox_fem"
-#define FILE_DIR "sound/weapons"
-#define FILE_DIR "sound/weapons/effects"
-#define FILE_DIR "sound/weather"
-#define FILE_DIR "sound/weather/ashstorm"
-#define FILE_DIR "sound/weather/ashstorm/inside"
-#define FILE_DIR "sound/weather/ashstorm/outside"
-#define FILE_DIR "sound/weather/oxygenrain"
-#define FILE_DIR "sound/weather/oxygenrain/inside"
-#define FILE_DIR "sound/weather/oxygenrain/outside"
-#define FILE_DIR "tools"
-#define FILE_DIR "tools/HumanScissors"
-#define FILE_DIR "tools/SS13SmoothingCutter"
-#define FILE_DIR "yogstation"
-#define FILE_DIR "yogstation/icons"
-#define FILE_DIR "yogstation/icons/obj"
-#define FILE_DIR "yogstation/icons/obj/clothing"
-#define FILE_DIR "yogstation/icons/turf"
-#define FILE_DIR "yogstation/sound"
-#define FILE_DIR "yogstation/sound/effects"
-#define FILE_DIR "yogstation/sound/misc"
-#define FILE_DIR "yogstation/sound/voice"
 // END_FILE_DIR
 
 // BEGIN_PREFERENCES
@@ -3331,9 +3084,12 @@
 #include "GainStation13\code\modules\food_and_drinks\drinks\drinks.dm"
 #include "GainStation13\code\modules\mob\living\emote.dm"
 #include "GainStation13\code\modules\reagents\chemistry\reagents\consumable_reagents.dm"
+#include "GainStation13\code\modules\reagents\chemistry\reagents\dwarverndrinks.dm"
 #include "GainStation13\code\modules\reagents\chemistry\recipes\fatchem.dm"
+#include "GainStation13\code\modules\reagents\chemistry\recipes\ROCKANDSTONEdrinks.dm"
 #include "GainStation13\code\modules\research\designs\nutri_designs.dm"
 #include "GainStation13\code\modules\vending\gatocola.dm"
+#include "GainStation13\code\modules\vending\GBBurrito.dm"
 #include "GainStation13\code\modules\vending\mealdor.dm"
 #include "GainStation13\code\obj\items\minor_items.dm"
 #include "GainStation13\code\obj\structure\scale.dm"