Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12

code/modules/paperwork/photography.dm

@@ -127,6 +127,14 @@
 /obj/item/device/camera/attack(mob/living/carbon/human/M as mob, mob/user as mob)
 	return
 
+/obj/item/device/camera/attack_self(mob/user as mob)
+	on = !on
+	if(on)
+		src.icon_state = "camera"
+	else
+		src.icon_state = "camera_off"
+	user << "You switch the camera [on ? "on" : "off"]."
+	return
 
 /obj/item/device/camera/attackby(obj/item/I as obj, mob/user as mob)
 	if(istype(I, /obj/item/device/camera_film))

code/modules/projectiles/guns/projectile.dm

@@ -37,8 +37,8 @@
 	if(isnull(AC) || !istype(AC))
 		return 0
 	AC.loc = get_turf(src) //Eject casing onto ground.
-	AC.desc += " This one is spent."	//descriptions are magic
 	if(AC.BB)
+		AC.desc += " This one is spent."	//descriptions are magic - only when there's a projectile in the casing
 		in_chamber = AC.BB //Load projectile into chamber.
 		AC.BB.loc = src //Set projectile loc to gun.
 		return 1