Merge remote-tracking branch 'origin/master' into TGUI_Updoot

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

@@ -510,3 +510,9 @@
 	slot = SLOT_IN_BACKPACK
 	path = /obj/item/bedsheet/cosmos
 	ckeywhitelist = list("grunnyyy")
+
+/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

@@ -550,3 +550,11 @@
 	desc = "A fancy cloak embroidered with polychromatic thread in a pattern that reminds one of the wielders of unlimited power."
 	icon_state = "polyce"
 	poly_colors = list("#808080", "#8CC6FF", "#FF3535")
+
+/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/obj/custom.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi'

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

@@ -253,6 +253,7 @@
 		holder.remove_reagent(type, cached_volume)
 		holder.add_reagent(/datum/reagent/fermi/PEsmaller, cached_volume)
 
+/*
 /datum/chemical_reaction/fermi/astral
 	name = "Astrogen"
 	id = /datum/reagent/fermi/astral
@@ -274,7 +275,7 @@
 	FermiChem				= TRUE
 	FermiExplode 			= TRUE
 	PurityMin 				= 0.25
-
+*/
 
 /datum/chemical_reaction/fermi/enthrall //check this
 	name = "MKUltra"
@@ -500,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()