117 files changed, 1113 insertions, 428 deletions
diff --git a/effects.xml b/effects.xml
index e1c1e878..d7e3ac7f 100644
--- a/effects.xml
+++ b/effects.xml
@@ -79,20 +79,48 @@
     <effect id="401" particle="graphics/particles/monster-lizard-firebreath.particle.xml"/>
 
     <!-- Emotion Effects -->
-    <effect id="10000" particle="graphics/particles/emotes/emote-disgust.particle.xml"/>
-    <effect id="10001" particle="graphics/particles/emotes/emote-surprise.particle.xml"/>
-    <effect id="10002" particle="graphics/particles/emotes/emote-happy.particle.xml"/>
-    <effect id="10003" particle="graphics/particles/emotes/emote-sad.particle.xml"/>
-    <effect id="10004" particle="graphics/particles/emotes/emote-evil.particle.xml"/>
-    <effect id="10005" particle="graphics/particles/emotes/emote-wink.particle.xml"/>
-    <effect id="10006" particle="graphics/particles/emotes/emote-angel.particle.xml"/>
-    <effect id="10007" particle="graphics/particles/emotes/emote-blush.particle.xml"/>
-    <effect id="10008" particle="graphics/particles/emotes/emote-tongue.particle.xml"/>
-    <effect id="10009" particle="graphics/particles/emotes/emote-grin.particle.xml"/>
-    <effect id="10010" particle="graphics/particles/emotes/emote-upset.particle.xml"/>
-    <effect id="10011" particle="graphics/particles/emotes/emote-perturbed.particle.xml"/>
-    <effect id="10012" particle="graphics/particles/emotes/emote-speech.particle.xml"/>
-    <effect id="10013" particle="graphics/particles/emotes/emote-blah.particle.xml"/>
+    <effect id="10000" particle="graphics/emotes/disgust.xml"/>
+    <effect id="10001" particle="graphics/emotes/surprise.xml"/>
+    <effect id="10002" particle="graphics/emotes/happy.xml"/>
+    <effect id="10003" particle="graphics/emotes/sad.xml"/>
+    <effect id="10004" particle="graphics/emotes/evil.xml"/>
+    <effect id="10005" particle="graphics/emotes/wink.xml"/>
+    <effect id="10006" particle="graphics/emotes/angel.xml"/>
+    <effect id="10007" particle="graphics/emotes/blush.xml"/>
+    <effect id="10008" particle="graphics/emotes/tongue.xml"/>
+    <effect id="10009" particle="graphics/emotes/grin.xml"/>
+    <effect id="10010" particle="graphics/emotes/upset.xml"/>
+    <effect id="10011" particle="graphics/emotes/perturbed.xml"/>
+    <effect id="10012" particle="graphics/emotes/speech.xml"/>
+    <effect id="10013" particle="graphics/emotes/blah.xml"/>
+    <effect id="10014" particle="graphics/emotes/swear.xml"/>
+    <effect id="10015" particle="graphics/emotes/meow.xml"/>
+    <effect id="10016" particle="graphics/emotes/laugh.xml"/>
+    <effect id="10017" particle="graphics/emotes/cheerful.xml"/>
+    <effect id="10018" particle="graphics/emotes/love.xml"/>
+    <effect id="10019" particle="graphics/emotes/money.xml"/>
+    <effect id="10020" particle="graphics/emotes/sleep.xml"/>
+    <effect id="10021" particle="graphics/emotes/rest.xml"/>
+    <effect id="10022" particle="graphics/emotes/bothered.xml"/>
+    <effect id="10023" particle="graphics/emotes/afraid.xml"/>
+    <effect id="10024" particle="graphics/emotes/dead.xml"/>
+    <effect id="10025" particle="graphics/emotes/suspicious.xml"/>
+    <effect id="10026" particle="graphics/emotes/melancholy.xml"/>
+    <effect id="10027" particle="graphics/emotes/facepalm.xml"/>
+    <effect id="10028" particle="graphics/emotes/angry.xml"/>
+    <effect id="10029" particle="graphics/emotes/headache.xml"/>
+    <effect id="10030" particle="graphics/emotes/bored.xml"/>
+    <effect id="10031" particle="graphics/emotes/heart.xml"/>
+    <effect id="10032" particle="graphics/emotes/empty.xml"/>
+    <effect id="10033" particle="graphics/emotes/halloween.xml"/>
+    <effect id="10034" particle="graphics/emotes/vicious.xml"/>
+    <effect id="10035" particle="graphics/emotes/joyful.xml"/>
+    <effect id="10036" particle="graphics/emotes/clever.xml"/>
+    <effect id="10037" particle="graphics/emotes/shy.xml"/>
+    <effect id="10038" particle="graphics/emotes/alien.xml"/>
+    <effect id="10039" particle="graphics/emotes/curious.xml"/>
+    <effect id="10040" particle="graphics/emotes/pain.xml"/>
+    <effect id="10041" particle="graphics/emotes/tears.xml"/>
 
    <!-- Add the data needed for the electricity boss battle. -->
 </being-effects>
diff --git a/emotes.xml b/emotes.xml
index 0fbb0a16..41e59120 100644
--- a/emotes.xml
+++ b/emotes.xml
@@ -1,118 +1,340 @@
 <?xml version="1.0"?>
 <emotes>
-    <!-- Important note that the sprite tags are purely for
-         backwards compatibility -->
-
-    <emote id="0"
-           name="Disgust"
-           effectid="10000"
-           image="graphics/particles/emotes/disgust.png"
-           width="30" height="32">
+
+	<emote id="0"
+		name="Disgust"
+		effectid="10000"
+		image="graphics/emotes/disgust.png"
+		width="30" height="32">
         <sprite name="Disgust" variant="0">emote.xml</sprite>
-    </emote>
+	</emote>
 
-    <emote id="1"
-           name="Surprise"
-           effectid="10001"
-           image="graphics/particles/emotes/surprise.png"
-           width="30" height="32">
+	<emote id="1"
+		name="Surprise"
+		effectid="10001"
+		image="graphics/emotes/surprise.png"
+		width="30" height="32">
         <sprite name="Surprise" variant="1">emote.xml</sprite>
-    </emote>
+	</emote>
 
-    <emote id="2"
-           name="Happy"
-           effectid="10002"
-           image="graphics/particles/emotes/happy.png"
-           width="30" height="32">
+	<emote id="2"
+		name="Happy"
+		effectid="10002"
+		image="graphics/emotes/happy.png"
+		width="30" height="32">
         <sprite name="Happy" variant="2">emote.xml</sprite>
