diff --git a/code/datums/Emote_system/emote.dm b/code/datums/Emote_system/emote.dm
index ee06d9f78ab..8e63808be4d 100644
--- a/code/datums/Emote_system/emote.dm
+++ b/code/datums/Emote_system/emote.dm
@@ -13,7 +13,7 @@ VampyrBytes
 /datum/emote
 	var/name = ""
 	var/desc = ""
-	var/list/commands[0]  // commands that trigger the emote. Set these in New()
+	var/list/commands[0]  // list of commands that trigger the emote.
 	var/text = ""
 	var/selfText = ""		// the version of text that you should see - eg, if text is screams, you want scream here, as You screams is bad grammer
 	var/startText = ""		// if you need to put something in before [user]
diff --git a/code/datums/Emote_system/emotes.dm b/code/datums/Emote_system/emotes.dm
index dc36df288a7..18ccbebe39f 100644
--- a/code/datums/Emote_system/emotes.dm
+++ b/code/datums/Emote_system/emotes.dm
@@ -1,21 +1,11 @@
-/************************************************************************************
-									Emotes
-New() must call ..() to set the baseLevel for the emoteHandler search. As the commands
-are set in New(), this means that the emote will pick up all the commands from the emotes
-above it. If you don't want this, make the call to ..() then use commands = new /list()
-*************************************************************************************/
-
 /datum/emote/airguitar
 	name = "airguitar"
 	desc = "Makes the mob play an air guitar"
+	commands = list("airguitar")
 	text = "is strumming the air and headbanging like a safari chimp."
 	selfText = "are strumming the air and headbanging like a safari chimp."
 	restrained = 1
 
-/datum/emote/airguitar/New()
-	..()
-	commands += "airguitar"
-
 /datum/emote/airguitar/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -25,14 +15,11 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/alarm
 	name = "alarm"
 	desc = "makes the mob sound an alarm"
+	commands = list("alarm")
 	text = "sounds an alarm"
 	selfText = "sound an alarm"
 	audible = 1
 
-/datum/emote/alarm/New()
-	..()
-	commands += "alarm"
-
 /datum/emote/alarm/available(var/mob/user)
 	if(isbrain(user))
 		return 1
@@ -43,14 +30,11 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/alert
 	name = "alert"
 	desc = "Makes the mob sound an alert"
+	commands = list("alert")
 	text = "lets out a distressed noise"
 	selfText = "let out a distressed noise"
 	audible = 1
 
-/datum/emote/alert/New()
-	..()
-	commands += "alert"
-
 /datum/emote/alert/available(var/mob/user)
 	if(isbrain(user))
 		return 1
@@ -58,15 +42,11 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/beep
 	name = "beep"
 	desc = "makes the mob let out a beep"
+	commands = list("beep")
 	text = "beeps"
 	selfText = "beep"
 	audible = 1
 
-/datum/emote/beep/New()
-	..()
-	commands += "beep"
-	commands += "beeps"
-
 /datum/emote/beep/available(var/mob/user)
 	if(isbrain(user))
 		return 1
@@ -84,14 +64,10 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/blink
 	name = "blink"
 	desc = "Makes the mob blink"
+	commands = list("blink", "blinks")
 	text = "blinks"
 	selfText = "blink"
 
-/datum/emote/blink/New()
-	..()
-	commands += "blink"
-	commands += "blinks"
-
 /datum/emote/blink/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -101,14 +77,9 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/blink/rapid
 	name = "rapid blink"
 	desc = "Makes the mob blink rapidly"
+	commands = list("blink_r", "blinks_r")
 	allowParent = 1
 
-/datum/emote/blink/rapid/New()
-	..()
-	commands = new /list()
-	commands += "blink_r"
-	commands += "blinks_r"
-
 /datum/emote/blink/rapid/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -121,14 +92,10 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/blush
 	name = "blush"
 	desc = "Makes the mob blush"
+	commands = list("blush", "blushes")
 	text = "blushes"
 	selfText = "blush"
 
-/datum/emote/blush/New()
-	..()
-	commands += "blush"
-	commands += "blushes"
-
 /datum/emote/blush/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -136,14 +103,10 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/boop
 	name = "boop"
 	desc = "Makes the mob boop"
+	commands = list("boop", "boops")
 	text = "boops"
 	selfText = "boop"
 
-/datum/emote/boop/New()
-	..()
-	commands += "boop"
-	commands += "boops"
-
 /datum/emote/boop/available(var/mob/user)
 	if(isbrain(user))
 		return 1
@@ -151,14 +114,10 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/bounce
 	name = "bounce"
 	desc = "Makes the mob bounce"
+	commands = list("bounce", "bounces")
 	text = "bounces in place"
 	selfText = "bounce in place"
 
-/datum/emote/bounce/New()
-	..()
-	commands += "bounce"
-	commands += "bounces"
-
 /datum/emote/bounce/available(var/mob/user)
 	if(isslime(user))
 		return 1
@@ -166,17 +125,13 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/bow
 	name = "bow"
 	desc = "Makes the mob bow"
+	commands = list("bow", "bows")
 	text = "bows"
 	selfText = "bow"
 	canTarget = 1
 	targetMob = 1
 	targetText = "to"
 
-/datum/emote/bow/New()
-	..()
-	commands += "bow"
-	commands += "bows"
-
 /datum/emote/bow/available(var/mob/user)
 	if(isrobot(user))
 		return 1
@@ -191,6 +146,7 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/burp
 	name = "burp"
 	desc = "Makes the mob burp"
+	commands = list("burp", "burps")
 	text = "burps"
 	selfText = "burp"
 	audible = 1
@@ -199,11 +155,6 @@ above it. If you don't want this, make the call to ..() then use commands = new
 	muzzleAffected = 1
 	muzzledNoise = "peculiar"
 
