Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into customskirt

modular_citadel/code/modules/client/loadout/__donator.dm

@@ -515,4 +515,10 @@
 	name = "custom atmos skirt"
 	slot = SLOT_IN_BACKPACK
 	path = /obj/item/clothing/suit/customskirt
-	ckeywhitelist = list("thakyz")
+	ckeywhitelist = list("thakyz")
+
+/datum/gear/donator/hisakaki
+	name = "halo"
+	slot = SLOT_HEAD
+	path = 	/obj/item/clothing/head/halo
+	ckeywhitelist = list("hisakaki")

modular_citadel/code/modules/custom_loadout/custom_items.dm

@@ -559,3 +559,12 @@
 	icon = 'icons/obj/custom.dmi'
 	mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi'
 	mutantrace_variation = NONE
+
+/obj/item/clothing/head/halo
+	name = "transdimensional halo"
+	desc = "An oddly shaped halo that magically hovers above the head."
+	icon_state = "halo"
+	item_state = "halo"
+	icon = 'icons/mob/clothing/custom_w.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi'
+	mutantrace_variation = NONE

modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm

@@ -501,7 +501,10 @@
 	PurityMin		= 0.6
 
 /datum/chemical_reaction/fermi/plushmium/FermiExplode(datum/reagents, var/atom/my_atom, volume, temp, pH)
-	new /obj/item/toy/plush/random(get_turf(my_atom))
+	if(volume < 20) //It creates a normal plush at low volume.. at higher amounts, things get slightly more interesting.
+		new /obj/item/toy/plush/random(get_turf(my_atom))
+	else
+		new /obj/item/toy/plush/plushling(get_turf(my_atom))
 	my_atom.visible_message("<span class='warning'>The reaction suddenly zaps, creating a plushie!</b></span>")
 	my_atom.reagents.clear_reagents()