Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit

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

conflicts resolution

code/datums/spells/santa.dm

@@ -0,0 +1,15 @@
+//Santa spells!
+/obj/effect/proc_holder/spell/aoe_turf/conjure/presents
+	name = "Conjure Presents!"
+	desc = "This spell lets you reach into S-space and retrieve presents! Yay!"
+	school = "santa"
+	charge_max = 600
+	clothes_req = 0
+	invocation = "HO HO HO"
+	invocation_type = "shout"
+	range = 3
+	cooldown_min = 50
+
+	summon_type = list("/obj/item/weapon/a_gift")
+	summon_lifespan = 0
+	summon_amt = 5