From 52b1ed2a25149d34e6e33705e3c6b16506864f3e Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Fri, 4 Oct 2013 02:58:38 -0400 Subject: [PATCH] Updated blank shotgun shells to birdshot --- code/game/machinery/autolathe.dm | 2 +- .../game/objects/items/weapons/storage/boxes.dm | 17 +++++++++-------- code/modules/projectiles/ammunition/boxes.dm | 4 +++- code/modules/projectiles/ammunition/bullets.dm | 8 ++++---- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 8fbb8649315..c4a55973a6e 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -30,7 +30,7 @@ var/global/list/autolathe_recipes = list( \ new /obj/item/weapon/cautery(),\ new /obj/item/weapon/reagent_containers/glass/beaker(), \ new /obj/item/weapon/reagent_containers/glass/beaker/large(), \ - new /obj/item/ammo_casing/shotgun/blank(), \ + new /obj/item/weapon/storage/box/blanks(), \ new /obj/item/ammo_casing/shotgun/beanbag(), \ new /obj/item/ammo_magazine/c38(), \ new /obj/item/device/taperecorder(), \ diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 7025f38db55..927d9562aaa 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -134,18 +134,19 @@ /obj/item/weapon/storage/box/blanks - name = "box of blank shells" + name = "box of birdshot shells" desc = "It has a picture of a gun and several warning symbols on the front." + m_amt = 41000 New() ..() - new /obj/item/ammo_casing/shotgun/blank(src) - new /obj/item/ammo_casing/shotgun/blank(src) - new /obj/item/ammo_casing/shotgun/blank(src) - new /obj/item/ammo_casing/shotgun/blank(src) - new /obj/item/ammo_casing/shotgun/blank(src) - new /obj/item/ammo_casing/shotgun/blank(src) - new /obj/item/ammo_casing/shotgun/blank(src) + new /obj/item/ammo_casing/shotgun/birdshot(src) + new /obj/item/ammo_casing/shotgun/birdshot(src) + new /obj/item/ammo_casing/shotgun/birdshot(src) + new /obj/item/ammo_casing/shotgun/birdshot(src) + new /obj/item/ammo_casing/shotgun/birdshot(src) + new /obj/item/ammo_casing/shotgun/birdshot(src) + new /obj/item/ammo_casing/shotgun/birdshot(src) diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm index fa7567bcb28..cd696e1ca00 100644 --- a/code/modules/projectiles/ammunition/boxes.dm +++ b/code/modules/projectiles/ammunition/boxes.dm @@ -116,4 +116,6 @@ icon_state = "a762" ammo_type = "/obj/item/ammo_casing/a762" max_ammo = 0 - multiple_sprites = 1 \ No newline at end of file + multiple_sprites = 1 + +/obj/item/ammo_magazine \ No newline at end of file diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm index 063e507a386..e4b90d2b98f 100644 --- a/code/modules/projectiles/ammunition/bullets.dm +++ b/code/modules/projectiles/ammunition/bullets.dm @@ -59,12 +59,12 @@ m_amt = 12500 -/obj/item/ammo_casing/shotgun/blank +/obj/item/ammo_casing/shotgun/birdshot name = "shotgun shell" - desc = "A blank shell." + desc = "A shotgun shell full of birdshot." icon_state = "blshell" - projectile_type = "" - m_amt = 250 + projectile_type = "/obj/item/projectile/bullet/midbullet" + m_amt = 6000 /obj/item/ammo_casing/shotgun/beanbag