diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index c7ffbd572e..3898b48d47 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -15,7 +15,8 @@
 	name = "card"
 	desc = "Does card things."
 	icon = 'icons/obj/card.dmi'
-	w_class = 1.0
+	w_class = 1
+	slot_flags = SLOT_EARS
 	var/associated_account_number = 0
 
 	var/list/files = list(  )
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index e197939d1b..606c389ffa 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -508,9 +508,14 @@
 /mob/new_player/is_ready()
 	return ready && ..()
 
+// Prevents lobby players from seeing say, even with ghostears
 /mob/new_player/hear_say(var/message, var/verb = "says", var/datum/language/language = null, var/alt_name = "",var/italics = 0, var/mob/speaker = null)
 	return
 
+// Prevents lobby players from seeing emotes, even with ghosteyes
+/mob/new_player/show_message(msg, type, alt, alt_type)
+	return
+
 /mob/new_player/hear_radio()
 	return
 
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index 9caf66af4b..15471da2a2 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -124,6 +124,13 @@
 	magazine_type = /obj/item/ammo_magazine/a50
 	allowed_magazines = list(/obj/item/ammo_magazine/a50)
 
+/obj/item/weapon/gun/projectile/deagle/update_icon()
+	..()
+	if(ammo_magazine)
+		icon_state = "[initial(icon_state)]"
+	else
+		icon_state = "[initial(icon_state)]-e"
+
 /obj/item/weapon/gun/projectile/deagle/gold
 	desc = "A gold plated gun folded over a million times by superior martian gunsmiths. Uses .50 AE rounds."
 	icon_state = "deagleg"
diff --git a/html/changelog.html b/html/changelog.html
index 1723a560d0..d292d520ff 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,6 +53,40 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">14 June 2016</h2>
+			<h3 class="author">Arokha updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds video-calls on communicators for existing calls</li>
+				<li class="rscadd">Adds a 'decline' to incoming communicator calls</li>
+				<li class="rscadd">New wallets that let you color them how you want</li>
+				<li class="bugfix">Fixes communicators being able to hear speech</li>
+				<li class="bugfix">Fixes deadcalls to communicators</li>
+				<li class="bugfix">Fixed dropping head/foot/glove items on limb loss</li>
+				<li class="bugfix">Suit coolers inside mecha now work</li>
+				<li class="bugfix">Fixed printing '1' to world over and over</li>
+				<li class="bugfix">Made mech tracking beacon constructable again</li>
+				<li class="tweak">Change how emotes and LOOC propogate to nearby people</li>
+				<li class="tweak">Rewrote how get_mobs_and_objs_in_view_fast works</li>
+				<li class="tweak">Can now see through the red external airlock doors</li>
+			</ul>
+			<h3 class="author">Datraen updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Adds a chance for slimes to get mutation toxin for creation of prometheans (40%).</li>
+				<li class="bugfix">Simple animals outside of the hostile subtype won't follow you as a zombie.</li>
+				<li class="bugfix">Xeno hostility is more apparent now.</li>
+				<li class="bugfix">Slime cores can no longer create twice as many slimes through an exploit.</li>
+			</ul>
+			<h3 class="author">GinjaNinja32 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Rewrote drinking glasses. There are now eight types of glass, and drink appearance is based on color and the type of glass you put it in.</li>
+				<li class="rscadd">There are now 'glass extras' you can add to drinks. Straws, drink sticks, and fruit slices (yes, all of them) all work. You can add up to two extras per glass. Add extras by clicking the glass with the extra, remove by clicking the glass with an empty hand while it's in your other hand.</li>
+				<li class="rscadd">Adding 'fizzy' things (soda water, cola, etc) or ice to a drink will make it be fizzy or have ice floating in it.</li>
+			</ul>
+			<h3 class="author">Yoshax updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Everything produced in Robotics is now 25% cheaper to produce.</li>
+			</ul>
+
 			<h2 class="date">08 June 2016</h2>
 			<h3 class="author">Yoshax updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index f556dac684..0ab77df4c5 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2388,3 +2388,34 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       cabinets, consoles, fax machines, etc. This applies to all bullets.
   - maptweak: The research outpost toxins department now has reinforced phoron windows.
   - bugfix: Spears now do their correct damage instead of doing around half.