-/datum/emote/burp/New()
-	..()
-	commands += "burp"
-	commands += "burps"
-
 /datum/emote/burp/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -213,6 +164,7 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/buzz
 	name = "buzz"
 	desc = "Makes the mob buzz"
+	commands = list("buzz", "buzzes", "buzzs")
 	text = "buzzes"
 	selfText = "buzz"
 	audible = 1
@@ -220,12 +172,6 @@ above it. If you don't want this, make the call to ..() then use commands = new
 	canTarget = 1
 	targetMob = 1
 
-/datum/emote/buzz/New()
-	..()
-	commands += "buzz"
-	commands += "buzzes"
-	commands += "buzzs"
-
 /datum/emote/buzz/available(var/mob/user)
 	if(user.is_mechanical())
 		return 1
@@ -233,19 +179,16 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/buzz/buzz2
 	name = "buzz 2"
 	desc = "makes the mob buzz in an irritated way"
+	commands = list("buzz2")
 	text = "makes an irritated buzzing sound"
 	selfText = "make an irritated buzzing sound"
 	sound = "sound/machines/buzz-two.ogg"
 	allowParent = 1
 
-/datum/emote/buzz/buzz2/New()
-	..()
-	commands = new /list()
-	commands += "buzz2"
-
 /datum/emote/chirp
 	name = "chirp"
 	desc = "Makes the mob chirp"
+	commands = list("chirp", "chirps")
 	text = "chirps"
 	selfText = "chirp"
 	audible = 1
@@ -253,24 +196,14 @@ above it. If you don't want this, make the call to ..() then use commands = new
 	vol = 40
 	cooldown = 50
 
-/datum/emote/chirp/New()
-	..()
-	commands += "chirp"
-	commands += "chirps"
-
 /datum/emote/chirp/available(var/mob/user)
 	if(istype(user, /mob/living/simple_animal/diona))
 		return 1
 
-/datum/emote/chirp/playSound(var/mob/user)
-	if (!sound)
-		return
-	playsound(user, sound, vol, 1, 1)
-	return 1
-
 /datum/emote/choke
 	name = "choke"
 	desc = "Makes the mob choke"
+	commands = list("choke", "chokes")
 	text = "chokes"
 	selfText = "choke"
 	audible = 1
@@ -279,11 +212,6 @@ above it. If you don't want this, make the call to ..() then use commands = new
 	muzzleAffected = 1
 	muzzledNoise = "strong"
 
-/datum/emote/choke/New()
-	..()
-	commands += "choke"
-	commands += "chokes"
-
 /datum/emote/choke/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -299,6 +227,7 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/chuckle
 	name = "chuckle"
 	desc = "chuckle"
+	commands = list("chuckle", "chuckles")
 	text = "chuckles"
 	selfText = "chuckle"
 	audible = 1
@@ -306,11 +235,6 @@ above it. If you don't want this, make the call to ..() then use commands = new
 	mimeSelf = "appear to chuckle"
 	muzzleAffected = 1
 
-/datum/emote/chuckle/New()
-	..()
-	commands += "chuckle"
-	commands += "chuckles"
-
 /datum/emote/chuckle/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -318,17 +242,13 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/clap
 	name = "clap"
 	desc = "clap"
+	commands = list("clap", "claps")
 	text = "claps"
 	selfText = "clap"
 	audible = 1
 	mimeText = "claps silently"
 	restrained = 1
 
-/datum/emote/clap/New()
-	..()
-	commands += "clap"
-	commands += "claps"
-
 /datum/emote/clap/available(var/mob/user)
 	if(isrobot(user))
 		return 1
@@ -338,16 +258,12 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/collapse
 	name = "collapse"
 	desc = "Makes the mob collapse"
+	commands = list("collapse", "collapses")
 	text = "collapses"
 	selfText = "collapse"
 	audible = 1
 	mimeText = "collapses without a sound"
 
-/datum/emote/collapse/New()
-	..()
-	commands += "collapse"
-	commands += "collapses"
-
 /datum/emote/collapse/available(var/mob/user)
 	if(islarva(user))
 		return 1
@@ -360,6 +276,7 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/cough
 	name = "cough"
 	desc = "Makes the mob cough"
+	commands = list("cough", "coughs")
 	text = "coughs"
 	selfText = "cough"
 	audible = 1
@@ -368,11 +285,6 @@ above it. If you don't want this, make the call to ..() then use commands = new
 	muzzleAffected = 1
 	muzzledNoise = "strong"
 
-/datum/emote/cough/New()
-	..()
-	commands += "cough"
-	commands += "coughs"
-
 /datum/emote/cough/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -380,6 +292,7 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/cry
 	name = "cry"
 	desc = "Makes the mob cry"
+	commands = list("cry", "cries")
 	text = "cries"
 	selfText = "cry"
 	audible = 1
@@ -387,11 +300,6 @@ above it. If you don't want this, make the call to ..() then use commands = new
 	muzzleAffected = 1
 	muzzledNoise = "weak"
 
-/datum/emote/cry/New()
-	..()
-	commands += "cry"
-	commands += "cries"
-
 /datum/emote/cry/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -399,15 +307,11 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/dance
 	name = "dance"
 	desc = "makes the mob dance around happily"
+	commands = list("dance", "dances")
 	text = "dances around happily"
 	selfText = "dance around happily"
 	restrained = 1
 
-/datum/emote/dance/New()
-	..()
-	commands += "dance"
-	commands += "dances"
-
 /datum/emote/dance/available(var/mob/user)
 	if(islarva(user))
 		return 1
@@ -415,6 +319,7 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/dap
 	name = "dap"
 	desc = "Makes the mob give daps"
+	commands = list("dap", "daps")
 	text = "gives daps"
 	selfText = "give daps"
 	restrained = 1
