Merge branch 'master' into ui_plane

code/modules/flufftext/Hallucination.dm

@@ -696,7 +696,7 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite
 					halitem.plane = HUD_PLANE
 					switch(rand(1,6))
 						if(1) //revolver
-							halitem.icon = 'icons/obj/gun.dmi'
+							halitem.icon = 'icons/obj/guns/projectile.dmi'
 							halitem.icon_state = "revolver"
 							halitem.name = "Revolver"
 						if(2) //c4
@@ -781,4 +781,4 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite
 					if(client) client.images += halbody
 					spawn(rand(50,80)) //Only seen for a brief moment.
 						if(client) client.images -= halbody
-						halbody = null
+						halbody = null