+2016-06-14:
+  Arokha:
+  - rscadd: Adds video-calls on communicators for existing calls
+  - rscadd: Adds a 'decline' to incoming communicator calls
+  - rscadd: New wallets that let you color them how you want
+  - bugfix: Fixes communicators being able to hear speech
+  - bugfix: Fixes deadcalls to communicators
+  - bugfix: Fixed dropping head/foot/glove items on limb loss
+  - bugfix: Suit coolers inside mecha now work
+  - bugfix: Fixed printing '1' to world over and over
+  - bugfix: Made mech tracking beacon constructable again
+  - tweak: Change how emotes and LOOC propogate to nearby people
+  - tweak: Rewrote how get_mobs_and_objs_in_view_fast works
+  - tweak: Can now see through the red external airlock doors
+  Datraen:
+  - tweak: Adds a chance for slimes to get mutation toxin for creation of prometheans
+      (40%).
+  - bugfix: Simple animals outside of the hostile subtype won't follow you as a zombie.
+  - bugfix: Xeno hostility is more apparent now.
+  - bugfix: Slime cores can no longer create twice as many slimes through an exploit.
+  GinjaNinja32:
+  - rscadd: Rewrote drinking glasses. There are now eight types of glass, and drink
+      appearance is based on color and the type of glass you put it in.
+  - rscadd: There are now 'glass extras' you can add to drinks. Straws, drink sticks,
+      and fruit slices (yes, all of them) all work. You can add up to two extras per
+      glass. Add extras by clicking the glass with the extra, remove by clicking the
+      glass with an empty hand while it's in your other hand.
+  - rscadd: Adding 'fizzy' things (soda water, cola, etc) or ice to a drink will make
+      it be fizzy or have ice floating in it.
+  Yoshax:
+  - tweak: Everything produced in Robotics is now 25% cheaper to produce.
diff --git a/html/changelogs/Datraen-Xenobio2Update7.yml b/html/changelogs/Datraen-Xenobio2Update7.yml
deleted file mode 100644
index 5c7739f344..0000000000
--- a/html/changelogs/Datraen-Xenobio2Update7.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-author: Datraen
-
-delete-after: True
-
-changes: 
-  - tweak: "Adds a chance for slimes to get mutation toxin for creation of prometheans (40%)."
-  - bugfix: "Simple animals outside of the hostile subtype won't follow you as a zombie."
-  - bugfix: "Xeno hostility is more apparent now."
-  - bugfix: "Slime cores can no longer create twice as many slimes through an exploit."
diff --git a/html/changelogs/GinjaNinja32-newdrinks.yml b/html/changelogs/GinjaNinja32-newdrinks.yml
deleted file mode 100644
index 3c685a553a..0000000000
--- a/html/changelogs/GinjaNinja32-newdrinks.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: GinjaNinja32
-delete-after: True
-changes:
-  - rscadd: "Rewrote drinking glasses. There are now eight types of glass, and drink appearance is based on color and the type of glass you put it in."
-  - rscadd: "There are now 'glass extras' you can add to drinks. Straws, drink sticks, and fruit slices (yes, all of them) all work. You can add up to two extras per glass. Add extras by clicking the glass with the extra, remove by clicking the glass with an empty hand while it's in your other hand."
-  - rscadd: "Adding 'fizzy' things (soda water, cola, etc) or ice to a drink will make it be fizzy or have ice floating in it."
diff --git a/html/changelogs/Yoshax-Roboticsstuff.yml b/html/changelogs/Yoshax-Roboticsstuff.yml
deleted file mode 100644
index 8a3033a956..0000000000
--- a/html/changelogs/Yoshax-Roboticsstuff.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes: 
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name.  
-author: Yoshax
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - tweak: "Everything produced in Robotics is now 25% cheaper to produce."
diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi
index 453baecbc0..81ad5fa391 100644
Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