-    </emote>
+	</emote>
 
-    <emote id="3"
-           name="Sad"
-           effectid="10003"
-           image="graphics/particles/emotes/sad.png"
-           width="30" height="32">
+	<emote id="3"
+		name="Sad"
+		effectid="10003"
+		image="graphics/emotes/sad.png"
+		width="30" height="32">
         <sprite name="Sad" variant="3">emote.xml</sprite>
-    </emote>
+	</emote>
 
-    <emote id="4"
-           name="Evil"
-           effectid="10004"
-           image="graphics/particles/emotes/evil.png"
-           width="30" height="32">
+	<emote id="4"
+		name="Evil"
+		effectid="10004"
+		image="graphics/emotes/evil.png"
+		width="30" height="32">
         <sprite name="Evil" variant="4">emote.xml</sprite>
-    </emote>
+	</emote>
 
-    <emote id="5"
-           name="Wink"
-           effectid="10005"
-           image="graphics/particles/emotes/wink.png"
-           width="30" height="32">
+	<emote id="5"
+		name="Wink"
+		effectid="10005"
+		image="graphics/emotes/wink.png"
+		width="30" height="32">
         <sprite name="Wink" variant="5">emote.xml</sprite>
-    </emote>
+	</emote>
 
-    <emote id="6"
-           name="Angel"
-           effectid="10006"
-           image="graphics/particles/emotes/angel.png"
-           width="30" height="32">
+	<emote id="6"
+		name="Angel"
+		effectid="10006"
+		image="graphics/emotes/angel.png"
+		width="30" height="32">
         <sprite name="Angel" variant="6">emote.xml</sprite>
-    </emote>
+	</emote>
 
-    <emote id="7"
-           name="Blush"
-           effectid="10007"
-           image="graphics/particles/emotes/blush.png"
-           width="30" height="32">
+	<emote id="7"
+		name="Blush"
+		effectid="10007"
+		image="graphics/emotes/blush.png"
+		width="30" height="32">
         <sprite name="Blush" variant="7">emote.xml</sprite>
-    </emote>
+	</emote>
 
-    <emote id="8"
-           name="Tongue"
-           effectid="10008"
-           image="graphics/particles/emotes/tongue.png"
-           width="30" height="32">
+	<emote id="8"
+		name="Tongue"
+		effectid="10008"
+		image="graphics/emotes/tongue.png"
+		width="30" height="32">
         <sprite name="Tongue" variant="8">emote.xml</sprite>
-    </emote>
+	</emote>
 
-    <emote id="9"
-           name="Grin"
-           effectid="10009"
-           image="graphics/particles/emotes/grin.png"
-           width="30" height="32">
+	<emote id="9"
+		name="Grin"
+		effectid="10009"
+		image="graphics/emotes/grin.png"
+		width="30" height="32">
         <sprite name="Grin" variant="9">emote.xml</sprite>
-    </emote>
+	</emote>
 
-    <emote id="10"
-           name="Upset"
-           effectid="10010"
-           image="graphics/particles/emotes/upset.png"
-           width="30" height="32">
+	<emote id="10"
+		name="Upset"
+		effectid="10010"
+		image="graphics/emotes/upset.png"
+		width="30" height="32">
         <sprite name="Upset" variant="10">emote.xml</sprite>
-    </emote>
+	</emote>
 
-    <emote id="11"
-           name="Perturbed"
-           effectid="10011"
-           image="graphics/particles/emotes/perturbed.png"
-           width="30" height="32">
+	<emote id="11"
+		name="Perturbed"
+		effectid="10011"
+		image="graphics/emotes/perturbed.png"
+		width="30" height="32">
         <sprite name="Perturbed" variant="11">emote.xml</sprite>
-    </emote>
+	</emote>
 
-    <emote id="12"
-           name="Speech"
-           effectid="10012"
-           image="graphics/particles/emotes/speech.png"
-           width="30" height="32">
-        <sprite name="Speech" variant="14">emote.xml</sprite>
-    </emote>
+	<emote id="12"
+		name="Speech"
+		effectid="10012"
+		image="graphics/emotes/speech.png"
+		width="30" height="32">
+        <sprite name="Speech" variant="12">emote.xml</sprite>
+	</emote>
 
-    <emote id="13"
-           name="Blah"
-           effectid="10013"
-           image="graphics/particles/emotes/blah.png"
-           width="30" height="32">
+	<emote id="13"
+		name="Blah"
+		effectid="10013"
+		image="graphics/emotes/blah.png"
+		width="30" height="32">
         <sprite name="Blah" variant="13">emote.xml</sprite>
