Merge branch 'KabKebab:master' into random_junk

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)

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

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)
 

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")

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

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"

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

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,