From 5401796a5fd65928a1961830673ebb2cc265cb82 Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Thu, 20 Feb 2020 02:40:34 -0500 Subject: [PATCH] corrections --- code/modules/projectiles/ammunition/caseless/arrow.dm | 2 +- code/modules/projectiles/guns/ballistic/bow.dm | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/code/modules/projectiles/ammunition/caseless/arrow.dm b/code/modules/projectiles/ammunition/caseless/arrow.dm index 57f47e2ad9..df4941aa6a 100644 --- a/code/modules/projectiles/ammunition/caseless/arrow.dm +++ b/code/modules/projectiles/ammunition/caseless/arrow.dm @@ -10,7 +10,7 @@ /obj/item/ammo_casing/caseless/arrow/ashen name = "ashen arrow" desc = "Fire harderned wooden arrow." - icon_state = "asharrow" + icon_state = "ashenarrow" projectile_type = /obj/item/projectile/bullet/reusable/arrow/ashen /obj/item/ammo_casing/caseless/arrow/bone diff --git a/code/modules/projectiles/guns/ballistic/bow.dm b/code/modules/projectiles/guns/ballistic/bow.dm index 540ea722b9..0fc181f71c 100644 --- a/code/modules/projectiles/guns/ballistic/bow.dm +++ b/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