Merge remote-tracking branch 'citadel/master' into mobility_flags

code/modules/projectiles/ammunition/caseless/arrow.dm

@@ -9,18 +9,18 @@
 
 /obj/item/ammo_casing/caseless/arrow/ashen
 	name = "ashen arrow"
-	desc = "Fire harderned wooden arrow."
-	icon_state = "asharrow"
+	desc = "An arrow made of wood, hardened by fire."
+	icon_state = "ashenarrow"
 	projectile_type = /obj/item/projectile/bullet/reusable/arrow/ashen
 
 /obj/item/ammo_casing/caseless/arrow/bone
 	name = "bone arrow"
-	desc = "Arrow made of bone and sinew. The tip is sharp enough to pierce into a goliath plate."
+	desc = "An arrow made of bone and sinew. The tip is sharp enough to pierce through a goliath plate."
 	icon_state = "bonearrow"
 	projectile_type = /obj/item/projectile/bullet/reusable/arrow/bone
 
 /obj/item/ammo_casing/caseless/arrow/bronze
 	name = "bronze arrow"
-	desc = "Bronze tipped arrow."
+	desc = "An arrow made of wood, tipped with bronze. The tip is dense enough to provide some armor penetration."
 	icon_state = "bronzearrow"
 	projectile_type = /obj/item/projectile/bullet/reusable/arrow/bronze

code/modules/projectiles/guns/ballistic/bow.dm

@@ -22,11 +22,9 @@
 /obj/item/gun/ballistic/bow/chamber_round()
 	chambered = magazine.get_round(1)
 
-/obj/item/gun/ballistic/bow/afterattack()
-	. = ..()
-	if (chambered)
-		chambered = null
-		magazine.get_round(0)
+/obj/item/gun/ballistic/bow/process_chamber()
+	chambered = null
+	magazine.get_round(0)
 	update_icon()
 
 /obj/item/gun/ballistic/bow/attack_self(mob/living/user)
@@ -47,7 +45,7 @@
 		update_icon()
 
 /obj/item/gun/ballistic/bow/update_icon()
-	icon_state = "bow_[get_ammo() ? (chambered ? "firing" : "loaded") : "unloaded"]"
+	icon_state = "[initial(icon_state)]_[get_ammo() ? (chambered ? "firing" : "loaded") : "unloaded"]"
 
 /obj/item/gun/ballistic/bow/can_shoot()
 	return chambered