-    </emote>
+	</emote>
+
+	<emote id="14"
+		name="Swear"
+		effectid="10014"
+		image="graphics/emotes/swear.png"
+		width="30" height="32">
+        <sprite name="Speech" variant="14">emote.xml</sprite>
+	</emote>
+
+	<emote id="15"
+		name="Meow"
+		effectid="10015"
+		image="graphics/emotes/meow.png"
+		width="30" height="32">
+        <sprite name="Blah" variant="15">emote.xml</sprite>
+	</emote>
+
+	<emote id="16"
+		name="Laugh"
+		effectid="10016"
+		image="graphics/emotes/laugh.png"
+		width="30" height="32">
+        <sprite name="Laugh" variant="16">emote.xml</sprite>
+	</emote>
+
+	<emote id="17"
+		name="Cheerful"
+		effectid="10017"
+		image="graphics/emotes/cheerful.png"
+		width="30" height="32">
+        <sprite name="Cheerful" variant="17">emote.xml</sprite>
+	</emote>
+
+	<emote id="18"
+		name="Love"
+		effectid="10018"
+		image="graphics/emotes/love.png"
+		width="30" height="32">
+        <sprite name="Love" variant="18">emote.xml</sprite>
+	</emote>
+
+	<emote id="19"
+		name="Money"
+		effectid="10019"
+		image="graphics/emotes/money.png"
+		width="30" height="32">
+        <sprite name="Money" variant="19">emote.xml</sprite>
+	</emote>
+
+	<emote id="20"
+		name="Sleep"
+		effectid="10020"
+		image="graphics/emotes/sleep.png"
+		width="30" height="32">
+        <sprite name="Sleep" variant="20">emote.xml</sprite>
+	</emote>
+
+	<emote id="21"
+		name="Rest"
+		effectid="10021"
+		image="graphics/emotes/rest.png"
+		width="30" height="32">
+        <sprite name="Rest" variant="21">emote.xml</sprite>
+	</emote>
+
+	<emote id="22"
+		name="Bothered"
+		effectid="10022"
+		image="graphics/emotes/bothered.png"
+		width="30" height="32">
+        <sprite name="Bothered" variant="22">emote.xml</sprite>
+	</emote>
+
+	<emote id="23"
+		name="Afraid"
+		effectid="10023"
+		image="graphics/emotes/afraid.png"
+		width="30" height="32">
+        <sprite name="Afraid" variant="23">emote.xml</sprite>
+	</emote>
+
+	<emote id="24"
+		name="Dead"
+		effectid="10024"
+		image="graphics/emotes/dead.png"
+		width="30" height="32">
+        <sprite name="Dead" variant="24">emote.xml</sprite>
+	</emote>
+
+	<emote id="25"
+		name="Suspicious"
+		effectid="10025"
+		image="graphics/emotes/suspicious.png"
+		width="30" height="32">
+        <sprite name="Suspicious" variant="25">emote.xml</sprite>
+	</emote>
+
+	<emote id="26"
+		name="Melancholy"
+		effectid="10026"
+		image="graphics/emotes/melancholy.png"
+		width="30" height="32">
+        <sprite name="Melancholy" variant="26">emote.xml</sprite>
+	</emote>
+
+	<emote id="27"
+		name="Facepalm"
+		effectid="10027"
+		image="graphics/emotes/facepalm.png"
+		width="30" height="32">
+        <sprite name="Facepalm" variant="27">emote.xml</sprite>
+	</emote>
+
+	<emote id="28"
+		name="Angry"
+		effectid="10028"
+		image="graphics/emotes/angry.png"
+		width="30" height="32">
+        <sprite name="Angry" variant="28">emote.xml</sprite>
+	</emote>
+
+	<emote id="29"
+		name="Headache"
+		effectid="10029"
+		image="graphics/emotes/headache.png"
+		width="30" height="32">
+        <sprite name="Headache" variant="29">emote.xml</sprite>
+	</emote>
+
+	<emote id="30"
+		name="Bored"
+		effectid="10030"
+		image="graphics/emotes/bored.png"
+		width="30" height="32">
+        <sprite name="Bored" variant="30">emote.xml</sprite>
+	</emote>
+
+	<emote id="31"
+		name="Heart"
+		effectid="10031"
+		image="graphics/emotes/heart.png"
+		width="30" height="32">
+        <sprite name="Heart" variant="31">emote.xml</sprite>
+	</emote>
+
+	<emote id="32"
+		name="Empty"
+		effectid="10032"
+		image="graphics/emotes/empty.png"
+		width="30" height="32">
+        <sprite name="Empty" variant="32">emote.xml</sprite>
+	</emote>
+
+	<emote id="33"
+		name="Halloween"
+		effectid="10033"
+		image="graphics/emotes/halloween.png"
+		width="30" height="32">
+        <sprite name="Halloween" variant="33">emote.xml</sprite>
+	</emote>
+
+	<emote id="34"
+		name="Vicious"
+		effectid="10034"
+		image="graphics/emotes/vicious.png"
+		width="30" height="32">
+        <sprite name="Vicious" variant="34">emote.xml</sprite>
+	</emote>
+
+	<emote id="35"
+		name="Joyful"
+		effectid="10035"
+		image="graphics/emotes/joyful.png"
+		width="30" height="32">
+        <sprite name="Joyful" variant="35">emote.xml</sprite>
+	</emote>
+
+	<emote id="36"
+		name="Clever"
+		effectid="10036"
+		image="graphics/emotes/clever.png"
+		width="30" height="32">
+        <sprite name="Clever" variant="36">emote.xml</sprite>
+	</emote>
+
+	<emote id="37"
+		name="Shy"
+		effectid="10037"
+		image="graphics/emotes/shy.png"
+		width="30" height="32">
+        <sprite name="Shy" variant="37">emote.xml</sprite>
+	</emote>
+
+	<emote id="38"
+		name="Alien"
+		effectid="10038"
+		image="graphics/emotes/alien.png"
+		width="30" height="32">
+        <sprite name="Alien" variant="38">emote.xml</sprite>
+	</emote>
+
+	<emote id="39"
+		name="Curious"
+		effectid="10039"
+		image="graphics/emotes/curious.png"
+		width="30" height="32">
+        <sprite name="Curious" variant="39">emote.xml</sprite>
+	</emote>
+
+	<emote id="40"
+		name="Pain"
+		effectid="10040"
+		image="graphics/emotes/pain.png"
+		width="30" height="32">
+        <sprite name="Pain" variant="40">emote.xml</sprite>
+	</emote>
+
+	<emote id="41"
+		name="Tears"
+		effectid="10041"
+		image="graphics/emotes/tears.png"
+		width="30" height="32">
+        <sprite name="Tears" variant="41">emote.xml</sprite>
+	</emote>
 
 </emotes>