@@ -422,11 +327,6 @@ above it. If you don't want this, make the call to ..() then use commands = new
 	targetMob = 1
 	targetText = "to"
 
-/datum/emote/dap/New()
-	..()
-	commands += "dap"
-	commands += "daps"
-
 /datum/emote/dap/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -440,13 +340,9 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/deathgasp
 	name = "deathgasp"
 	desc = "Makes the mob let out it's final gasp"
+	commands = list("deathgasp", "deathgasps")
 	audible = 1
 
-/datum/emote/deathgasp/New()
-	..()
-	commands += "deathgasp"
-	commands += "deathgasps"
-
 /datum/emote/deathgasp/alien
 	text = "lets out a waning guttural screech, green blood bubbling from its maw..."
 	selfText = "let out a waning guttural screech, green blood bubbling from your maw..."
@@ -479,9 +375,14 @@ above it. If you don't want this, make the call to ..() then use commands = new
 	selfText = "shudder violently for a moment, then become motionless, your eyes slowly darkening."
 	audible = 0
 
+/datum/emote/deathgasp/robot/available(var/mob/user)
+	if(isrobot(user))
+		return 1
+
 /datum/emote/drone
 	name = "drone"
 	desc = "Makes the mob drone and rumble"
+	commands = list("drone", "drones", "rumble", "rumbles", "hum", "hums")
 	text = "rumbles"
 	selfText = "rumble"
 	audible = 1
@@ -489,15 +390,6 @@ above it. If you don't want this, make the call to ..() then use commands = new
 	canTarget = 1
 	targetMob = 1
 
-/datum/emote/drone/New()
-	..()
-	commands += "drone"
-	commands += "drones"
-	commands += "rumble"
-	commands += "rumbles"
-	commands += "hum"
-	commands += "hums"
-
 /datum/emote/drone/available(var/mob/user)
 	if(!ishuman(user))
 		return
@@ -517,21 +409,13 @@ above it. If you don't want this, make the call to ..() then use commands = new
 	message = replacetext(message, "drones", "drone")
 	return message
 
-/datum/emote/deathgasp/robot/available(var/mob/user)
-	if(isrobot(user))
-		return 1
-
 /datum/emote/drool
 	name = "drool"
 	desc = "Makes the mob drool"
+	commands = list("drool", "drools")
 	text = "drools"
 	selfText = "drool"
 
-/datum/emote/drool/New()
-	..()
-	commands += "drool"
-	commands += "drools"
-
 /datum/emote/drool/available(var/mob/user)
 	if(isalienadult(user) || islarva(user))
 		return 1
@@ -541,13 +425,10 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/eyebrow
 	name = "eyebrow"
 	desc = "Makes the mob raise an eyebrow"
+	commands = list("eyebrow")
 	text = "raises an eyebrow"
 	selfText = "raise an eyebrow"
 
-/datum/emote/eyebrow/New()
-	..()
-	commands += "eyebrow"
-
 /datum/emote/eyebrow/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -555,14 +436,10 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/faint
 	name = "faint"
 	desc = "makes the mob faint"
+	commands = list("faint", "faints")
 	text = "faints"
 	selfText = "faint"
 
-/datum/emote/faint/New()
-	..()
-	commands += "faint"
-	commands += "faints"
-
 /datum/emote/faint/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -573,16 +450,13 @@ above it. If you don't want this, make the call to ..() then use commands = new
 
 /datum/emote/fart
 	name = "fart"
+	desc = "makes the mob fart"
+	commands = list("fart", "farts")
 	text = "farts"
 	selfText = "fart"
 	cooldown = 50
 	audible = 1
 
-/datum/emote/fart/New()
-	..()
-	commands += "fart"
-	commands += "farts"
-
 /datum/emote/fart/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -634,16 +508,12 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/flap
 	name = "flap"
 	desc = "Makes the mob flap their wings"
+	commands = list("flap", "flaps")
 	text = "flaps"
 	selfText = "flap"
 	restrained = 1
 	audible = 1
 
-/datum/emote/flap/New()
-	..()
-	commands += "flap"
-	commands += "flaps"
-
 /datum/emote/flap/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -657,14 +527,9 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/flap/angry
 	name = "angry flap"
 	desc = "makes the mob flap their wings angrily"
+	commands = list("a_flap", "a_flaps")
 	allowParent = 1
 
-/datum/emote/flap/angry/New()
-	..()
-	commands = new /list()
-	commands += "a_flap"
-	commands += "a_flaps"
-
 /datum/emote/flap/angry/standardMessage(var/mob/user)
 	var/message = ..()
 	message += " angrily"
@@ -673,15 +538,11 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/flash
 	name = "flash"
 	desc = "Makes the lights on the mob flash quickly"
+	commands = list("flash", "flashes")
 	text = "flash quickly"
 	selfText = "flash quickly"
 	startText = "The lights on"
 
-/datum/emote/flash/New()
-	..()
-	commands += "flash"
-	commands += "flashes"
-
 /datum/emote/flash/available(var/mob/user)
 	if(isbrain(user))
 		return 1
@@ -689,17 +550,13 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/flip
 	name = "flip"
 	desc = "Makes the mob flip, possibly in the direction of someone"
+	commands = list("flip", "flips")
 	text = "flips"
 	selfText = "flip"
 	canTarget = 1
 	targetMob = 1
 	targetText = "in"
 
-/datum/emote/flip/New()
-	..()
-	commands += "flip"
-	commands += "flips"
-
 /datum/emote/flip/available(var/mob/user)
 	if(isrobot(user))
 		return 1
@@ -765,14 +622,10 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/frown
 	name = "frown"
 	desc = "Makes the mob frown"
+	commands = list("frown", "frowns")
 	text = "frowns"
 	selfText = "frown"
 
