Merge branch 'dev' into ofChemistryAndStuff

Conflicts:
	code/modules/reagents/Chemistry-Recipes.dm

code/game/objects/items/weapons/candle.dm

@@ -1,6 +1,6 @@
 /obj/item/weapon/flame/candle
 	name = "red candle"
-	desc = "a candle"
+	desc = "a small pillar candle. Its specially-formulated fuel-oxidizer wax mixture allows continued combustion in airless environments."
 	icon = 'icons/obj/candle.dmi'
 	icon_state = "candle1"
 	item_state = "candle1"
@@ -8,6 +8,10 @@
 
 	var/wax = 2000
 
+/obj/item/weapon/flame/candle/New()
+	wax = rand(800, 1000) // Enough for 27-33 minutes. 30 minutes on average.
+	..()
+
 /obj/item/weapon/flame/candle/update_icon()
 	var/i
 	if(wax > 1500)
@@ -80,4 +84,4 @@
 /obj/item/weapon/flame/candle/dropped(mob/user)
 	if(lit)
 		user.SetLuminosity(user.luminosity - CANDLE_LUM)
-		SetLuminosity(CANDLE_LUM)
+		SetLuminosity(CANDLE_LUM)

code/game/objects/items/weapons/storage/firstaid.dm

@@ -131,6 +131,7 @@
 /obj/item/weapon/storage/firstaid/surgery
 	name = "surgery kit"
 	desc = "Contains tools for surgery."
+	storage_slots = 10
 
 /obj/item/weapon/storage/firstaid/surgery/New()
 	..()
@@ -142,6 +143,9 @@
 	new /obj/item/weapon/retractor(src)
 	new /obj/item/weapon/scalpel(src)
 	new /obj/item/weapon/surgicaldrill(src)
+	new /obj/item/weapon/bonegel(src)
+	new /obj/item/weapon/FixOVein(src)
+	new /obj/item/stack/medical/advanced/bruise_pack(src)
 	return
 
 /*