diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index ff52749c928..3a59c0b47be 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -452,8 +452,8 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) /datum/uplink_item/dangerous/revolver name = "Syndicate .357 Revolver" reference = "SR" - desc = "A brutally simple syndicate revolver that fires .357 Magnum cartridges and has 7 chambers." - item = /obj/item/gun/projectile/revolver + desc = "A brutally simple syndicate revolver that fires .357 Magnum cartridges and has 7 chambers. Comes with a spare speed loader." + item = /obj/item/storage/box/syndie_kit/revolver cost = 13 surplus = 50 diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index d88c7c0611e..2fae836e63b 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -351,3 +351,10 @@ To apply, hold the injector a short distance away from the outer thigh before ap new /obj/item/retractor/supermatter(src) new /obj/item/nuke_core_container/supermatter(src) new /obj/item/paper/guides/antag/supermatter_sliver(src) + +/obj/item/storage/box/syndie_kit/revolver + name = "\improper .357 revolver kit" + +/obj/item/storage/box/syndie_kit/revolver/populate_contents() + new /obj/item/gun/projectile/revolver(src) + new /obj/item/ammo_box/a357(src) diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 2b8dde3903e..98b58e6bd35 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -187,7 +187,7 @@ var/num_loaded = 0 if(!can_load(user)) return - if(istype(A, /obj/item/ammo_box)) + if(istype(A, /obj/item/ammo_box) && !istype(A, /obj/item/ammo_box/b357)) var/obj/item/ammo_box/AM = A for(var/obj/item/ammo_casing/AC in AM.stored_ammo) var/did_load = give_round(AC, replace_spent) diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm index 1b00c175239..e09be1238b2 100644 --- a/code/modules/projectiles/ammunition/boxes.dm +++ b/code/modules/projectiles/ammunition/boxes.dm @@ -1,11 +1,21 @@ /obj/item/ammo_box/a357 name = "speed loader (.357)" desc = "Designed to quickly reload revolvers." + materials = list() ammo_type = /obj/item/ammo_casing/a357 max_ammo = 7 multi_sprite_step = 1 // see: /obj/item/ammo_box/update_icon() icon_state = "357" +/obj/item/ammo_box/b357 + name = "ammo box (.357)" + desc = "Contains up to seven .357 bullets, intended to either be inserted into a speed loader or into the gun manually." + w_class = WEIGHT_CLASS_NORMAL + ammo_type = /obj/item/ammo_casing/a357 + max_ammo = 7 + multi_sprite_step = 1 + icon_state = "357OLD" + /obj/item/ammo_box/c9mm name = "ammo box (9mm)" icon_state = "9mmbox" diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 178d8b78c72..0c0068b2b2a 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -1,6 +1,7 @@ /obj/item/gun/projectile/revolver name = "\improper .357 revolver" desc = "A suspicious revolver. Uses .357 ammo." + materials = list() icon_state = "revolver" mag_type = /obj/item/ammo_box/magazine/internal/cylinder origin_tech = "combat=3;materials=2" @@ -28,6 +29,8 @@ /obj/item/gun/projectile/revolver/attackby(obj/item/A, mob/user, params) . = ..() + if(istype(A, /obj/item/ammo_box/b357)) + return if(.) return var/num_loaded = magazine.attackby(A, user, params, 1) diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 1209eba520e..fd10d9f55bb 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -784,12 +784,12 @@ build_path = /obj/item/ammo_box/foambox/sniper/riot category = list("hacked", "Security") -/datum/design/a357 +/datum/design/b357 name = "Ammo Box (.357)" - id = "a357" + id = "b357" build_type = AUTOLATHE materials = list(MAT_METAL = 30000) - build_path = /obj/item/ammo_box/a357 + build_path = /obj/item/ammo_box/b357 category = list("hacked", "Security") /datum/design/c10mm