-/datum/emote/frown/New()
-	..()
-	commands += "frown"
-	commands += "frowns"
-
 /datum/emote/frown/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -780,6 +633,7 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/gasp
 	name = "gasp"
 	desc = "Makes the mob gasp"
+	commands = list("gasp", "gasps")
 	text = "gasps"
 	selfText = "gasp"
 	audible = 1
@@ -788,11 +642,6 @@ above it. If you don't want this, make the call to ..() then use commands = new
 	muzzleAffected = 1
 	muzzledNoise = "weak"
 
-/datum/emote/gasp/New()
-	..()
-	commands += "gasp"
-	commands += "gasps"
-
 /datum/emote/gasp/available(var/mob/user)
 	if(isalienadult(user) || islarva(user))
 		return 1
@@ -802,17 +651,13 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/giggle
 	name = "giggle"
 	desc = "Makes the mob giggle"
+	commands = list("giggle", "giggles")
 	text = "giggles"
 	selfText = "giggle"
 	audible = 1
 	mimeText = "giggles silently"
 	muzzleAffected = 1
 
-/datum/emote/giggle/New()
-	..()
-	commands += "giggle"
-	commands += "giggles"
-
 /datum/emote/giggle/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -820,16 +665,12 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/glare
 	name = "glare"
 	desc = "Makes the mob glare"
+	commands = list("glare", "glares")
 	text = "glares"
 	selfText = "glare"
 	canTarget = 1
 	targetMob = 1
 
-/datum/emote/glare/New()
-	..()
-	commands += "glare"
-	commands += "glares"
-
 /datum/emote/glare/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -838,17 +679,13 @@ above it. If you don't want this, make the call to ..() then use commands = new
 
 /datum/emote/gnarl
 	name = "gnarl"
-	desc = "Makes the mob grarl and show its teeth"
+	desc = "Makes the mob gnarl and show its teeth"
+	commands = list("gnarl", "gnarls")
 	text = "gnarls and shows its teeth"
 	selfText = "gnarl and show your teeth"
 	audible = 1
 	muzzleAffected = 1
 
-/datum/emote/gnarl/New()
-	..()
-	commands += "gnarl"
-	commands += "gnarls"
-
 /datum/emote/gnarl/available(var/mob/user)
 	if(islarva(user))
 		return 1
@@ -856,14 +693,10 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/grin
 	name = "grin"
 	desc = "Makes the mob grin"
+	commands = list("grin", "grins")
 	text = "grins"
 	selfText = "grin"
 
-/datum/emote/grin/New()
-	..()
-	commands += "grin"
-	commands += "grins"
-
 /datum/emote/grin/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -871,6 +704,7 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/groan
 	name = "groan"
 	desc = "Makes the mob groan"
+	commands = list("groan", "groans")
 	text = "groans"
 	selfText = "groan"
 	audible = 1
@@ -878,11 +712,6 @@ above it. If you don't want this, make the call to ..() then use commands = new
 	mimeSelf = "appear to groan"
 	muzzleAffected = 1
 
-/datum/emote/groan/New()
-	..()
-	commands += "groan"
-	commands += "groans"
-
 /datum/emote/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -890,17 +719,13 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/grumble
 	name = "grumble"
 	desc = "Makes the mob grumble"
+	commands = list("grumble", "grumbles")
 	text = "grumbles"
 	selfText = "grumble"
 	audible = 1
 	mimeText = "grumbles"
 	muzzleAffected = 1
 
-/datum/emote/grumble/New()
-	..()
-	commands += "grumble"
-	commands += "grumbles"
-
 /datum/emote/grumble/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -908,15 +733,12 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/halt
 	name = "halt"
 	desc = "Makes the mob sound a halt warning. Only available with a security module"
+	commands = list("halt")
 	text = "'s speakers skreech, \"Halt! Security!\"."
 	selfText = " speakers skreech, \"Halt! Security!\"."
 	audible = 1
 	sound = 'sound/voice/halt.ogg'
 
-/datum/emote/halt/New()
-	..()
-	commands += "halt"
-
 /datum/emote/halt/available(var/mob/user)
 	if(isrobot(user))
 		return 1
@@ -936,6 +758,7 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/handshake
 	name = "handshake"
 	desc = "Makes the mob shake hands with a target"
+	commands = list("handshake")
 	text = "shakes hands"
 	selfText = "shake hands"
 	canTarget = 1
@@ -943,10 +766,6 @@ above it. If you don't want this, make the call to ..() then use commands = new
 	targetText = "with"
 	restrained = 1
 
-/datum/emote/handshake/New()
-	..()
-	commands += "handshake"
-
 /datum/emote/handshake/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -973,15 +792,11 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/hiss
 	name = "hiss"
 	desc = "Makes the mob hiss"
+	commands = list("hiss", "hisses")
 	text = "hisses"
 	selfText = "hiss"
 	audible = 1
 
-/datum/emote/hiss/New()
-	..()
-	commands += "hiss"
-	commands += "hisses"
-
 /datum/emote/hiss/available(var/mob/user)
 	if(isalienadult(user) || islarva(user))
 		return 1
@@ -989,17 +804,13 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/hug
 	name = "hug"
 	desc = "Makes the mob hug a target or themselves"
+	commands = list("hug", "hugs")
 	text = "hugs"
 	selfText = "hug"
 	canTarget = 1
 	targetMob = 1
 	targetText = ""
 
-/datum/emote/hug/New()
-	..()
-	commands += "hug"
-	commands += "hugs"
-
 /datum/emote/hug/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -1013,14 +824,10 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/jiggle
 	name = "jiggle"
 	desc = "Makes the mob jiggle"
+	commands = list("jiggle", "jiggles")
 	text = "jiggles"
 	selfText = "jiggle"
 
