Merge branch 'master' of git://github.com/Abi79/tgstation13-git

Conflicts:
	baystation12.dme
	code/defines/mob/mob.dm
	code/defines/obj/vending.dm
	code/game/atom_procs.dm
	code/game/dna.dm
	code/game/machinery/computer/aifixer.dm
	code/game/vote.dm
	code/modules/chemical/Chemistry-Machinery.dm
	code/modules/chemical/Chemistry-Reagents.dm
	code/modules/mob/living/carbon/metroid/life.dm
	html/changelog.html
	icons/obj/stationobjs.dmi
	interface/skin.dmf
	maps/tgstation.2.0.8.dmm

code/datums/diseases/jungle_fever.dm

@@ -6,7 +6,7 @@
 	spread_type = SPECIAL
 	affected_species = list("Monkey", "Human")
 	curable = 0
-	desc = "Monkies with this disease will bite humans, causing humans to spontaneously mutate into a monkey."
+	desc = "monkeys with this disease will bite humans, causing humans to spontaneously mutate into a monkey."
 	severity = "Medium"
 	//stage_prob = 100
 	agent = "Kongey Vibrion M-909"

code/datums/spells/wizard.dm

@@ -147,6 +147,20 @@
 
 	summon_type = list("/obj/effect/critter/spesscarp/elite")
 
+/obj/effect/proc_holder/spell/aoe_turf/conjure/creature
+	name = "Summon Creature Swarm"
+	desc = "This spell tears the fabric of reality, allowing horrific daemons to spill forth"
+
+	school = "conjuration"
+	charge_max = 1200
+	clothes_req = 0
+	invocation = "IA IA"
+	invocation_type = "shout"
+	summon_amt = 10
+	range = 3
+
+	summon_type = list("/obj/effect/critter/creature")
+
 /obj/effect/proc_holder/spell/targeted/trigger/blind
 	name = "Blind"
 	desc = "This spell temporarily blinds a single person and does not require wizard garb."