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
code/modules/projectiles/boxes_magazines/internal/derringer.dm
+1 -1
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
code/modules/projectiles/guns/ballistic/derringer.dm
+3 -3
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'