diff --git a/code/modules/mob/screen.dm b/code/modules/mob/screen.dm
index 8da55e7db69..0633d0390b7 100644
--- a/code/modules/mob/screen.dm
+++ b/code/modules/mob/screen.dm
@@ -550,10 +550,14 @@
/obj/screen/inventory/attack_hand(mob/user as mob)
user.attack_ui(slot_id)
+ user.update_inv_l_hand(0)
+ user.update_inv_r_hand()
return
/obj/screen/inventory/attack_paw(mob/user as mob)
user.attack_ui(slot_id)
+ user.update_inv_l_hand(0)
+ user.update_inv_r_hand()
return
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index c02ddd62e35..5a625e21791 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -417,7 +417,7 @@ var/global/list/uneatable = list(
/obj/machinery/singularity/proc/mezzer()
for(var/mob/living/carbon/M in oviewers(8, src))
- if(istype(M,/mob/living/carbon/human))
+ if(istype(M,/mob/living/carbon/human) && M.stat == CONSCIOUS)
if(istype(M:glasses,/obj/item/clothing/glasses/meson))
M << "\blue You look directly into The [src.name], good thing you had your protective eyewear on!"
return
diff --git a/html/changelog.html b/html/changelog.html
index 96ebde7e1b7..3f78976c0e6 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -36,7 +36,9 @@
Coders: TLE, NEO, Errorage, muskets, veryinky, Skie, Noise, Numbers, Agouri, Noka, Urist McDorf, Uhangi, Darem, Mport, rastaf0, Doohl, Superxpdude, Rockdtben, ConstantA, Petethegoat, Kor, Polymorph, Carn, Nodrak, Donkie, Sieve, Giacom
Spriters: Agouri, Cheridan, Cruazy Guest, Deeaych, Deuryn, Matty406, Microwave, ShiftyEyesShady, Skie, Uhangi, Veyveyr, Petethegoat, Kor, Ricotez, Ausops, TankNut
Sounds: Skie, Lasty/Vinyl
- Thanks to: Baystation 12, CDK Station devs, GoonStation devs, the original SpaceStation developers and Invisty for the title image
+ Thanks to: Baystation 12, CDK Station devs, GoonStation devs, the original SpaceStation developers and Invisty for the title image
+
Have a bug to report? Visit our Issue Tracker.
+ Please ensure that the bug has not already been reported and use the template provided.
@@ -47,10 +49,10 @@ should be listed in the changelog upon commit tho. Thanks. -->
-
August 21, 2012
+
August 23, 2012
Nodrak updated:
- - Have a bug to report? Visit: http://code.google.com/p/tgstation13/issues/list
Please ensure that the bug has not already been reported and use the template provided.
+ - In-hand sprites once again update correctly when equipping items.