Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit841

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

@@ -522,3 +522,10 @@
 	slot = SLOT_HEAD
 	path = 	/obj/item/clothing/head/halo
 	ckeywhitelist = list("hisakaki")
+
+/datum/gear/donator/vest
+	name = "vest and shirt"
+	slot = SLOT_W_UNIFORM
+	path = /obj/item/clothing/under/custom/vest
+	ckeywhitelist = list("maylowfox")
+

modular_citadel/code/modules/custom_loadout/custom_items.dm

@@ -567,4 +567,13 @@
 	icon = 'icons/mob/clothing/custom_w.dmi'
 	mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi'
 	dynamic_hair_suffix = ""
-	
+
+/obj/item/clothing/under/custom/vest
+	name = "vest"
+	desc = "A vest with a shirt underlining it."
+	icon_state = "vest"
+	item_state = "vest"
+	icon = 'icons/obj/custom.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi'
+	mutantrace_variation = STYLE_DIGITIGRADE
+

modular_citadel/code/modules/mob/cit_emotes.dm

@@ -132,6 +132,54 @@
 	user.nextsoundemote = world.time + 7
 	playsound(user, 'modular_citadel/sound/voice/awoo.ogg', 50, 1, -1)
 
+/datum/emote/living/hiss
+	key = "hiss"
+	key_third_person = "hisses"
+	message = "hisses!"
+	emote_type = EMOTE_AUDIBLE
+	muzzle_ignore = FALSE
+	restraint_check = FALSE
+
+/datum/emote/living/hiss/run_emote(mob/living/user, params)
+	if(!(. = ..()))
+		return
+	if(user.nextsoundemote >= world.time)
+		return
+	user.nextsoundemote = world.time + 7
+	playsound(user, 'modular_citadel/sound/voice/hiss.ogg', 50, 1, -1)
+
+/datum/emote/living/meow
+	key = "meow"
+	key_third_person = "mrowls"
+	message = "mrowls!"
+	emote_type = EMOTE_AUDIBLE
+	muzzle_ignore = FALSE
+	restraint_check = FALSE
+
+/datum/emote/living/meow/run_emote(mob/living/user, params)
+	if(!(. = ..()))
+		return
+	if(user.nextsoundemote >= world.time)
+		return
+	user.nextsoundemote = world.time + 7
+	playsound(user, 'modular_citadel/sound/voice/meow1.ogg', 50, 1, -1)
+
+/datum/emote/living/purr
+	key = "purr"
+	key_third_person = "purrs softly"
+	message = "purrs softly."
+	emote_type = EMOTE_AUDIBLE
+	muzzle_ignore = FALSE
+	restraint_check = FALSE
+
+/datum/emote/living/purr/run_emote(mob/living/user, params)
+	if(!(. = ..()))
+		return
+	if(user.nextsoundemote >= world.time)
+		return
+	user.nextsoundemote = world.time + 7
+	playsound(user, 'modular_citadel/sound/voice/purr.ogg', 50, 1, -1)
+
 /datum/emote/living/nya
 	key = "nya"
 	key_third_person = "lets out a nya"