-/datum/emote/jiggle/New()
-	..()
-	commands += "jiggle"
-	commands += "jiggles"
-
 /datum/emote/jiggle/available(var/mob/user)
 	if(isslime(user))
 		return 1
@@ -1028,6 +835,7 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/johnny
 	name = "johnny"
 	desc = "Yeah, just try it"
+	commands = list("johnny")
 	text = "takes a drag from a cigarette and blows their name out in smoke."
 	selfText = "take a drag from a cigarette and blow their name out in smoke."
 	audible = 1
@@ -1037,10 +845,6 @@ above it. If you don't want this, make the call to ..() then use commands = new
 	targetMob = 1
 	targetText = ""
 
-/datum/emote/johnny/New()
-	..()
-	commands += "johnny"
-
 /datum/emote/johnny/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -1079,14 +883,10 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/jump
 	name = "jump"
 	desc = "Makes the mob jump"
+	commands = list("jump", "jumps")
 	text = "jumps"
 	selfText = "jump"
 
-/datum/emote/jump/New()
-	..()
-	commands += "jump"
-	commands += "jumps"
-
 /datum/emote/jump/available(var/mob/user)
 	if(islarva(user) || isalienadult(user))
 		return 1
@@ -1096,6 +896,7 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/laugh
 	name = "laugh"
 	desc = "Makes the mob laugh"
+	commands = list("laugh", "laughs")
 	text = "laughs"
 	selfText = "laugh"
 	audible = 1
@@ -1103,11 +904,6 @@ above it. If you don't want this, make the call to ..() then use commands = new
 	mimeSelf = "act out a laugh"
 	muzzleAffected = 1
 
-/datum/emote/laugh/New()
-	..()
-	commands += "laugh"
-	commands += "laughs"
-
 /datum/emote/laugh/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -1115,15 +911,12 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/law
 	name = "law"
 	desc = "Makes the mob prove it is the law"
+	commands = list("law")
 	text = "shows its legal authorization barcode."
 	selfText = "show your legal authorization barcode."
 	audible = 1
 	sound = 'sound/voice/biamthelaw.ogg'
 
-/datum/emote/law/New()
-	..()
-	commands += "law"
-
 /datum/emote/law/available(var/mob/user)
 	if(isrobot(user))
 		return 1
@@ -1139,14 +932,10 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/light
 	name = "light"
 	desc = "makes the mob light up"
+	commands = list("light", "lights")
 	text = "lights up for a bit, then stops."
 	selfText = "light up for a bit, then stop."
 
-/datum/emote/light/New()
-	..()
-	commands += "light"
-	commands += "lights"
-
 /datum/emote/light/available(var/mob/user)
 	if(isslime(user))
 		return 1
@@ -1154,16 +943,12 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/look
 	name = "look"
 	desc = "Makes the mob look"
+	commands = list("look", "looks")
 	text = "looks"
 	selfText = "look"
 	canTarget = 1
 	targetMob = 1
 
-/datum/emote/look/New()
-	..()
-	commands += "look"
-	commands += "looks"
-
 /datum/emote/look/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -1179,15 +964,11 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/moan
 	name = "moan"
 	desc = "Makes the mob moan"
+	commands = list("moan", "moans")
 	text = "moans"
 	selfText = "moan"
 	audible = 1
 
-/datum/emote/moan/New()
-	..()
-	commands += "moan"
-	commands += "moans"
-
 /datum/emote/moan/available(var/mob/user)
 	if(isslime(user))
 		return 1
@@ -1197,16 +978,12 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/mumble
 	name = "mumble"
 	desc = "Makes the mob mumble"
+	commands = list("mumble", "mumbles")
 	text = "mumbles"
 	selfText = "mumble"
 	audible = 1
 	mimeText = "mumbles"
 
-/datum/emote/mumble/New()
-	..()
-	commands += "mumble"
-	commands += "mumbles"
-
 /datum/emote/mumble/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -1214,6 +991,7 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/no
 	name = "no"
 	desc = "Makes the mob let out a negative blip"
+	commands = list("no")
 	text = "emits a negative blip"
 	selfText = "emit a negative blip"
 	audible = 1
@@ -1230,14 +1008,10 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/nod
 	name = "nod"
 	desc = "Makes the mob nod"
+	commands = list("nod", "nods")
 	text = "nods"
 	selfText = "nod"
 
-/datum/emote/nod/New()
-	..()
-	commands += "nod"
-	commands += "nods"
-
 /datum/emote/nod/available(var/mob/user)
 	if(islarva(user))
 		return 1
@@ -1249,14 +1023,11 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/notice
 	name = "notice"
 	desc = "Makes the mob play a loud tone"
+	commands = list("notice")
 	text = "plays a loud tone"
 	selfText = "play a loud tone"
 	audible = 1
 
-/datum/emote/notice/New()
-	..()
-	commands += "notice"
-
 /datum/emote/notice/available(var/mob/user)
 	if(isbrain(user))
 		return 1
@@ -1264,14 +1035,10 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/pale
 	name = "pale"
 	desc = "Makes the mob go pale"
+	commands = list("pale", "pales")
 	text = "goes pale for a second."
 	selfText = "go pale for a second"
 
-/datum/emote/pale/New()
-	..()
-	commands += "pale"
-	commands += "pales"
-
 /datum/emote/pale/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -1279,6 +1046,7 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/ping
 	name = "ping"
 	desc = "Makes the mob ping"
+	commands = list("ping", "pings")
 	text = "pings"
 	selfText = "ping"
 	audible = 1
@@ -1286,11 +1054,6 @@ above it. If you don't want this, make the call to ..() then use commands = new
 	canTarget = 1
 	targetMob = 1
 
-/datum/emote/ping/New()
-	..()
-	commands += "ping"
-	commands += "pings"
-
 /datum/emote/ping/available(var/mob/user)
 	if(user.is_mechanical())
 		return 1
