Removes .357 Speed Loaders from Autolathe, replaces with .357 Ammo Boxes (#19553)

* revolvers are balanced now, right?

* decreases metal cost per bullet from 5000 to 4000

* converts bullets to a new ammo box

* shut up Marmite (makes the revolver unrecyclable)
This commit is contained in:
Coolrune206
2022-11-04 04:01:05 +10:00
committed by GitHub
parent 12c873d816
commit e80ae1f95f
6 changed files with 26 additions and 6 deletions
+1 -1
View File
@@ -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)
@@ -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"
@@ -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)
@@ -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