diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm index d61c901d1e5..5ac0d342449 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -421,29 +421,6 @@ category = CAT_WEAPONRY subcategory = CAT_AMMO -/datum/crafting_recipe/improvisedslug - name = "Improvised Shotgun Shell" - result = list(/obj/item/ammo_casing/shotgun/improvised) - reqs = list(/obj/item/grenade/chem_grenade = 1, - /obj/item/stack/sheet/metal = 1, - /obj/item/stack/cable_coil = 1, - /datum/reagent/fuel = 10) - tools = list(TOOL_SCREWDRIVER) - time = 5 - category = CAT_WEAPONRY - subcategory = CAT_AMMO - -/datum/crafting_recipe/improvisedslugoverload - name = "Overload Improvised Shell" - result = list(/obj/item/ammo_casing/shotgun/improvised/overload) - reqs = list(/obj/item/ammo_casing/shotgun/improvised = 1, - /datum/reagent/blackpowder = 10, - /datum/reagent/plasma_dust = 20) - tools = list(TOOL_SCREWDRIVER) - time = 5 - category = CAT_WEAPONRY - subcategory = CAT_AMMO - /datum/crafting_recipe/lasershot name = "Lasershot Shell" result = list(/obj/item/ammo_casing/shotgun/lasershot) diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index 4c29c02f3d4..50d5cbb6700 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -165,32 +165,6 @@ muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL - -/obj/item/ammo_casing/shotgun/improvised - name = "improvised shell" - desc = "An extremely weak shotgun shell with multiple small pellets made out of metal shards." - icon_state = "improvshell" - projectile_type = /obj/item/projectile/bullet/pellet/weak - materials = list(MAT_METAL=250) - pellets = 10 - variance = 35 - muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL - muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL - - -/obj/item/ammo_casing/shotgun/improvised/overload - name = "overloaded improvised shell" - desc = "An extremely weak shotgun shell with multiple small pellets made out of metal shards. This one has been packed with even more \ - propellant. It's like playing russian roulette, with a shotgun." - icon_state = "improvshell" - projectile_type = /obj/item/projectile/bullet/pellet/overload - materials = list(MAT_METAL=250) - pellets = 4 - variance = 40 - muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL - muzzle_flash_range = MUZZLE_FLASH_RANGE_STRONG - - /obj/item/ammo_casing/shotgun/stunslug name = "taser slug" desc = "A stunning taser slug." diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index b72a12e61b9..54fc6475c14 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -123,7 +123,7 @@ /obj/item/ammo_box/magazine/internal/shot/improvised name = "improvised shotgun internal magazine" - ammo_type = /obj/item/ammo_casing/shotgun/improvised + ammo_type = /obj/item/ammo_casing/shotgun/rubbershot max_ammo = 1 /obj/item/ammo_box/magazine/internal/shot/improvised/cane diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index b81b6a5690e..805c23f6c66 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -101,25 +101,6 @@ if(H.getStaminaLoss() >= 60) H.KnockDown(8 SECONDS) -/obj/item/projectile/bullet/pellet/weak - tile_dropoff = 0.55 //Come on it does 6 damage don't be like that. - damage = 6 - -/obj/item/projectile/bullet/pellet/weak/New() - range = rand(1, 8) - ..() - -/obj/item/projectile/bullet/pellet/weak/on_range() - do_sparks(1, 1, src) - ..() - -/obj/item/projectile/bullet/pellet/overload - damage = 3 - -/obj/item/projectile/bullet/pellet/overload/New() - range = rand(1, 10) - ..() - /obj/item/projectile/bullet/pellet/assassination damage = 12 tile_dropoff = 1 // slightly less damage and greater damage falloff compared to normal buckshot @@ -129,15 +110,6 @@ var/mob/living/M = target M.AdjustSilence(4 SECONDS) // HELP MIME KILLING ME IN MAINT -/obj/item/projectile/bullet/pellet/overload/on_hit(atom/target, blocked = 0) - ..() - explosion(target, 0, 0, 2) - -/obj/item/projectile/bullet/pellet/overload/on_range() - explosion(src, 0, 0, 2) - do_sparks(3, 3, src) - ..() - /obj/item/projectile/bullet/midbullet damage = 20 stamina = 45 // Three rounds from the c20r knocks unarmoured people down, four for people with bulletproof