This commit is contained in:
The0bserver
2021-04-21 09:58:08 -04:00
parent db046f3dbb
commit 146ffcd2bd
2 changed files with 2 additions and 12 deletions
@@ -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"
@@ -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, "<span class='notice'>You load [num_loaded] shell\s into \the [src].</span>")
to_chat(user, "<span class='notice'>You load [num_loaded] bullet\s into \the [src].</span>")
playsound(user, 'sound/weapons/bulletinsert.ogg', 60, 1)
A.update_icon()
update_icon()