diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm index ab7a2d4315d7..95bbae56a904 100644 --- a/code/datums/components/crafting/recipes.dm +++ b/code/datums/components/crafting/recipes.dm @@ -16,6 +16,7 @@ if(!(result in reqs)) blacklist += result + /** * Run custom pre-craft checks for this recipe * diff --git a/code/datums/components/crafting/recipes/weapon.dm b/code/datums/components/crafting/recipes/weapon.dm index 10f63bede5ce..c1dde04b3650 100644 --- a/code/datums/components/crafting/recipes/weapon.dm +++ b/code/datums/components/crafting/recipes/weapon.dm @@ -125,8 +125,10 @@ name = "Pulse Slug Shell" result = /obj/item/ammo_casing/shotgun/pulseslug reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1, - /obj/item/stock_parts/capacitor/adv = 2, - /obj/item/stock_parts/micro_laser/ultra = 1) + /obj/item/stock_parts/capacitor = 3, + /obj/item/stock_parts/micro_laser = 1, + /obj/item/stock_parts/cell = 1, + /datum/reagent/lithium = 5) tools = list(TOOL_SCREWDRIVER) time = 5 category = CAT_WEAPONRY @@ -135,7 +137,7 @@ /datum/crafting_recipe/dragonsbreath name = "Dragonsbreath Shell" result = /obj/item/ammo_casing/shotgun/dragonsbreath - reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1, /datum/reagent/phosphorus = 5) + reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1, /datum/reagent/phosphorus = 10) tools = list(TOOL_SCREWDRIVER) time = 5 category = CAT_WEAPONRY @@ -157,8 +159,11 @@ name = "Ion Scatter Shell" result = /obj/item/ammo_casing/shotgun/ion reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1, - /obj/item/stock_parts/micro_laser/ultra = 1, - /obj/item/stock_parts/subspace/crystal = 1) + /obj/item/stock_parts/micro_laser = 2, + /obj/item/stock_parts/capacitor = 2, + /obj/item/stock_parts/scanning_module = 1, + /datum/reagent/iron = 5, + /datum/reagent/uranium = 5) tools = list(TOOL_SCREWDRIVER) time = 5 category = CAT_WEAPONRY @@ -179,8 +184,10 @@ name = "Scatter Laser Shell" result = /obj/item/ammo_casing/shotgun/laserscatter reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1, - /obj/item/stock_parts/capacitor/adv = 1, - /obj/item/stock_parts/micro_laser/high = 1) + /obj/item/stock_parts/capacitor = 1, + /obj/item/stock_parts/micro_laser = 3, + /obj/item/stock_parts/cell = 1, + /datum/reagent/lithium = 5) tools = list(TOOL_SCREWDRIVER) time = 5 category = CAT_WEAPONRY diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 3cd1e72192ee..8aa7b1d9c478 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -856,6 +856,16 @@ for(var/i in 1 to 7) new /obj/item/ammo_casing/shotgun/buckshot(src) +/obj/item/storage/box/techshot + name = "box of unloaded shotgun tech shells" + desc = "A box full of unloaded tech shells, capable of producing a variety of effects once loaded." + icon_state = "techshot_box" + illustration = null + +/obj/item/storage/box/techshot/PopulateContents() + for(var/i in 1 to 7) + new /obj/item/ammo_casing/shotgun/techshell(src) + /obj/item/storage/box/beanbag name = "box of beanbags" desc = "A box full of beanbag shells." diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm index ab521998f07c..aa165cbc8149 100644 --- a/code/modules/cargo/packs/ammo.dm +++ b/code/modules/cargo/packs/ammo.dm @@ -70,6 +70,12 @@ cost = 500 contains = list(/obj/item/ammo_box/a12g/slug) +/datum/supply_pack/ammo/techshells + name = "Unloaded Shotgun Technological Shells Crate" + desc = "Contains a box of 7 versatile tech shells, capable of producing a variety of deadly effects for any situation. Some assembly required." + cost = 210 + contains = list(/obj/item/storage/box/techshot) + /* .38 ammo */ diff --git a/code/modules/projectiles/ammunition/ballistic/shotgun.dm b/code/modules/projectiles/ammunition/ballistic/shotgun.dm index 8e5f2e128ac7..9f6a8c169ecd 100644 --- a/code/modules/projectiles/ammunition/ballistic/shotgun.dm +++ b/code/modules/projectiles/ammunition/ballistic/shotgun.dm @@ -111,8 +111,8 @@ desc = "A shotgun shell which fires a spread of incendiary pellets." icon_state = "dragonsbreath" projectile_type = /obj/projectile/bullet/incendiary/shotgun/dragonsbreath - pellets = 4 - variance = 35 + pellets = 8 + variance = 45 /obj/item/ammo_casing/shotgun/meteorslug name = "meteorslug shell" @@ -128,20 +128,20 @@ /obj/item/ammo_casing/shotgun/ion name = "ion shell" - desc = "An advanced shotgun shell which uses a subspace ansible crystal to produce an effect similar to a standard ion rifle. \ - The unique properties of the crystal split the pulse into a spread of individually weaker bolts." + desc = "An advanced shotgun shell which uses a micro laser to focus the effects of an EMP reaction to produce an effect similar to a standard ion rifle. \ + The more uncontrolled nature of the reaction causes the pulse to spread into multiple individually weaker bolts." icon_state = "ion" projectile_type = /obj/projectile/ion/weak - pellets = 4 - variance = 35 + pellets = 8 + variance = 25 /obj/item/ammo_casing/shotgun/laserscatter name = "scatter laser shell" desc = "An advanced shotgun shell that uses a micro laser to replicate the effects of a scatter laser weapon in a ballistic package." icon_state = "laser" projectile_type = /obj/projectile/beam/weak - pellets = 4 //WS edit: makes scatter lasers based again - variance = 35 + pellets = 8 + variance = 25 /obj/item/ammo_casing/shotgun/pulseslug name = "pulse slug" diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm index e102c4c3b48f..ba9c8c88d7f8 100644 --- a/code/modules/projectiles/projectile/bullets/shotgun.dm +++ b/code/modules/projectiles/projectile/bullets/shotgun.dm @@ -18,7 +18,7 @@ /obj/projectile/bullet/incendiary/shotgun/dragonsbreath name = "dragonsbreath pellet" - damage = 5 + damage = 8 armour_penetration = -35 /obj/projectile/bullet/slug/stun diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 03f2163cddce..df2add959648 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