Merge branch 'master' into one_last_taser_attempt

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

@@ -305,7 +305,7 @@ datum/gear/darksabresheath
 /datum/gear/flagcape
 	name = "US Flag Cape"
 	category = SLOT_IN_BACKPACK
-	path = /obj/item/bedsheet/custom/flagcape
+	path = /obj/item/clothing/neck/flagcape
 	ckeywhitelist = list("darnchacha")
 
 /datum/gear/luckyjack
@@ -488,3 +488,9 @@ datum/gear/darksabresheath
 	category = SLOT_SHOES
 	path = /obj/item/clothing/shoes/sneakers/mikuleggings
 	ckeywhitelist = list("grandvegeta")
+
+/datum/gear/cosmos
+	name = "cosmic space bedsheet"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/bedsheet/cosmos
+	ckeywhitelist = list("grunnyyy")

modular_citadel/code/modules/custom_loadout/custom_items.dm

@@ -364,10 +364,11 @@
 	worn_x_dimension = 64
 	worn_y_dimension = 34
 
-/obj/item/bedsheet/custom/flagcape
+/obj/item/clothing/neck/flagcape
 	name = "Flag Cape"
 	desc = "A truly patriotic form of heroic attire."
 	icon = 'icons/obj/custom.dmi'
+	resistance_flags = FLAMMABLE
 	alternate_worn_icon = 'icons/mob/custom_w.dmi'
 	icon_state = "flagcape"
 	item_state = "flagcape"

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

@@ -333,6 +333,8 @@ Creating a chem with a low purity will make you permanently fall in love with so
 	..()
 
 /datum/reagent/fermi/proc/FallInLove(mob/living/carbon/Lover, mob/living/carbon/Love)
+	if(Lover.client?.prefs.cit_toggles & NEVER_HYPNO)
+		return // doesn't even give a message, it's just ignored
 	if(Lover.has_status_effect(STATUS_EFFECT_INLOVE))
 		to_chat(Lover, "<span class='warning'>You are already fully devoted to someone else!</span>")
 		return