Merge branch 'master' into upstream-merge-37476

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

modular_citadel/code/datums/traits/neutral.dm

@@ -1,24 +1,24 @@
 // Citadel-specific Neutral Traits
 
-/datum/trait/libido
+/datum/quirk/libido
 	name = "Nymphomania"
 	desc = "You're always feeling a bit in heat. Also, you get aroused faster than usual."
 	value = 0
 	gain_text = "<span class='notice'>You are feeling extra wild.</span>"
 	lose_text = "<span class='notice'>You don't feel that burning sensation anymore.</span>"
 
-/datum/trait/libido/add()
-	var/mob/living/M = trait_holder
+/datum/quirk/libido/add()
+	var/mob/living/M = quirk_holder
 	M.min_arousal = 16
 	M.arousal_rate = 3
 
-/datum/trait/libido/remove()
-	var/mob/living/M = trait_holder
+/datum/quirk/libido/remove()
+	var/mob/living/M = quirk_holder
 	M.min_arousal = initial(M.min_arousal)
 	M.arousal_rate = initial(M.arousal_rate)
 
-/datum/trait/libido/on_process()
-	var/mob/living/M = trait_holder
+/datum/quirk/libido/on_process()
+	var/mob/living/M = quirk_holder
 	if(M.canbearoused == FALSE)
-		to_chat(trait_holder, "<span class='notice'>Having high libido is useless when you can't feel arousal at all!</span>")
+		to_chat(quirk_holder, "<span class='notice'>Having high libido is useless when you can't feel arousal at all!</span>")
 		qdel(src)

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

@@ -278,3 +278,9 @@ datum/gear/darksabresheath
 	path = 	/obj/item/ssword_kit
 	ckeywhitelist = list("phillip458")
 
+/datum/gear/techcoat
+	name = "Techomancers Labcoat"
+	category = slot_in_backpack
+	path = /obj/item/clothing/suit/toggle/labcoat/mad/techcoat
+	ckeywhitelist = list("wilchen")
+

modular_citadel/code/modules/custom_loadout/custom_items.dm

@@ -343,3 +343,11 @@
 	desc = "A piece of paper folded into neat little hat."
 	icon_state = "paperhat"
 	item_state = "paperhat"
+
+/obj/item/clothing/suit/toggle/labcoat/mad/techcoat
+	name = "Techomancers Labcoat"
+	desc = "An oddly special looking coat."
+	icon = 'icons/obj/custom.dmi'
+	icon_state = "rdcoat"
+	icon_override = 'icons/mob/custom_w.dmi'
+	item_state = "rdcoat"