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

More work

Browse Source
This commit is contained in:
The0bserver
2021-04-11 07:20:06 -04:00
parent ee961ce417
commit 9fe8fb7671
5 changed files with 8 additions and 6 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
@@ -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
code/modules/projectiles/guns/ballistic/derringer.dm
+2 -1
View File
@@ -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'
code/modules/uplink/uplink_items/uplink_stealth.dm
+1 -1
View File
@@ -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