From 608d6f09c5417b1bbfc54cddad9faf8e129ecfa5 Mon Sep 17 00:00:00 2001 From: xerdies Date: Fri, 15 Feb 2019 21:11:19 +0000 Subject: [PATCH] added ammo boxes, and added them to the materials so they can be printed. --- .../projectiles/ammunition/ammo_casings.dm | 2 +- code/modules/projectiles/ammunition/boxes.dm | 15 +++++++++++ .../research/designs/autolathe_designs.dm | 24 ++++++++++++++++++ icons/obj/guns/toy.dmi | Bin 3245 -> 3287 bytes 4 files changed, 40 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index 97b33178433..228a1f17dbe 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -390,7 +390,7 @@ BB.icon_state = initial(BB.icon_state) /obj/item/ammo_casing/caseless/foam_dart/sniper/riot - name = "riot sniper foam dart" + name = "riot foam sniper dart" desc = "For the bigger brother of the crowd control toy. Ages 18 and up." caliber = "foam_force_sniper" projectile_type = /obj/item/projectile/bullet/reusable/foam_dart/sniper/riot diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm index 28dc2e41b14..ae88bc9db61 100644 --- a/code/modules/projectiles/ammunition/boxes.dm +++ b/code/modules/projectiles/ammunition/boxes.dm @@ -125,6 +125,21 @@ ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot materials = list(MAT_METAL = 50000) +/obj/item/ammo_box/foambox/sniper + name = "ammo box (Foam Sniper Darts)" + icon = 'icons/obj/guns/toy.dmi' + icon_state = "foambox_sniper" + ammo_type = /obj/item/ammo_casing/caseless/foam_dart/sniper + max_ammo = 40 + materials = list(MAT_METAL = 900) + +/obj/item/ammo_box/foambox/sniper/riot + icon_state = "foambox_sniper_riot" + ammo_type = /obj/item/ammo_casing/caseless/foam_dart/sniper/riot + materials = list(MAT_METAL = 90000) + + + /obj/item/ammo_box/caps name = "speed loader (caps)" icon_state = "357" diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index ca606720c7b..069efe5807c 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -623,6 +623,14 @@ build_path = /obj/item/ammo_box/foambox category = list("initial", "Miscellaneous") +/datum/design/foam_dart_sniper + name = "Box of Sniper Foam Darts" + id = "foam_dart_sniper" + build_type = AUTOLATHE + materials = list(MAT_METAL = 900) + build_path = /obj/item/ammo_box/foambox/sniper + category = list("initial", "Miscellaneous") + //hacked autolathe recipes /datum/design/flamethrower name = "Flamethrower" @@ -728,6 +736,14 @@ build_path = /obj/item/ammo_casing/caseless/foam_dart/riot category = list("hacked", "Security") +/datum/design/riot_dart_sniper + name = "Foam riot sniper dart" + id = "riot_dart_sniper" + build_type = AUTOLATHE + materials = list(MAT_METAL = 1800) //Discount for making individually - no box = less metal! + build_path = /obj/item/ammo_casing/caseless/foam_dart/sniper/riot + category = list("hacked", "Security") + /datum/design/riot_darts name = "Foam riot dart box" id = "riot_darts" @@ -736,6 +752,14 @@ build_path = /obj/item/ammo_box/foambox/riot category = list("hacked", "Security") +/datum/design/riot_darts_sniper + name = "Foam riot sniper dart box" + id = "riot_darts_sniper" + build_type = AUTOLATHE + materials = list(MAT_METAL = 90000) //Comes with 40 darts + build_path = /obj/item/ammo_box/foambox/sniper/riot + category = list("hacked", "Security") + /datum/design/a357 name = "Ammo Box (.357)" id = "a357" diff --git a/icons/obj/guns/toy.dmi b/icons/obj/guns/toy.dmi index 1f226afa5094dbc2b096837c28e99fbd809f82f3..49444798d61ca762458bba00c713eb4c956caf51 100644 GIT binary patch delta 3002 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 nUVhp~;`U=+ey{N)4