Merge branch 'master' into bark-box

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

@@ -549,3 +549,8 @@
 	path = /obj/item/clothing/mask/breath/mmask
 	ckeywhitelist = list("sneka")
 
+/datum/gear/donator/smaiden
+	name = "Shrine Maiden"
+	slot = SLOT_WEAR_SUIT
+	path = /obj/item/clothing/suit/smaiden
+	ckeywhitelist = list("ultimarifox")

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

@@ -199,6 +199,10 @@
 	name = "Tactitool Turtleneck"
 	path = /obj/item/clothing/under/syndicate/cosmetic
 
+/datum/gear/uniform/skirtleneck
+	name = "Tactitool Skirtleneck"
+	path = /obj/item/clothing/under/syndicate/cosmetic/skirt
+
 /datum/gear/uniform/sweater
 	name = "Cream Commando Sweater"
 	path = /obj/item/clothing/under/sweater

modular_citadel/code/modules/custom_loadout/custom_items.dm

@@ -601,3 +601,12 @@
 	item_state = "mmask"
 	mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi'
 	icon_state = "mmask"
+
+/obj/item/clothing/suit/smaiden
+	name = "shrine maiden"
+	desc = "Seems questionably tight for religious purposes."
+	icon_state = "smaiden"
+	item_state = "smaiden"
+	icon = 'icons/obj/custom.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi'
+	mutantrace_variation = NONE

modular_citadel/code/modules/mob/cit_emotes.dm

@@ -321,3 +321,16 @@
 	else
 		sound = pick('modular_citadel/sound/voice/human_female_pain_1.ogg', 'modular_citadel/sound/voice/human_female_pain_2.ogg', 'modular_citadel/sound/voice/human_female_pain_3.ogg', 'modular_citadel/sound/voice/human_female_scream_2.ogg', 'modular_citadel/sound/voice/human_female_scream_3.ogg', 'modular_citadel/sound/voice/human_female_scream_4.ogg')
 	playsound(user, sound, 50, 0, 0)
+
+/datum/emote/living/clap1
+	key = "clap1"
+	key_third_person = "claps"
+	message = "claps their hands together."
+	emote_type = EMOTE_AUDIBLE
+	muzzle_ignore = TRUE
+	restraint_check = TRUE
+
+/datum/emote/living/clap1/run_emote(mob/living/user, params)
+	if(!(. = ..()))
+		return
+	playsound(user, 'modular_citadel/sound/voice/clap.ogg', 50, 1, -1)