shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

T. Derringer has twin calibers, Station gets .38

Browse Source
This commit is contained in:
The0bserver
2021-04-13 23:22:35 -04:00
parent bcbccd864f
commit 64a3cd9404
5 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
View File

@@ -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

12
code/modules/cargo/packs/armory.dm
View File

@@ -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."

2
code/modules/projectiles/boxes_magazines/internal/derringer.dm
View File

@@ -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

6
code/modules/projectiles/guns/ballistic/derringer.dm
View File

@@ -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'