diff --git a/graphics/emotes/afraid.png b/graphics/emotes/afraid.png
new file mode 100755
index 00000000..b79a7a76
--- /dev/null
+++ b/graphics/emotes/afraid.png
diff --git a/graphics/emotes/afraid.xml b/graphics/emotes/afraid.xml
new file mode 100644
index 00000000..939e750f
--- /dev/null
+++ b/graphics/emotes/afraid.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/afraid.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/alien.png b/graphics/emotes/alien.png
new file mode 100755
index 00000000..c6df714f
--- /dev/null
+++ b/graphics/emotes/alien.png
diff --git a/graphics/emotes/alien.xml b/graphics/emotes/alien.xml
new file mode 100644
index 00000000..7b564f19
--- /dev/null
+++ b/graphics/emotes/alien.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/alien.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/angel.png b/graphics/emotes/angel.png
new file mode 100755
index 00000000..1046e9ce
--- /dev/null
+++ b/graphics/emotes/angel.png
diff --git a/graphics/emotes/angel.xml b/graphics/emotes/angel.xml
new file mode 100644
index 00000000..b0fb5cc8
--- /dev/null
+++ b/graphics/emotes/angel.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/angel.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/angry.png b/graphics/emotes/angry.png
new file mode 100755
index 00000000..e98e2c33
--- /dev/null
+++ b/graphics/emotes/angry.png
diff --git a/graphics/emotes/angry.xml b/graphics/emotes/angry.xml
new file mode 100644
index 00000000..caabacea
--- /dev/null
+++ b/graphics/emotes/angry.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/angry.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/blah.png b/graphics/emotes/blah.png
new file mode 100755
index 00000000..5009b534
--- /dev/null
+++ b/graphics/emotes/blah.png
diff --git a/graphics/emotes/blah.xml b/graphics/emotes/blah.xml
new file mode 100644
index 00000000..3aed4137
--- /dev/null
+++ b/graphics/emotes/blah.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/blah.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/blush.png b/graphics/emotes/blush.png
new file mode 100755
index 00000000..76ce80f7
--- /dev/null
+++ b/graphics/emotes/blush.png
diff --git a/graphics/emotes/blush.xml b/graphics/emotes/blush.xml
new file mode 100644
index 00000000..aa5e11ee
--- /dev/null
+++ b/graphics/emotes/blush.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/blush.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/bored.png b/graphics/emotes/bored.png
new file mode 100755
index 00000000..cc225e4b
--- /dev/null
+++ b/graphics/emotes/bored.png
diff --git a/graphics/emotes/bored.xml b/graphics/emotes/bored.xml
new file mode 100644
index 00000000..43deb61a
--- /dev/null
+++ b/graphics/emotes/bored.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/bored.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/bothered.png b/graphics/emotes/bothered.png
new file mode 100755
index 00000000..6b0f05d9
--- /dev/null
+++ b/graphics/emotes/bothered.png
diff --git a/graphics/emotes/bothered.xml b/graphics/emotes/bothered.xml
new file mode 100644
index 00000000..ea0c3f4a
--- /dev/null
+++ b/graphics/emotes/bothered.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/bothered.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/cheerful.png b/graphics/emotes/cheerful.png
new file mode 100755
index 00000000..f5cf2cc5
--- /dev/null
+++ b/graphics/emotes/cheerful.png
diff --git a/graphics/emotes/cheerful.xml b/graphics/emotes/cheerful.xml
new file mode 100644
index 00000000..43f9f10a
--- /dev/null
+++ b/graphics/emotes/cheerful.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/cheerful.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/clever.png b/graphics/emotes/clever.png
new file mode 100755
index 00000000..0cbaf2e9
--- /dev/null
+++ b/graphics/emotes/clever.png
diff --git a/graphics/emotes/clever.xml b/graphics/emotes/clever.xml
new file mode 100644
index 00000000..47ec8f4b
--- /dev/null
+++ b/graphics/emotes/clever.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/clever.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/curious.png b/graphics/emotes/curious.png
new file mode 100755
index 00000000..8fefd6cb
--- /dev/null
+++ b/graphics/emotes/curious.png
diff --git a/graphics/emotes/curious.xml b/graphics/emotes/curious.xml
new file mode 100644
index 00000000..c90164b4
--- /dev/null
+++ b/graphics/emotes/curious.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/curious.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/dead.png b/graphics/emotes/dead.png
new file mode 100755
index 00000000..e3e4fae6
--- /dev/null
+++ b/graphics/emotes/dead.png
diff --git a/graphics/emotes/dead.xml b/graphics/emotes/dead.xml
new file mode 100644
index 00000000..95bed52f
--- /dev/null
+++ b/graphics/emotes/dead.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/dead.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/disgust.png b/graphics/emotes/disgust.png
new file mode 100755
index 00000000..0bfcec54
--- /dev/null
+++ b/graphics/emotes/disgust.png
diff --git a/graphics/emotes/disgust.xml b/graphics/emotes/disgust.xml
new file mode 100644
index 00000000..10744329
--- /dev/null
+++ b/graphics/emotes/disgust.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/disgust.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/empty.png b/graphics/emotes/empty.png
new file mode 100755
index 00000000..12cf2bf6
--- /dev/null
+++ b/graphics/emotes/empty.png
diff --git a/graphics/emotes/empty.xml b/graphics/emotes/empty.xml
new file mode 100644
index 00000000..cc35384e
--- /dev/null
+++ b/graphics/emotes/empty.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/empty.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/evil.png b/graphics/emotes/evil.png
new file mode 100755
index 00000000..c5b42f98
--- /dev/null
+++ b/graphics/emotes/evil.png
diff --git a/graphics/emotes/evil.xml b/graphics/emotes/evil.xml
new file mode 100644
index 00000000..864551c2
--- /dev/null
+++ b/graphics/emotes/evil.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/evil.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/facepalm.png b/graphics/emotes/facepalm.png
new file mode 100755
index 00000000..1f936f95
--- /dev/null
+++ b/graphics/emotes/facepalm.png
diff --git a/graphics/emotes/facepalm.xml b/graphics/emotes/facepalm.xml
new file mode 100644
index 00000000..c10672eb
--- /dev/null
+++ b/graphics/emotes/facepalm.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/facepalm.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/grin.png b/graphics/emotes/grin.png
new file mode 100755
index 00000000..b99b6303
--- /dev/null
+++ b/graphics/emotes/grin.png
diff --git a/graphics/emotes/grin.xml b/graphics/emotes/grin.xml
new file mode 100644
index 00000000..72d3bf7a
--- /dev/null
+++ b/graphics/emotes/grin.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/grin.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/halloween.png b/graphics/emotes/halloween.png
new file mode 100755
index 00000000..bd8bd9d1
--- /dev/null
+++ b/graphics/emotes/halloween.png
diff --git a/graphics/emotes/halloween.xml b/graphics/emotes/halloween.xml
new file mode 100644
index 00000000..c6368431
--- /dev/null
+++ b/graphics/emotes/halloween.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/halloween.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/happy.png b/graphics/emotes/happy.png
new file mode 100755
index 00000000..eb4ff755
--- /dev/null
+++ b/graphics/emotes/happy.png
diff --git a/graphics/emotes/happy.xml b/graphics/emotes/happy.xml
new file mode 100644
index 00000000..a175f881
--- /dev/null
+++ b/graphics/emotes/happy.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/happy.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/headache.png b/graphics/emotes/headache.png
new file mode 100755
index 00000000..46f13e20
--- /dev/null
+++ b/graphics/emotes/headache.png
diff --git a/graphics/emotes/headache.xml b/graphics/emotes/headache.xml
new file mode 100644
index 00000000..74ee14cf
--- /dev/null
+++ b/graphics/emotes/headache.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/headache.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/heart.png b/graphics/emotes/heart.png
new file mode 100755
index 00000000..b1118eb8
--- /dev/null
+++ b/graphics/emotes/heart.png
diff --git a/graphics/emotes/heart.xml b/graphics/emotes/heart.xml
new file mode 100644
index 00000000..079063a7
--- /dev/null
+++ b/graphics/emotes/heart.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/heart.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/joyful.png b/graphics/emotes/joyful.png
new file mode 100755
index 00000000..eb45c5cc
--- /dev/null
+++ b/graphics/emotes/joyful.png
diff --git a/graphics/emotes/joyful.xml b/graphics/emotes/joyful.xml
new file mode 100644
index 00000000..80cc29c8
--- /dev/null
+++ b/graphics/emotes/joyful.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/joyful.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/laugh.png b/graphics/emotes/laugh.png
new file mode 100755
index 00000000..af123ad5
--- /dev/null
+++ b/graphics/emotes/laugh.png
diff --git a/graphics/emotes/laugh.xml b/graphics/emotes/laugh.xml
new file mode 100644
index 00000000..adb26105
--- /dev/null
+++ b/graphics/emotes/laugh.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/laugh.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/love.png b/graphics/emotes/love.png
new file mode 100755
index 00000000..b4cf3826
--- /dev/null
+++ b/graphics/emotes/love.png
diff --git a/graphics/emotes/love.xml b/graphics/emotes/love.xml
new file mode 100644
index 00000000..cc29ff75
--- /dev/null
+++ b/graphics/emotes/love.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/love.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/melancholy.png b/graphics/emotes/melancholy.png
new file mode 100755
index 00000000..30a2c480
--- /dev/null
+++ b/graphics/emotes/melancholy.png
diff --git a/graphics/emotes/melancholy.xml b/graphics/emotes/melancholy.xml
new file mode 100644
index 00000000..d1d755d2
--- /dev/null
+++ b/graphics/emotes/melancholy.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/melancholy.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/meow.png b/graphics/emotes/meow.png
new file mode 100755
index 00000000..01dc9c49
--- /dev/null
+++ b/graphics/emotes/meow.png
diff --git a/graphics/emotes/meow.xml b/graphics/emotes/meow.xml
new file mode 100644
index 00000000..76c2231c
--- /dev/null
+++ b/graphics/emotes/meow.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/meow.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/money.png b/graphics/emotes/money.png
new file mode 100755
index 00000000..ca73ae53
--- /dev/null
+++ b/graphics/emotes/money.png
diff --git a/graphics/emotes/money.xml b/graphics/emotes/money.xml
new file mode 100644
index 00000000..42a02634
--- /dev/null
+++ b/graphics/emotes/money.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/money.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/pain.png b/graphics/emotes/pain.png
new file mode 100755
index 00000000..f2743ea7
--- /dev/null
+++ b/graphics/emotes/pain.png
diff --git a/graphics/emotes/pain.xml b/graphics/emotes/pain.xml
new file mode 100644
index 00000000..38bc2d81
--- /dev/null
+++ b/graphics/emotes/pain.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/pain.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/perturbed.png b/graphics/emotes/perturbed.png
new file mode 100755
index 00000000..8b18197f
--- /dev/null
+++ b/graphics/emotes/perturbed.png
diff --git a/graphics/emotes/perturbed.xml b/graphics/emotes/perturbed.xml
new file mode 100644
index 00000000..9c1bd618
--- /dev/null
+++ b/graphics/emotes/perturbed.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/perturbed.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/rest.png b/graphics/emotes/rest.png
new file mode 100755
index 00000000..231fd267
--- /dev/null
+++ b/graphics/emotes/rest.png
diff --git a/graphics/emotes/rest.xml b/graphics/emotes/rest.xml
new file mode 100644
index 00000000..7379ebda
--- /dev/null
+++ b/graphics/emotes/rest.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/rest.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/sad.png b/graphics/emotes/sad.png
new file mode 100755
index 00000000..3870b0db
--- /dev/null
+++ b/graphics/emotes/sad.png
diff --git a/graphics/emotes/sad.xml b/graphics/emotes/sad.xml
new file mode 100644
index 00000000..8b54b542
--- /dev/null
+++ b/graphics/emotes/sad.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/sad.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/shy.png b/graphics/emotes/shy.png
new file mode 100755
index 00000000..bf1415e8
--- /dev/null
+++ b/graphics/emotes/shy.png
diff --git a/graphics/emotes/shy.xml b/graphics/emotes/shy.xml
new file mode 100644
index 00000000..24b50810
--- /dev/null
+++ b/graphics/emotes/shy.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/shy.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/sleep.png b/graphics/emotes/sleep.png
new file mode 100755
index 00000000..8d8b04e1
--- /dev/null
+++ b/graphics/emotes/sleep.png
diff --git a/graphics/emotes/sleep.xml b/graphics/emotes/sleep.xml
new file mode 100644
index 00000000..89ec18d6
--- /dev/null
+++ b/graphics/emotes/sleep.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/sleep.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/speech.png b/graphics/emotes/speech.png
new file mode 100755
index 00000000..2a1068be
--- /dev/null
+++ b/graphics/emotes/speech.png
diff --git a/graphics/emotes/speech.xml b/graphics/emotes/speech.xml
new file mode 100644
index 00000000..99ca11f2
--- /dev/null
+++ b/graphics/emotes/speech.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/speech.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/surprise.png b/graphics/emotes/surprise.png
new file mode 100755
index 00000000..51ff9202
--- /dev/null
+++ b/graphics/emotes/surprise.png
diff --git a/graphics/emotes/surprise.xml b/graphics/emotes/surprise.xml
new file mode 100644
index 00000000..b2da5b41
--- /dev/null
+++ b/graphics/emotes/surprise.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/surprise.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/suspicious.png b/graphics/emotes/suspicious.png
new file mode 100755
index 00000000..c74409a4
--- /dev/null
+++ b/graphics/emotes/suspicious.png
diff --git a/graphics/emotes/suspicious.xml b/graphics/emotes/suspicious.xml
new file mode 100644
index 00000000..17c85c9b
--- /dev/null
+++ b/graphics/emotes/suspicious.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/suspicious.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/swear.png b/graphics/emotes/swear.png
new file mode 100755
index 00000000..94783f78
--- /dev/null
+++ b/graphics/emotes/swear.png
diff --git a/graphics/emotes/swear.xml b/graphics/emotes/swear.xml
new file mode 100644
index 00000000..f4d45402
--- /dev/null
+++ b/graphics/emotes/swear.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/swear.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/tears.png b/graphics/emotes/tears.png
new file mode 100755
index 00000000..2cb5de81
--- /dev/null
+++ b/graphics/emotes/tears.png
diff --git a/graphics/emotes/tears.xml b/graphics/emotes/tears.xml
new file mode 100644
index 00000000..dacf2686
--- /dev/null
+++ b/graphics/emotes/tears.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/tears.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/tongue.png b/graphics/emotes/tongue.png
new file mode 100755
index 00000000..beda1eaf
--- /dev/null
+++ b/graphics/emotes/tongue.png
diff --git a/graphics/emotes/tongue.xml b/graphics/emotes/tongue.xml
new file mode 100644
index 00000000..47739b60
--- /dev/null
+++ b/graphics/emotes/tongue.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/tongue.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/upset.png b/graphics/emotes/upset.png
new file mode 100755
index 00000000..7fd12127
--- /dev/null
+++ b/graphics/emotes/upset.png
diff --git a/graphics/emotes/upset.xml b/graphics/emotes/upset.xml
new file mode 100644
index 00000000..ea1d5413
--- /dev/null
+++ b/graphics/emotes/upset.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/upset.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/vicious.png b/graphics/emotes/vicious.png
new file mode 100755
index 00000000..111e2022
--- /dev/null
+++ b/graphics/emotes/vicious.png
diff --git a/graphics/emotes/vicious.xml b/graphics/emotes/vicious.xml
new file mode 100644
index 00000000..bd78d137
--- /dev/null
+++ b/graphics/emotes/vicious.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/vicious.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/emotes/wink.png b/graphics/emotes/wink.png
new file mode 100755
index 00000000..1bc3bd10
--- /dev/null
+++ b/graphics/emotes/wink.png
diff --git a/graphics/emotes/wink.xml b/graphics/emotes/wink.xml
new file mode 100644
index 00000000..be4c594d
--- /dev/null
+++ b/graphics/emotes/wink.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x="0" position-y="0" position-z="105" lifetime="5">
+		<emitter>
+			<property name="position-x" value="0"/>
+			<property name="position-y" value="0"/>
+			<property name="position-z" value="-32"/>
+			<property name="lifetime" value="150"/>
+			<property name="fade-out" value="80"/>
+			<property name="gravity" value="-0.005"/>
+			<animation imageset="graphics/emotes/wink.png" width="30" height="32">
+				<frame index="0"/>
+			</animation>
+			<property name="follow-parent"/>
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/particles/emotes/angel.png b/graphics/particles/emotes/angel.png
deleted file mode 100644
index 043d0755..00000000
--- a/graphics/particles/emotes/angel.png
+++ /dev/null
diff --git a/graphics/particles/emotes/blah.png b/graphics/particles/emotes/blah.png
deleted file mode 100644
index 3eae88a2..00000000
--- a/graphics/particles/emotes/blah.png
+++ /dev/null
diff --git a/graphics/particles/emotes/blush.png b/graphics/particles/emotes/blush.png
deleted file mode 100644
index 22172ae0..00000000
--- a/graphics/particles/emotes/blush.png
+++ /dev/null
diff --git a/graphics/particles/emotes/disgust.png b/graphics/particles/emotes/disgust.png
deleted file mode 100644
index 9965f89d..00000000
--- a/graphics/particles/emotes/disgust.png
+++ /dev/null
diff --git a/graphics/particles/emotes/emote-angel.particle.xml b/graphics/particles/emotes/emote-angel.particle.xml
deleted file mode 100644
index a4bb1b53..00000000
--- a/graphics/particles/emotes/emote-angel.particle.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<effect>
-	<particle
-		position-x = "0"
-		position-y = "0"
-		position-z = "96"
-		lifetime = "1"
-		>
-		<emitter>
-			<property name="position-x" value="0"/>
-			<property name="position-y" value="0"/>
-			<property name="position-z" value="-32"/>
-			<property name="lifetime" value="80"/>
-			<property name="fade-out" value="50" />
-			<property name="gravity" value="-0.02" />
-
-			<animation imageset="graphics/particles/emotes/angel.png" width="30" height="32">
-				<frame index="0" />
-			</animation>
-			<property name="follow-parent" />
-		</emitter>
-	</particle>
-</effect>
diff --git a/graphics/particles/emotes/emote-blah.particle.xml b/graphics/particles/emotes/emote-blah.particle.xml
deleted file mode 100644
index 38cb327a..00000000
--- a/graphics/particles/emotes/emote-blah.particle.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<effect>
-	<particle
-		position-x = "0"
-		position-y = "0"
-		position-z = "96"
-		lifetime = "1"
-		>
-		<emitter>
-			<property name="position-x" value="0"/>
-			<property name="position-y" value="0"/>
-			<property name="position-z" value="-32"/>
-			<property name="lifetime" value="80"/>
-			<property name="fade-out" value="50" />
-			<property name="gravity" value="-0.02" />
-
-			<animation imageset="graphics/particles/emotes/blah.png" width="30" height="32">
-				<frame index="0" />
-			</animation>
-			<property name="follow-parent" />
-		</emitter>
-	</particle>
-</effect>
diff --git a/graphics/particles/emotes/emote-blush.particle.xml b/graphics/particles/emotes/emote-blush.particle.xml
deleted file mode 100644
index 11d2689d..00000000
--- a/graphics/particles/emotes/emote-blush.particle.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<effect>
-	<particle
-		position-x = "0"
-		position-y = "0"
-		position-z = "96"
-		lifetime = "1"
-		>
-		<emitter>
-			<property name="position-x" value="0"/>
-			<property name="position-y" value="0"/>
-			<property name="position-z" value="-32"/>
-			<property name="lifetime" value="80"/>
-			<property name="fade-out" value="50" />
-			<property name="gravity" value="-0.02" />
-
-			<animation imageset="graphics/particles/emotes/blush.png" width="30" height="32">
-				<frame index="0" />
-			</animation>
-			<property name="follow-parent" />
-		</emitter>
-	</particle>
-</effect>
diff --git a/graphics/particles/emotes/emote-disgust.particle.xml b/graphics/particles/emotes/emote-disgust.particle.xml
deleted file mode 100644
index b04d18dd..00000000
--- a/graphics/particles/emotes/emote-disgust.particle.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<effect>
-	<particle
-		position-x = "0"
-		position-y = "0"
-		position-z = "96"
-		lifetime = "1"
-		>
-		<emitter>
-			<property name="position-x" value="0"/>
-			<property name="position-y" value="0"/>
-			<property name="position-z" value="-32"/>
-			<property name="lifetime" value="80"/>
-			<property name="fade-out" value="50" />
-			<property name="gravity" value="-0.02" />
-
-			<animation imageset="graphics/particles/emotes/disgust.png" width="30" height="32">
-				<frame index="0" />
-			</animation>
-			<property name="follow-parent" />
-		</emitter>
-	</particle>
-</effect>
diff --git a/graphics/particles/emotes/emote-evil.particle.xml b/graphics/particles/emotes/emote-evil.particle.xml
deleted file mode 100644
index 433aef30..00000000
--- a/graphics/particles/emotes/emote-evil.particle.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<effect>
-	<particle
-		position-x = "0"
-		position-y = "0"
-		position-z = "96"
-		lifetime = "1"
-		>
-		<emitter>
-			<property name="position-x" value="0"/>
-			<property name="position-y" value="0"/>
-			<property name="position-z" value="-32"/>
-			<property name="lifetime" value="80"/>
-			<property name="fade-out" value="50" />
-			<property name="gravity" value="-0.02" />
-
-			<animation imageset="graphics/particles/emotes/evil.png" width="30" height="32">
-				<frame index="0" />
-			</animation>
-			<property name="follow-parent" />
-		</emitter>
-	</particle>
-</effect>
diff --git a/graphics/particles/emotes/emote-grin.particle.xml b/graphics/particles/emotes/emote-grin.particle.xml
deleted file mode 100644
index 5c50aa98..00000000
--- a/graphics/particles/emotes/emote-grin.particle.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<effect>
-	<particle
-		position-x = "0"
-		position-y = "0"
-		position-z = "96"
-		lifetime = "1"
-		>
-		<emitter>
-			<property name="position-x" value="0"/>
-			<property name="position-y" value="0"/>
-			<property name="position-z" value="-32"/>
-			<property name="lifetime" value="80"/>
-			<property name="fade-out" value="50" />
-			<property name="gravity" value="-0.02" />
-
-			<animation imageset="graphics/particles/emotes/grin.png" width="30" height="32">
-				<frame index="0" />
-			</animation>
-			<property name="follow-parent" />
-		</emitter>
-	</particle>
-</effect>
diff --git a/graphics/particles/emotes/emote-happy.particle.xml b/graphics/particles/emotes/emote-happy.particle.xml
deleted file mode 100644
index fa43997f..00000000
--- a/graphics/particles/emotes/emote-happy.particle.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<effect>
-	<particle
-		position-x = "0"
-		position-y = "0"
-		position-z = "96"
-		lifetime = "1"
-		>
-		<emitter>
-			<property name="position-x" value="0"/>
-			<property name="position-y" value="0"/>
-			<property name="position-z" value="-32"/>
-			<property name="lifetime" value="80"/>
-			<property name="fade-out" value="50" />
-			<property name="gravity" value="-0.02" />
-
-			<animation imageset="graphics/particles/emotes/happy.png" width="30" height="32">
-				<frame index="0" />
-			</animation>
-			<property name="follow-parent" />
-		</emitter>
-	</particle>
-</effect>
diff --git a/graphics/particles/emotes/emote-perturbed.particle.xml b/graphics/particles/emotes/emote-perturbed.particle.xml
deleted file mode 100644
index 47f92e30..00000000
--- a/graphics/particles/emotes/emote-perturbed.particle.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<effect>
-	<particle
-		position-x = "0"
-		position-y = "0"
-		position-z = "96"
-		lifetime = "1"
-		>
-		<emitter>
-			<property name="position-x" value="0"/>
-			<property name="position-y" value="0"/>
-			<property name="position-z" value="-32"/>
-			<property name="lifetime" value="80"/>
-			<property name="fade-out" value="50" />
-			<property name="gravity" value="-0.02" />
-
-			<animation imageset="graphics/particles/emotes/perturbed.png" width="30" height="32">
-				<frame index="0" />
-			</animation>
-			<property name="follow-parent" />
-		</emitter>
-	</particle>
-</effect>
diff --git a/graphics/particles/emotes/emote-sad.particle.xml b/graphics/particles/emotes/emote-sad.particle.xml
deleted file mode 100644
index 0e0b7dc8..00000000
--- a/graphics/particles/emotes/emote-sad.particle.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<effect>
-	<particle
-		position-x = "0"
-		position-y = "0"
-		position-z = "96"
-		lifetime = "1"
-		>
-		<emitter>
-			<property name="position-x" value="0"/>
-			<property name="position-y" value="0"/>
-			<property name="position-z" value="-32"/>
-			<property name="lifetime" value="80"/>
-			<property name="fade-out" value="50" />
-			<property name="gravity" value="-0.02" />
-
-			<animation imageset="graphics/particles/emotes/sad.png" width="30" height="32">
-				<frame index="0" />
-			</animation>
-			<property name="follow-parent" />
-		</emitter>
-	</particle>
-</effect>
diff --git a/graphics/particles/emotes/emote-speech.particle.xml b/graphics/particles/emotes/emote-speech.particle.xml
deleted file mode 100644
index 7d6350b0..00000000
--- a/graphics/particles/emotes/emote-speech.particle.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<effect>
-	<particle
-		position-x = "0"
-		position-y = "0"
-		position-z = "96"
-		lifetime = "1"
-		>
-		<emitter>
-			<property name="position-x" value="0"/>
-			<property name="position-y" value="0"/>
-			<property name="position-z" value="-32"/>
-			<property name="lifetime" value="80"/>
-			<property name="fade-out" value="50" />
-			<property name="gravity" value="-0.02" />
-
-			<animation imageset="graphics/particles/emotes/speech.png" width="30" height="32">
-				<frame index="0" />
-			</animation>
-			<property name="follow-parent" />
-		</emitter>
-	</particle>
-</effect>
diff --git a/graphics/particles/emotes/emote-surprise.particle.xml b/graphics/particles/emotes/emote-surprise.particle.xml
deleted file mode 100644
index 29498c8f..00000000
--- a/graphics/particles/emotes/emote-surprise.particle.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<effect>
-	<particle
-		position-x = "0"
-		position-y = "0"
-		position-z = "96"
-		lifetime = "1"
-		>
-		<emitter>
-			<property name="position-x" value="0"/>
-			<property name="position-y" value="0"/>
-			<property name="position-z" value="-32"/>
-			<property name="lifetime" value="80"/>
-			<property name="fade-out" value="50" />
-			<property name="gravity" value="-0.02" />
-
-			<animation imageset="graphics/particles/emotes/surprise.png" width="30" height="32">
-				<frame index="0" />
-			</animation>
-			<property name="follow-parent" />
-		</emitter>
-	</particle>
-</effect>
diff --git a/graphics/particles/emotes/emote-tongue.particle.xml b/graphics/particles/emotes/emote-tongue.particle.xml
deleted file mode 100644
index 2796ac6c..00000000
--- a/graphics/particles/emotes/emote-tongue.particle.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<effect>
-	<particle
-		position-x = "0"
-		position-y = "0"
-		position-z = "96"
-		lifetime = "1"
-		>
-		<emitter>
-			<property name="position-x" value="0"/>
-			<property name="position-y" value="0"/>
-			<property name="position-z" value="-32"/>
-			<property name="lifetime" value="80"/>
-			<property name="fade-out" value="50" />
-			<property name="gravity" value="-0.02" />
-
-			<animation imageset="graphics/particles/emotes/tongue.png" width="30" height="32">
-				<frame index="0" />
-			</animation>
-			<property name="follow-parent" />
-		</emitter>
-	</particle>
-</effect>
diff --git a/graphics/particles/emotes/emote-upset.particle.xml b/graphics/particles/emotes/emote-upset.particle.xml
deleted file mode 100644
index 4b10d9f2..00000000
--- a/graphics/particles/emotes/emote-upset.particle.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<effect>
-	<particle
-		position-x = "0"
-		position-y = "0"
-		position-z = "96"
-		lifetime = "1"
-		>
-		<emitter>
-			<property name="position-x" value="0"/>
-			<property name="position-y" value="0"/>
-			<property name="position-z" value="-32"/>
-			<property name="lifetime" value="80"/>
-			<property name="fade-out" value="50" />
-			<property name="gravity" value="-0.02" />
-
-			<animation imageset="graphics/particles/emotes/upset.png" width="30" height="32">
-				<frame index="0" />
-			</animation>
-			<property name="follow-parent" />
-		</emitter>
-	</particle>
-</effect>
diff --git a/graphics/particles/emotes/emote-wink.particle.xml b/graphics/particles/emotes/emote-wink.particle.xml
deleted file mode 100644
index b217a649..00000000
--- a/graphics/particles/emotes/emote-wink.particle.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<effect>
-	<particle
-		position-x = "0"
-		position-y = "0"
-		position-z = "96"
-		lifetime = "1"
-		>
-		<emitter>
-			<property name="position-x" value="0"/>
-			<property name="position-y" value="0"/>
-			<property name="position-z" value="-32"/>
-			<property name="lifetime" value="80"/>
-			<property name="fade-out" value="50" />
-			<property name="gravity" value="-0.02" />
-
-			<animation imageset="graphics/particles/emotes/wink.png" width="30" height="32">
-				<frame index="0" />
-			</animation>
-			<property name="follow-parent" />
-		</emitter>
-	</particle>
-</effect>
diff --git a/graphics/particles/emotes/evil.png b/graphics/particles/emotes/evil.png
deleted file mode 100644
index 7c417ec6..00000000
--- a/graphics/particles/emotes/evil.png
+++ /dev/null
diff --git a/graphics/particles/emotes/grin.png b/graphics/particles/emotes/grin.png
deleted file mode 100644
index 0c21cfe8..00000000
--- a/graphics/particles/emotes/grin.png
+++ /dev/null
diff --git a/graphics/particles/emotes/happy.png b/graphics/particles/emotes/happy.png
deleted file mode 100644
index 8ca2930e..00000000
--- a/graphics/particles/emotes/happy.png
+++ /dev/null
diff --git a/graphics/particles/emotes/perturbed.png b/graphics/particles/emotes/perturbed.png
deleted file mode 100644
index 0a33e0ad..00000000
--- a/graphics/particles/emotes/perturbed.png
+++ /dev/null
diff --git a/graphics/particles/emotes/sad.png b/graphics/particles/emotes/sad.png
deleted file mode 100644
index 3ceb3caf..00000000
--- a/graphics/particles/emotes/sad.png
+++ /dev/null
diff --git a/graphics/particles/emotes/speech.png b/graphics/particles/emotes/speech.png
deleted file mode 100644
index 72044719..00000000
--- a/graphics/particles/emotes/speech.png
+++ /dev/null
diff --git a/graphics/particles/emotes/surprise.png b/graphics/particles/emotes/surprise.png
deleted file mode 100644
index e1649a63..00000000
--- a/graphics/particles/emotes/surprise.png
+++ /dev/null
diff --git a/graphics/particles/emotes/tongue.png b/graphics/particles/emotes/tongue.png
deleted file mode 100644
index 0d5bc959..00000000
--- a/graphics/particles/emotes/tongue.png
+++ /dev/null
diff --git a/graphics/particles/emotes/upset.png b/graphics/particles/emotes/upset.png
deleted file mode 100644
index b2f0ce2b..00000000
--- a/graphics/particles/emotes/upset.png
+++ /dev/null
diff --git a/graphics/particles/emotes/wink.png b/graphics/particles/emotes/wink.png
deleted file mode 100644
index 13488bb8..00000000
--- a/graphics/particles/emotes/wink.png
+++ /dev/null
diff --git a/graphics/sprites/emote.png b/graphics/sprites/emote.png
new file mode 100755
index 00000000..6698c91c
--- /dev/null
+++ b/graphics/sprites/emote.png
diff --git a/graphics/sprites/emote.xml b/graphics/sprites/emote.xml
index 07a8a5c9..37b1b20f 100644
--- a/graphics/sprites/emote.xml
+++ b/graphics/sprites/emote.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
-<sprite variants="15" variant_offset="1">
-	<imageset name="base" src="graphics/sprites/emotions.png" width="30" height="32" />
+<sprite variants="42" variant_offset="1">
+	<imageset name="emotes" src="graphics/sprites/emote.png" width="30" height="32"/>
 
-	<action name="stand" imageset="base">
+	<action name="stand" imageset="emotes">
 		<animation direction="default">
-			<frame index="0" />
+			<frame index="0"/>
 		</animation>
 	</action>
+
 </sprite>
diff --git a/graphics/sprites/emotions.png b/graphics/sprites/emotions.png
deleted file mode 100644
index 91babc8c..00000000
--- a/graphics/sprites/emotions.png
+++ /dev/null