@@ -1298,15 +1061,11 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/point
 	name = "point"
 	desc = "Makes the mob point"
+	commands = list("point", "points")
 	text = "points"
 	selfText = "point"
 	canTarget = 1
 
-/datum/emote/point/New()
-	..()
-	commands += "point"
-	commands += "points"
-
 /datum/emote/point/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -1324,14 +1083,10 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/quiver
 	name = "quiver"
 	desc = "Makes the mob quiver"
+	commands = list("quiver", "quivers")
 	text = "quivers"
 	selfText = "quiver"
 
-/datum/emote/quiver/New()
-	..()
-	commands += "quiver"
-	commands += "quivers"
-
 /datum/emote/quiver/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -1339,15 +1094,11 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/raise
 	name = "raise"
 	desc = "Makes the mob raise a hand"
+	commands = list("raise", "raises")
 	text = "raises a hand"
 	selfText = "raise a hand"
 	restrained = 1
 
-/datum/emote/raise/New(var/mob/user)
-	..()
-	commands += "raise"
-	commands += "raises"
-
 /datum/emote/raise/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -1355,17 +1106,13 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/roar
 	name = "roar"
 	desc = "Makes the mob roar"
+	commands = list("roar", "roars")
 	text = "roars"
 	selfText = "roar"
 	audible = 1
 	muzzleAffected = 1
 	muzzledNoise = "loud"
 
-/datum/emote/roar/New()
-	..()
-	commands += "roar"
-	commands += "roars"
-
 /datum/emote/roar/available(var/mob/user)
 	if(isalienadult(user))
 		return 1
@@ -1373,14 +1120,10 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/roll
 	name = "roll"
 	desc = "Makes the mob roll"
+	commands = list("roll", "rolls")
 	text = "rolls"
 	selfText = "roll"
 
-/datum/emote/roll/New()
-	..()
-	commands += "roll"
-	commands += "rolls"
-
 /datum/emote/roll/available(var/mob/user)
 	if(islarva(user))
 		return 1
@@ -1390,17 +1133,13 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/salute
 	name = "salute"
 	desc = "Makes the mob salute"
+	commands = list("salute", "salutes")
 	text = "salutes"
 	selfText = "salute"
 	canTarget = 1
 	targetMob = 1
 	targetText = "to"
 
-/datum/emote/salute/New()
-	..()
-	commands += "salute"
-	commands += "salutes"
-
 /datum/emote/salute/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -1421,15 +1160,11 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/scratch
 	name = "scratch"
 	desc = "Makes the mob scratch"
+	commands = list("scratch", "scratches")
 	text = "scratches"
 	selfText = "scratch"
 	restrained = 1
 
-/datum/emote/scratch/New()
-	..()
-	commands += "scratch"
-	commands += "scratches"
-
 /datum/emote/scratch/available(var/mob/user)
 	if(islarva(user) || isalienadult(user))
 		return 1
@@ -1438,17 +1173,14 @@ above it. If you don't want this, make the call to ..() then use commands = new
 
 /datum/emote/scream
 	name = "scream"
+	desc = "makes the mob scream"
+	commands = list("scream", "screams")
 	audible = 1
 	mimeText = "acts out a scream"
 	muzzledNoise = "very loud"
 	cooldown = 50
 	vol = 80
 
-/datum/emote/scream/New()
-	..()
-	commands += "scream"
-	commands += "screams"
-
 /datum/emote/scream/machine
 	name = "machine scream"
 	sound = 'sound/goonstation/voice/robot_scream.ogg'
@@ -1476,16 +1208,12 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/scretch
 	name = "scretch"
 	desc = "makes the mob scretch"  //whatever that is!
+	commands = list("scretch", "scretches")
 	text = "scretches"
 	selfText = "scretch"
 	audible = 1
 	muzzleAffected = 1
 
-/datum/emote/scretch/New()
-	..()
-	commands += "scretch"
-	commands += "scretches"
-
 /datum/emote/scretch/available(var/mob/user)
 	if(isalienadult(user) || islarva(user))
 		return 1
@@ -1493,14 +1221,10 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/shake
 	name = "shake"
 	desc = "Makes the mob shake its head"
+	commands = list("shake", "shakes")
 	text = "shakes"
 	selfText = "shake"
 
-/datum/emote/shake/New()
-	..()
-	commands += "shake"
-	commands += "shakes"
-
 /datum/emote/shake/available(var/mob/user)
 	if(islarva(user))
 		return 1
@@ -1515,16 +1239,12 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/shiver
 	name = "shiver"
 	desc = "Makes the mob shiver"
+	commands = list("shiver", "shivers")
 	text = "shivers"
 	selfText = "shiver"
 	audible = 1
 	mimeText = "shivers"
 
-/datum/emote/shiver/New()
-	..()
-	commands += "shiver"
-	commands += "shivers"
-
 /datum/emote/shiver/available(var/mob/user)
 	if(isalienadult(user) || islarva(user))
 		return 1
@@ -1539,14 +1259,10 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/shrug
 	name = "shrug"
 	desc = "Makes the mob shrug"
+	commands = list("shrug", "shrugs")
 	text = "shrugs"
 	selfText = "shrug"
 
-/datum/emote/shrug/New()
-	..()
-	commands += "shrug"
-	commands += "shrugs"
-
 /datum/emote/shrug/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -1554,6 +1270,7 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/sigh
 	name = "sigh"
 	desc = "Makes the mob sigh"
+	commands = list("sigh", "sighs")
 	text = "sighs"
 	selfText = "sigh"
 	audible = 1
@@ -1561,11 +1278,6 @@ above it. If you don't want this, make the call to ..() then use commands = new
 	muzzleAffected = 1
 	muzzledNoise = "weak"
 
