Merge pull request #8862 from Ilysen/no-more-running

small lil pair of bugfixes

code/modules/emotes/emote_mob.dm

@@ -84,9 +84,6 @@
 
 	next_emote = world.time + use_emote.emote_delay
 	use_emote.do_emote(src, message)
-	for (var/obj/item/implant/I in src)
-		if (I.implanted)
-			I.trigger(act, src)
 
 #undef EMOTE_REFRESH_SPAM_COOLDOWN
 
@@ -204,6 +201,13 @@
 
 
 // Specific mob type exceptions below.
+/mob/living/carbon/human/emote(act, m_type, message)
+	. = ..()
+	for (var/obj/item/organ/external/organ in src.organs)
+		for (var/obj/item/implant/I in organ.implants)
+			if (I.implanted)
+				I.trigger(act, src)
+
 /mob/living/silicon/ai/emote(var/act, var/type, var/message)
 	var/obj/machinery/hologram/holopad/T = src.holo
 	if(T && T.masters[src]) //Is the AI using a holopad?

tgui/packages/tgui/interfaces/BodyScanner.js

@@ -15,20 +15,9 @@ const abnormalities = [
     + ' possibly cancerous. Surgical removal is recommended.'],
   ['hasVirus', 'bad', occupant => 'Viral pathogen detected in blood stream.'],
   ['blind', 'average', occupant => 'Cataracts detected.'],
-  ['colourblind', 'average', occupant => 
+  ['colourblind', 'average', occupant =>
     'Photoreceptor abnormalities detected.'],
   ['nearsighted', 'average', occupant => 'Retinal misalignment detected.'],
-  /* VOREStation Add */
-  ['humanPrey', 'average', occupant => {
-    return 'Foreign Humanoid(s) detected: ' + occupant.humanPrey;
-  }],
-  ['livingPrey', 'average', occupant => {
-    return 'Foreign Creature(s) detected: ' + occupant.livingPrey;
-  }],
-  ['objectPrey', 'average', occupant => {
-    return 'Foreign Object(s) detected: ' + occupant.objectPrey;
-  }],
-  /* VOREStation Add End */
 ];
 
 const damages = [
@@ -182,12 +171,6 @@ const BodyScannerMainOccupant = (props, context) => {
             value={round(occupant.blood.percent, 0)}
           />%)
         </LabeledList.Item>
-        {/* VOREStation Add */}
-        <LabeledList.Item label="Weight">
-          {round(data.occupant.weight) + "lbs, "
-            + round(data.occupant.weight/2.20463) + "kgs"}
-        </LabeledList.Item>
-        {/* VOREStation Add End */}
       </LabeledList>
     </Section>
   );
@@ -267,13 +250,6 @@ const BodyScannerMainAbnormalities = props => {
     || occupant.nearsighted
     || occupant.hasVirus;
 
-  /* VOREStation Add */
-  hasAbnormalities = hasAbnormalities
-    || occupant.humanPrey
-    || occupant.livingPrey
-    || occupant.objectPrey;
-  /* VOREStation Add End */
-
   if (!hasAbnormalities) {
     return (
       <Section title="Abnormalities">