From 1d31fb084f4bf7371eae632d84a7f29032da1d4f Mon Sep 17 00:00:00 2001 From: The0bserver Date: Sun, 11 Apr 2021 19:40:54 -0400 Subject: [PATCH] More concealment, fixes a problem with the .45-70 --- code/game/objects/items/storage/wallets.dm | 2 +- code/modules/projectiles/ammunition/ballistic/revolver.dm | 1 + code/modules/projectiles/boxes_magazines/internal/derringer.dm | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/storage/wallets.dm b/code/game/objects/items/storage/wallets.dm index df6dbe0c2d..34fdb8e77d 100644 --- a/code/game/objects/items/storage/wallets.dm +++ b/code/game/objects/items/storage/wallets.dm @@ -46,7 +46,7 @@ /obj/item/instrument/harmonica, /obj/item/mining_voucher, /obj/item/suit_voucher, - /obj/item/reagent_containers/pill + /obj/item/reagent_containers/pill, /obj/item/gun/ballistic/derringer)) /obj/item/storage/wallet/Exited(atom/movable/AM) diff --git a/code/modules/projectiles/ammunition/ballistic/revolver.dm b/code/modules/projectiles/ammunition/ballistic/revolver.dm index ba5714812e..8f4d8eac67 100644 --- a/code/modules/projectiles/ammunition/ballistic/revolver.dm +++ b/code/modules/projectiles/ammunition/ballistic/revolver.dm @@ -79,4 +79,5 @@ /obj/item/ammo_casing/g4570 name= ".45-70 Govt bullet casing" desc = "An exceedingly rare .45-70 Govt bullet casing." + caliber = "45-70g" projectile_type = /obj/item/projectile/bullet/g4570 diff --git a/code/modules/projectiles/boxes_magazines/internal/derringer.dm b/code/modules/projectiles/boxes_magazines/internal/derringer.dm index dd3ea4efc2..cc86549793 100644 --- a/code/modules/projectiles/boxes_magazines/internal/derringer.dm +++ b/code/modules/projectiles/boxes_magazines/internal/derringer.dm @@ -25,6 +25,6 @@ /obj/item/ammo_box/magazine/internal/derringer/g4570 name = "\improper derringer muzzle" ammo_type = /obj/item/ammo_casing/g4570 - caliber = "g4570" + caliber = "45-70g" max_ammo = 2 multiload = FALSE