-/datum/emote/sigh/New()
-	..()
-	commands += "sigh"
-	commands += "sighs"
-
 /datum/emote/sigh/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -1573,16 +1285,12 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/sign
 	name = "sign"
 	desc = "Makes the mob sign a number"
+	commands = list("sign", "signs")
 	text = "signs"
 	selfText = "sign"
 	restrained = 1
 	takesNumber = 1
 
-/datum/emote/sign/New()
-	..()
-	commands += "sign"
-	commands += "signs"
-
 /datum/emote/sign/available(var/mob/user)
 	if(isalienadult(user) || islarva(user))
 		return 1
@@ -1628,6 +1336,7 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/slap
 	name = "slap"
 	desc = "makes the mob slap someone"
+	commands = list("slap", "slaps")
 	text = "slaps"
 	selfText = "slap"
 	audible = 1
@@ -1636,11 +1345,6 @@ above it. If you don't want this, make the call to ..() then use commands = new
 	targetMob = 1
 	targetText = ""
 
-/datum/emote/slap/New()
-	..()
-	commands += "slap"
-	commands += "slaps"
-
 /datum/emote/slap/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -1664,14 +1368,10 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/smile
 	name = "smile"
 	desc = "Makes the mob smile"
+	commands = list("smile", "smiles")
 	text = "smiles"
 	selfText = "smile"
 
-/datum/emote/smile/New()
-	..()
-	commands += "smile"
-	commands += "smiles"
-
 /datum/emote/smile/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -1679,16 +1379,12 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/snap
 	name = "snap"
 	desc = "Makes the mob snap it's fingers"
+	commands = list("snap", "snaps")
 	text = "snaps"
 	selfText = "snap"
 	audible = 1
 	sound = 'sound/effects/fingersnap.ogg'
 
-/datum/emote/snap/New()
-	..()
-	commands += "snap"
-	commands += "snaps"
-
 /datum/emote/snap/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -1735,7 +1431,8 @@ above it. If you don't want this, make the call to ..() then use commands = new
 
 /datum/emote/sneeze
 	name = "sneeze"
-	desc = "Makes the mob sneezze"
+	desc = "Makes the mob sneeze"
+	commands = list("sneeze", "sneezes")
 	text = "sneezes"
 	selfText = "sneeze"
 	audible = 1
@@ -1743,11 +1440,6 @@ above it. If you don't want this, make the call to ..() then use commands = new
 	muzzleAffected = 1
 	muzzledNoise = "strange"
 
-/datum/emote/sneeze/New()
-	..()
-	commands += "sneeze"
-	commands += "sneezes"
-
 /datum/emote/sneeze/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -1755,16 +1447,12 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/sniff
 	name = "sniff"
 	desc = "Makes the mob sniff"
+	commands = list("sniff", "sniffs")
 	text = "sniffs"
 	selfText = "sniff"
 	audible = 1
 	mimeText = "sniffs"
 
-/datum/emote/sniff/New()
-	..()
-	commands += "sniff"
-	commands += "sniffs"
-
 /datum/emote/sniff/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -1772,6 +1460,7 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/snore
 	name = "snore"
 	desc = "Makes the mob snore"
+	commands = list("snore", "snores")
 	text = "snores"
 	selfText = "snore"
 	audible = 1
@@ -1779,11 +1468,6 @@ above it. If you don't want this, make the call to ..() then use commands = new
 	mimeSelf = "sleep soundly"
 	muzzleAffected = 1
 
-/datum/emote/snore/New()
-	..()
-	commands += "snore"
-	commands += "snores"
-
 /datum/emote/snore/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -1791,6 +1475,7 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/squish
 	name = "squish"
 	desc = "Makes the mob squish"
+	commands = list("squish", "squishes")
 	text = "squishes"
 	selfText = "squish"
 	audible = 1
@@ -1798,11 +1483,6 @@ above it. If you don't want this, make the call to ..() then use commands = new
 	canTarget = 1
 	targetMob = 1
 
-/datum/emote/squish/New()
-	..()
-	commands += "squish"
-	commands += "squishes"
-
 /datum/emote/available(var/mob/user)
 	if(isslime(user))
 		return 1
@@ -1817,16 +1497,12 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/stare
 	name = "stare"
 	desc = "Makes the mob stare"
+	commands = list("stare", "stares")
 	text = "stares"
 	selfText = "stare"
 	canTarget = 1
 	targetMob = 1
 
-/datum/emote/stare/New()
-	..()
-	commands += "stare"
-	commands += "stares"
-
 /datum/emote/stare/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -1836,14 +1512,10 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/sulk
 	name = "sulk"
 	desc = "Makes the mob sulk"
+	commands = list("sulk", "sulks")
 	text = "sulks down sadly"
 	selfText = "sulk down sadly"
 
-/datum/emote/sulk/New()
-	..()
-	commands += "sulk"
-	commands += "sulks"
-
 /datum/emote/sulk/available(var/mob/user)
 	if(islarva(user))
 		return 1
@@ -1851,14 +1523,10 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/sway
 	name = "sway"
 	desc = "Makes the mob sway"
+	commands = list("sway", "sways")
 	text = "sways around dizzily"
 	selfText = "sway around dizzily"
 
-/datum/emote/sway/New()
-	..()
-	commands += "sway"
-	commands += "sways"
-
 /datum/emote/sway/available(var/mob/user)
 	if(islarva(user))
 		return 1
@@ -1868,13 +1536,10 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/tail
 	name = "tail"
 	desc = "Makes the mob wave it's tail"
+	commands = list("tail")
 	text = "waves it's tail"
 	selfText = "wave your tail"
 
-/datum/emote/tail/New()
-	..()
-	commands += "tail"
-
 /datum/emote/tail/available(var/mob/user)
 	if(islarva(user) || isalienadult(user))
 		return 1
