Merge pull request #87 from ARF-SS13/DameonOwen-patch-1

Update emote.dm

code/modules/mob/living/emote.dm

@@ -178,14 +178,14 @@
 		L.SetSleeping(20)
 */
 
-/* Fortuna edit: flapping your wings disabled
 /datum/emote/living/flap
 	key = "flap"
 	key_third_person = "flaps"
 	message = "flaps their wings."
 	restraint_check = TRUE
 	var/wing_time = 20
 
+/*
 /datum/emote/living/flap/run_emote(mob/user, params)
 	. = ..()
 	if(. && ishuman(user))
@@ -198,14 +198,14 @@
 			else
 				H.OpenWings()
 			addtimer(CALLBACK(H, TYPE_PROC_REF(open ? /mob/living/carbon/human/atom/.proc/OpenWings : /mob/living/carbon/human/atom/,CloseWings)), wing_time)
+*/
 
 /datum/emote/living/flap/aflap
 	key = "aflap"
 	key_third_person = "aflaps"
 	message = "flaps their wings ANGRILY!"
 	restraint_check = TRUE
 	wing_time = 10
-*/
 
 /datum/emote/living/fchuckle
 	key = "fchuckle"
@@ -345,7 +345,7 @@
 	message = "grimaces."
 	message_param = "grimaces at %t."
 
-/*
+
 /datum/emote/living/kiss
 	key = "kiss"
 	key_third_person = "kisses"
@@ -362,7 +362,6 @@
 	if(. && iscarbon(user))
 		var/mob/living/carbon/C = user
 		return !C.silent && (!C.mind || !C.mind.miming)
-*/
 
 /datum/emote/living/audible/laugh
 	key = "laugh"
@@ -740,15 +739,13 @@
 
 	to_chat(user, message)
 
-/* Fortuna edit: beep disabled
 /datum/emote/beep
 	key = "beep"
 	key_third_person = "beeps"
 	message = "beeps."
 	message_param = "beeps at %t."
 	sound = 'sound/machines/twobeep.ogg'
 	mob_type_allowed_typecache = list(/mob/living/brain, /mob/living/silicon, /mob/living/carbon/human)
-*/
 
 /datum/emote/living/slap
 	key = "slap"
@@ -1118,7 +1115,6 @@
 		if(. && isliving(user)) //Are they alive?  The stuff below is the sounds being listed, with percent (the 20s) and then number of times played (1)
 			pick(playsound(C, 'sound/f13effects/sunsetsounds/wah1.ogg', 33, 1),playsound(C, 'sound/f13effects/sunsetsounds/wah2.ogg', 33, 1),playsound(C, 'sound/f13effects/sunsetsounds/wah3.ogg', 34, 1),)
 
-/*
 /datum/emote/living/boowomp
 	key = "boowomp"
 	key_third_person = "frowns heavily."
@@ -1158,7 +1154,6 @@
 	key_third_person = "raises an eyebrow menacingly!"
 	message = "raises an eyebrow menacingly!"
 	sound = 'sound/f13effects/sunsetsounds/vineboom.ogg'
-*/
 
 /datum/emote/living/frogcry
 	key = "frogcry"
@@ -1455,7 +1450,6 @@
 	message = "tilts their head."
 	message_param = "tilts their head at %t."
 
-/*
 /datum/emote/living/rizz
 	key = "rizz"
 	key_third_person = "rizzler"
@@ -1483,7 +1477,6 @@
 	message = "<span class='urgent'>draws attention to themselves!</span>"
 	message_param = "<span class='urgent'>%t</span>" //Funny block text
 	sound = "modular_splurt/sound/voice/alienbeeper.ogg"
-*/
 
 //Slime start
 
@@ -1512,7 +1505,6 @@
 			S.slime_mood = slime_mood
 			S.handle_body(H)
 
-/*
 /datum/emote/mood/sneaky
 	key = "slimesneaky"
 	slime_mood = "aslime-mischevous"
@@ -1538,4 +1530,3 @@
 	slime_mood = "aslime-angry"
 
 // Slime end
-*/