diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm index 70058801f8..1f1cc10459 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm @@ -60,6 +60,13 @@ desc = "Designed to quickly reload revolvers. These rounds are manufactured within extremely tight tolerances, making them easy to show off trickshots with." ammo_type = /obj/item/ammo_casing/c38/match +/obj/item/ammo_box/g4570 + name = "ammo box (.45-70 GOVT)" + desc = "Brought to you at great expense,this box contains 10 more .45-70 GOVT bullets." + ammo_type = /obj/item/ammo_casing/g4570 + icon_state = "45box" + max_ammo = 10 + /obj/item/ammo_box/c9mm name = "ammo box (9mm)" icon_state = "9mmbox" diff --git a/code/modules/projectiles/guns/ballistic/derringer.dm b/code/modules/projectiles/guns/ballistic/derringer.dm index d563e58c42..47213f17df 100644 --- a/code/modules/projectiles/guns/ballistic/derringer.dm +++ b/code/modules/projectiles/guns/ballistic/derringer.dm @@ -3,6 +3,7 @@ desc = "A easily concealable derringer. Uses .38 ammo" icon = 'icons/obj/guns/projectile.dmi' icon_state = "derringer" + flags_1 = CONDUCT_1 mag_type = /obj/item/ammo_box/magazine/internal/derringer fire_delay = 5 obj_flags = UNIQUE_RENAME diff --git a/code/modules/uplink/uplink_items/uplink_ammo.dm b/code/modules/uplink/uplink_items/uplink_ammo.dm index 853f6111b2..2ab6c6f490 100644 --- a/code/modules/uplink/uplink_items/uplink_ammo.dm +++ b/code/modules/uplink/uplink_items/uplink_ammo.dm @@ -7,6 +7,13 @@ // Ammunition +/datum/uplink_item/ammo/derringer + name = "Ammo Box - .45-70 GOVT" + desc = "Contains 10 additional .45-70 GOVT rounds. Caliber is exceedingly rare, and thus, comes at a premium." + item = /obj/item/ammo_box/g4570 + cost = 5 + include_modes = list(/datum/game_mode/nuclear) + /datum/uplink_item/ammo/pistol name = "10mm Handgun Magazine" desc = "An additional 8-round 10mm magazine; compatible with the Stechkin Pistol. These rounds \