diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 7d1d32b4ae..43b24aa556 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -406,6 +406,20 @@ new /obj/item/ammo_casing/g4570(src) new /obj/item/clothing/mask/cigarette/xeno(src) +//For Cargomen, looking for a good deal on arms, with no quarrels as to where they're from. +/obj/item/storage/fancy/cigarettes/derringer/smuggled + name = "\improper Shady Jim's Super Slims packet" + desc = "If you get caught with this, we don't know you, capiche?" + icon_state = "shadyjim" + spawn_type = /obj/item/ballistic/derringer + +/obj/item/storage/fancy/cigarettes/derringer/smuggled/PopulateContents() + new spawn_type(src) + new /obj/item/ammo_casing/c38/lethal(src) + new /obj/item/ammo_casing/c38/lethal(src) + new /obj/item/ammo_casing/c38/lethal(src) + new /obj/item/ammo_casing/c38/lethal(src) + new /obj/item/clothing/mask/cigarette/shadyjims (src) ///////////// //CIGAR BOX// ///////////// diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm index a2e62ebe72..8f459baca3 100644 --- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm +++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm @@ -48,3 +48,12 @@ price_max = 300 stock_max = 3 availability_prob = 40 + +/datum/blackmarket_item/weapon/derringer + name = ".38 Derringer" + desc = "Compact safety! Now at a premium!" + item = /obj/item/gun/ballistic/derringer + price_min = 500 + price_max = 1500 + stock_max = 3 + availability_prob = 30 diff --git a/code/modules/cargo/packs/armory.dm b/code/modules/cargo/packs/armory.dm index 5dc03588f2..bf79a3ed15 100644 --- a/code/modules/cargo/packs/armory.dm +++ b/code/modules/cargo/packs/armory.dm @@ -233,6 +233,18 @@ cost = 1500 contains = list(/obj/item/gun/energy/laser/hellgun) +/datum/supply_pack/security/armory/derringerclassic + name = "Holdout Crate" + crate_name = "dented crate" + desc = "Hey kid.. c'mere. Boss says we need to offload these, to any buyer, no questions asked. You pay us, we give you three of these guns, no strings attached. Locks are to ensure they get to PAYING customers." + cost = 2000 + contraband = TRUE + can_private_buy = TRUE + contains = list(/obj/item/storage/fancy/cigarettes/derringer/smuggled, + /obj/item/storage/fancy/cigarettes/derringer/smuggled, + /obj/item/storage/fancy/cigarettes/derringer/smuggled, + /obj/item/storage/wallet) + /datum/supply_pack/security/armory/esoteric_arms name = "Esoteric Armory Shipment" desc = "Well.. you're an agent of taste, I can tell that much. For the right price.. we could see our way clear to send you one of our more... unique weapons." diff --git a/code/modules/projectiles/boxes_magazines/internal/derringer.dm b/code/modules/projectiles/boxes_magazines/internal/derringer.dm index cc86549793..356f7627e0 100644 --- a/code/modules/projectiles/boxes_magazines/internal/derringer.dm +++ b/code/modules/projectiles/boxes_magazines/internal/derringer.dm @@ -18,7 +18,7 @@ /obj/item/ammo_box/magazine/internal/derringer/a357 name = "\improper derringer muzzle" ammo_type = /obj/item/ammo_casing/a357 - caliber = "357" + caliber = ("38","357") max_ammo = 2 multiload = FALSE diff --git a/code/modules/projectiles/guns/ballistic/derringer.dm b/code/modules/projectiles/guns/ballistic/derringer.dm index e5477a5964..0566476b57 100644 --- a/code/modules/projectiles/guns/ballistic/derringer.dm +++ b/code/modules/projectiles/guns/ballistic/derringer.dm @@ -1,6 +1,6 @@ /obj/item/gun/ballistic/derringer name = "\improper .38 Derringer" - desc = "A easily consealable derringer. Uses .38 ammo" + desc = "A easily concealable derringer. Uses .38 ammo" icon = 'icons/obj/guns/projectile.dmi' icon_state = "derringer" mag_type = /obj/item/ammo_box/magazine/internal/derringer @@ -54,13 +54,13 @@ obj/item/gun/ballistic/derringer/attack_self(mob/living/user) /obj/item/gun/ballistic/derringer/traitor name = "\improper .357 Syndicate Derringer" - desc = "An easily consealable derriger, if not for the bright red and black. Uses .357 ammo" + desc = "An easily concealable derriger, if not for the bright red and black. Uses .357 OR .38 ammo" icon_state = "derringer_syndie" mag_type = /obj/item/ammo_box/magazine/internal/derringer/a357 /obj/item/gun/ballistic/derringer/gold name = "\improper Golden Derringer" - desc = "The golden sheen is somewhat counterintuitive as a stealth weapon, but it looks cool. Uses .357 ammo" + desc = "The golden sheen is somewhat counterintuitive as a stealth weapon, but it looks cool. Uses .357 OR .38 ammo" icon_state = "derringer_gold" mag_type = /obj/item/ammo_box/magazine/internal/derringer/a357 fire_sound = 'sound/weapons/resonator_blast.ogg'