@@ -1884,15 +1549,10 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/tail/wag
 	name = "wag"
 	desc = "Makes the mob start wagging its tail"
+	commands = list("wag", "wags")
 	text = "starts"
 	selfText = "start"
 
-/datum/emote/tail/wag/New()
-	..()
-	commands = new /list()
-	commands += "wag"
-	commands += "wags"
-
 /datum/emote/tail/wag/available(var/mob/user)
 	if(issmall(user))
 		return
@@ -1925,16 +1585,11 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/tail/wag/stop
 	name = "swag"
 	desc = "Makes the mob stop wagging its tail"
+	commands = list("swag", "swags")
 	text = "stops"
 	selfText = "stop"
 	allowParent = 1
 
-/datum/emote/tail/wag/stop/New()
-	..()
-	commands = new /list()
-	commands += "swag"
-	commands += "swags"
-
 // seemingly no way to tell if a mob is wagging it's tail! VB
 /datum/emote/tail/wag/stop/prevented(var/mob/user)
 	. = ..()
@@ -1951,14 +1606,10 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/tremble
 	name = "tremble"
 	desc = "Makes the mob tremble"
+	commands = list("tremble", "trembles")
 	text = "trembles"
 	selfText = "tremble"
 
-/datum/emote/tremble/New()
-	..()
-	commands += "tremble"
-	commands += "trembles"
-
 /datum/emote/tremble/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -1966,14 +1617,10 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/twitch_s
 	name = "twitch_s"
 	desc = "Makes the mob twitch"
+	commands = list("twitch_s", "twitches_s")
 	text = "twitches"
 	selfText = "twitch"
 
-/datum/emote/twitch_s/New()
-	..()
-	commands += "twitch_s"
-	commands += "twitches_s"
-
 /datum/emote/twitch_s/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -1983,14 +1630,9 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/twitch_s/twitch
 	name = "twitch"
 	desc = "Makes the mob twitch violently"
+	commands = list("twitch", "twitches")
 	allowParent = 1
 
-/datum/emote/twitch_s/twitch/New()
-	..()
-	commands = new /list()
-	commands += "twitch"
-	commands += "twitches"
-
 /datum/emote/twitch_s/twitch/available(var/mob/user)
 	if(isslime(user))
 		return 1
@@ -2006,14 +1648,10 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/vibrate
 	name = "vibrate"
 	desc = "Makes the mob vibrate"
+	commands = list("vibrate", "vibrates")
 	text = "vibrates"
 	selfText = "vibrate"
 
-/datum/emote/vibrate/New()
-	..()
-	commands += "vibrate"
-	commands += "vibrates"
-
 /datum/emote/vibrate/available(var/mob/user)
 	if(isslime(user))
 		return 1
@@ -2021,14 +1659,10 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/wave
 	name = "wave"
 	desc = "Makes the mob wave"
+	commands = list ("wave", "waves")
 	text = "waves"
 	selfText = "wave"
 
-/datum/emote/wave/New()
-	..()
-	commands += "wave"
-	commands += "waves"
-
 /datum/emote/wave/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -2036,6 +1670,7 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/whimper
 	name = "whimper"
 	desc = "Makes the mob whimper"
+	commands = list("whimper", "whimpers")
 	text = "whimpers"
 	selfText = "whimper"
 	audible = 1
@@ -2043,11 +1678,6 @@ above it. If you don't want this, make the call to ..() then use commands = new
 	mimeSelf = "appear hurt"
 	muzzleAffected = 1
 
-/datum/emote/whimper/New()
-	..()
-	commands += "whimper"
-	commands += "whimpers"
-
 /datum/emote/whimper/available(var/mob/user)
 	if(islarva(user) || isalienadult(user))
 		return 1
@@ -2057,15 +1687,11 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/whistle
 	name = "whistle"
 	desc = "Makes the mob whistle"
+	commands = list("whistle", "whistles")
 	text = "whistles"
 	selfText = "whistle"
 	audible = 1
 
-/datum/emote/whistle/New()
-	..()
-	commands += "whistle"
-	commands += "whistles"
-
 /datum/emote/whistle/available(var/mob/user)
 	if(isbrain(user))
 		return 1
@@ -2073,14 +1699,10 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/wink
 	name = "wink"
 	desc = "Makes the mob wink"
+	commands = list("wink", "winks")
 	text = "winks"
 	selfText = "wink"
 
-/datum/emote/wink/New()
-	..()
-	commands += "wink"
-	commands += "winks"
-
 /datum/emote/wink/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -2088,17 +1710,13 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/yawn
 	name = "yawn"
 	desc = "makes the mob yawn"
+	commands = list("yawn", "yawns")
 	text = "yawns"
 	selfText = "yawn"
 	audible = 1
 	mimeText = "yawns"
 	muzzleAffected = 1
 
-/datum/emote/yawn/New()
-	..()
-	commands += "yawn"
-	commands += "yawns"
-
 /datum/emote/yawn/available(var/mob/user)
 	if(ishuman(user))
 		return 1
@@ -2106,6 +1724,7 @@ above it. If you don't want this, make the call to ..() then use commands = new
 /datum/emote/yes
 	name = "yes"
 	desc = "Makes the mob let out an affirmative beep"
+	commands = list("yes")
 	text = "lets out an affirmative beep"
 	selfText = "let out an affirmative beep"
 	audible = 1
@@ -2113,10 +1732,6 @@ above it. If you don't want this, make the call to ..() then use commands = new
 	canTarget = 1
 	targetMob = 1
 
-/datum/emote/yes/New()
-	..()
-	commands += "yes"
-
 /datum/emote/yes/available(var/mob/user)
 	if(user.is_mechanical())
 		return 1
\ No newline at end of file