diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 06fb316524..7d1d32b4ae 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -367,7 +367,7 @@ /obj/item/storage/fancy/cigarettes/derringer/AltClick(mob/living/carbon/user) if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) return - var/obj/item/W = (locate(/obj/item/ammo_casing/a357) in contents) || (locate(/obj/item/clothing/mask/cigarette) in contents) //Easy access smokes and bullets + var/obj/item/W = (locate(/obj/item/ammo_casing/a357) in contents) || (locate(/obj/item/clothing/mask/cigarette) in contents) || locate(/obj/item/ammo_casing/g4570) //Easy access smokes and bullets if(W && contents.len > 0) SEND_SIGNAL(src, COMSIG_TRY_STORAGE_TAKE, W, user) user.put_in_hands(W) @@ -393,7 +393,7 @@ //For operatives, bound in a ka-tet. /obj/item/storage/fancy/cigarettes/derringer/midworld - name = "\improper Midworld's Green Bend" + name = "\improper Midworld's Lime Bend" desc = "The wheel of Ka turns, Gunslinger." icon_state = "slime" spawn_type = /obj/item/gun/ballistic/derringer/nukeop diff --git a/code/game/objects/items/storage/wallets.dm b/code/game/objects/items/storage/wallets.dm index 0b4b6f54f3..df6dbe0c2d 100644 --- a/code/game/objects/items/storage/wallets.dm +++ b/code/game/objects/items/storage/wallets.dm @@ -46,7 +46,8 @@ /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/boxes_magazines/internal/derringer.dm b/code/modules/projectiles/boxes_magazines/internal/derringer.dm index 0d63770224..dd3ea4efc2 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 = "45-70" + caliber = "g4570" max_ammo = 2 multiload = FALSE diff --git a/code/modules/projectiles/guns/ballistic/derringer.dm b/code/modules/projectiles/guns/ballistic/derringer.dm index 8373b5bac1..2acb5d7f8f 100644 --- a/code/modules/projectiles/guns/ballistic/derringer.dm +++ b/code/modules/projectiles/guns/ballistic/derringer.dm @@ -67,5 +67,6 @@ obj/item/gun/ballistic/derringer/attack_self(mob/living/user) /obj/item/gun/ballistic/derringer/nukeop name = "\improper Gunslinger's Derringer" desc = "Sandalwood grip, wellkempt blue-grey steel barrels, and a crash like thunder itself. Uses the exceedingly rare 45-70 Govt. ammo" - icon_state = "derringer_syndie" + icon_state = "derringer" mag_type = /obj/item/ammo_box/magazine/internal/derringer/g4570 + fire_sound = 'sound/weapons/gunshotshotgunshot.ogg' diff --git a/code/modules/uplink/uplink_items/uplink_stealth.dm b/code/modules/uplink/uplink_items/uplink_stealth.dm index b55343546e..6bb1e4f1b7 100644 --- a/code/modules/uplink/uplink_items/uplink_stealth.dm +++ b/code/modules/uplink/uplink_items/uplink_stealth.dm @@ -51,7 +51,7 @@ datum/uplink_item/stealthy_weapons/derringerpack item = /obj/item/storage/fancy/cigarettes/derringer/gold ..() -datum/uplink_item/stalthy_weapons/derringerpack_nukie +/datum/uplink_item/stalthy_weapons/derringerpack_nukie name = "Antique Derringer" desc = "An easy to conceal, yet extremely deadly handgun, capable of firing .45-70 Govt rounds. Comes in a unique pack of cigarettes with additional munitions." item = /obj/item/storage/fancy/cigarettes/derringer/midworld