From 146ffcd2bd9e74b89c520bf1f17d48e502488eff Mon Sep 17 00:00:00 2001 From: The0bserver Date: Wed, 21 Apr 2021 09:58:08 -0400 Subject: [PATCH] tweaks --- .../projectiles/boxes_magazines/internal/derringer.dm | 11 ----------- code/modules/projectiles/guns/ballistic/derringer.dm | 3 ++- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/code/modules/projectiles/boxes_magazines/internal/derringer.dm b/code/modules/projectiles/boxes_magazines/internal/derringer.dm index e052e0badd..dad8386178 100644 --- a/code/modules/projectiles/boxes_magazines/internal/derringer.dm +++ b/code/modules/projectiles/boxes_magazines/internal/derringer.dm @@ -3,17 +3,6 @@ ammo_type = /obj/item/ammo_casing/c38 caliber = "38" max_ammo = 2 - multiload = 0 - -/obj/item/ammo_box/magazine/internal/derringer/ammo_count(countempties = 1) - if (!countempties) - var/boolets = 0 - for(var/obj/item/ammo_casing/bullet in stored_ammo) - if(bullet.BB) - boolets++ - return boolets - else - return ..() /obj/item/ammo_box/magazine/internal/derringer/a357 name = "\improper derringer muzzle" diff --git a/code/modules/projectiles/guns/ballistic/derringer.dm b/code/modules/projectiles/guns/ballistic/derringer.dm index 4b92d1d558..d563e58c42 100644 --- a/code/modules/projectiles/guns/ballistic/derringer.dm +++ b/code/modules/projectiles/guns/ballistic/derringer.dm @@ -4,6 +4,7 @@ icon = 'icons/obj/guns/projectile.dmi' icon_state = "derringer" mag_type = /obj/item/ammo_box/magazine/internal/derringer + fire_delay = 5 obj_flags = UNIQUE_RENAME fire_sound = 'sound/weapons/revolvershot.ogg' casing_ejector = FALSE @@ -23,7 +24,7 @@ return var/num_loaded = magazine.attackby(A, user, params, 1) if(num_loaded) - to_chat(user, "You load [num_loaded] shell\s into \the [src].") + to_chat(user, "You load [num_loaded] bullet\s into \the [src].") playsound(user, 'sound/weapons/bulletinsert.ogg', 60, 1) A.update_icon() update_icon()