TGS Test Merge (#65)

code/modules/mob/living/carbon/human/voicepacks/genfemale.dm

@@ -87,6 +87,8 @@
 				used = 'sound/vo/attn.ogg'
 			if("psst")
 				used = 'sound/vo/psst.ogg'
+			if("lewdmoan")
+				used = list('sound/vo/female/gen/se/sex (5).ogg','sound/vo/female/gen/se/sex (3).ogg')
 			if("sexmoanlight")
 				used = list('sound/vo/female/gen/se/sexlight (1).ogg','sound/vo/female/gen/se/sexlight (2).ogg','sound/vo/female/gen/se/sexlight (3).ogg','sound/vo/female/gen/se/sexlight (4).ogg','sound/vo/female/gen/se/sexlight (5).ogg','sound/vo/female/gen/se/sexlight (6).ogg','sound/vo/female/gen/se/sexlight (7).ogg')
 			if("sexmoanhvy")

code/modules/mob/living/carbon/human/voicepacks/genmale.dm

@@ -70,6 +70,8 @@
 				used = list('sound/vo/male/gen/paincrit (1).ogg','sound/vo/male/gen/paincrit (2).ogg')
 			if("painmoan")
 				used = list('sound/vo/male/gen/painmoan (1).ogg','sound/vo/male/gen/painmoan (2).ogg','sound/vo/male/gen/painmoan (3).ogg','sound/vo/male/gen/painmoan (4).ogg','sound/vo/male/gen/painmoan (5).ogg')
+			if("lewdmoan")
+				used = 'sound/vo/male/gen/groan (1).ogg'
 			if("painscream")
 				used = list('sound/vo/male/gen/painscream (1).ogg','sound/vo/male/gen/painscream (2).ogg','sound/vo/male/gen/painscream (3).ogg')
 			if("rage")

code/modules/mob/living/emote.dm

@@ -1038,6 +1038,20 @@
 
 	emote("huh", intentional = TRUE)
 
+/datum/emote/living/lewdmoan
+	key = "lewdmoan"
+	key_third_person = "moans lewdly"
+	message = "moans lewdly"
+	message_muffled = "makes a muffled noise."
+	emote_type = EMOTE_AUDIBLE
+	show_runechat = FALSE
+
+/mob/living/carbon/human/verb/emote_lewdmoan()
+	set name = "Moan Lewdly"
+	set category = "Noises"
+
+	emote("lewdmoan", intentional = TRUE)
+
 /datum/emote/living/hum
 	key = "hum"
 	key_third_person = "hums"