Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

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

@@ -450,5 +450,5 @@ datum/gear/darksabresheath
 /datum/gear/donorgoggles
 	name = "Flight Goggles"
 	category = SLOT_HEAD
-	path = /obj/item/clothing/glasses/flight
+	path = /obj/item/clothing/head/flight
 	ckeywhitelist = list("maxlynchy")

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

@@ -1,3 +1,8 @@
+/datum/gear/blindfold
+	name = "Blindfold"
+	category = SLOT_GLASSES
+	path = /obj/item/clothing/glasses/sunglasses/blindfold
+
 /datum/gear/cold
 	name = "Cold goggles"
 	category = SLOT_GLASSES

modular_citadel/code/modules/custom_loadout/custom_items.dm

@@ -494,11 +494,10 @@
 	icon = 'icons/obj/custom.dmi'
 	alternate_worn_icon = 'icons/mob/custom_w.dmi'
 
-/obj/item/clothing/glasses/flight
+/obj/item/clothing/head/flight
 	name = "flight goggles"
 	desc = "Old style flight goggles with a leather cap attached."
 	icon_state = "flight-g"
 	item_state = "flight-g"
 	icon = 'icons/obj/custom.dmi'
 	alternate_worn_icon = 'icons/mob/custom_w.dmi'
-	actions_types = list(/datum/action/item_action/toggle)

modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm

@@ -68,11 +68,10 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 			startHunger = M.nutrition
 			if(pollStarted == FALSE)
 				pollStarted = TRUE
-				candies = pollGhostCandidates("Do you want to play as a clone of [M], and do you agree to respect their character and act in a similar manner to them? Do not engage in ERP as them unless you have LOOC permission from them, and ensure it is permission from the original, not a clone.")
+				candies = pollGhostCandidates("Do you want and agree to play as a clone of [M], respect their character and not engage in ERP without permission from the original?", ignore_category = POLL_IGNORE_CLONE)
 				log_game("FERMICHEM: [M] ckey: [M.key] has taken SDGF, and ghosts have been polled.")
 		if(20 to INFINITY)
 			if(LAZYLEN(candies) && playerClone == FALSE) //If there's candidates, clone the person and put them in there!
-				log_game("FERMICHEM: [M] ckey: [M.key] is creating a clone, controlled by [candies]")
 				to_chat(M, "<span class='warning'>The cells reach a critical micelle concentration, nucleating rapidly within your body!</span>")
 				var/typepath = M.type
 				var/mob/living/carbon/human/fermi_Gclone = new typepath(M.loc)
@@ -91,7 +90,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 						log_game("FERMICHEM: [M] ckey: [M.key] is creating a clone, controlled by [C2]")
 						break
 					else
-						candies =- C2
+						candies -= C2
 				if(!SM.mind) //Something went wrong, use alt mechanics
 					return ..()
 				SM.mind.enslave_mind_to_creator(M)

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

@@ -28,7 +28,7 @@
 	return
 
 //Called when temperature is above a certain threshold, or if purity is too low.
-/datum/chemical_reaction/proc/FermiExplode(datum/reagents, var/atom/my_atom, volume, temp, pH, Exploding = FALSE)
+/datum/chemical_reaction/proc/FermiExplode(datum/reagents/R0, var/atom/my_atom, volume, temp, pH, Exploding = FALSE)
 	if (Exploding == TRUE)
 		return
 
@@ -76,7 +76,7 @@
 	var/datum/effect_system/smoke_spread/chem/s = new()
 	R.my_atom = my_atom //Give the gas a fingerprint
 
-	for (var/datum/reagent/reagent in my_atom.reagents.reagent_list) //make gas for reagents, has to be done this way, otherwise it never stops Exploding
+	for (var/datum/reagent/reagent in R0.reagent_list) //make gas for reagents, has to be done this way, otherwise it never stops Exploding
 		R.add_reagent(reagent.id, reagent.volume/3) //Seems fine? I think I fixed the infinite explosion bug.
 
 		if (reagent.purity < 0.6)