From 80df08aefd3bb7588d0ad6285d9cf2ced2ddaa1a Mon Sep 17 00:00:00 2001 From: xmikey555 Date: Sun, 28 Jul 2019 20:57:37 -0400 Subject: [PATCH] Fixes 357 autolathe shells, also fixes the custom incapacitating shot (#45527) * fixes materials for 357 casing * also fixing incapacitating shot --- code/modules/projectiles/ammunition/ballistic/shotgun.dm | 2 +- code/modules/research/designs/autolathe_designs.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/ammunition/ballistic/shotgun.dm b/code/modules/projectiles/ammunition/ballistic/shotgun.dm index d867321deea..e345922dc14 100644 --- a/code/modules/projectiles/ammunition/ballistic/shotgun.dm +++ b/code/modules/projectiles/ammunition/ballistic/shotgun.dm @@ -80,7 +80,7 @@ projectile_type = /obj/item/projectile/bullet/pellet/shotgun_incapacitate pellets = 12//double the pellets, but half the stun power of each, which makes this best for just dumping right in someone's face. variance = 25 - materials = list(MAT_METAL=4000) + materials = list(/datum/material/iron=4000) /obj/item/ammo_casing/shotgun/improvised name = "improvised shell" diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 198421e974f..b6fa44ad4d0 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -792,7 +792,7 @@ name = ".357 Casing" id = "a357" build_type = AUTOLATHE - materials = list(MAT_METAL = 4000) + materials = list(/datum/material/iron = 4000) build_path = /obj/item/ammo_casing/a357 category = list("hacked", "Security")