diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 185bb91eb8f8f..3c3183ba4a6e8 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -737,8 +737,8 @@ integrity_failure = 60 name = "Old Laser Turret" desc = "A turret built with substandard parts and run down further with age. Still capable of delivering lethal lasers to the odd space carp, but not much else." - stun_projectile = /obj/item/projectile/beam/weak - lethal_projectile = /obj/item/projectile/beam/weak + stun_projectile = /obj/item/projectile/beam/weak/penetrator + lethal_projectile = /obj/item/projectile/beam/weak/penetrator faction = list("neutral","silicon","turret") //////////////////////// diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm index cd646d6ea2a67..0344d4f851b44 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -280,7 +280,7 @@ subcategory = CAT_AMMO /datum/crafting_recipe/laserslug - name = "Laser Slug Shell" + name = "Scatter Laser Shell" result = /obj/item/ammo_casing/shotgun/laserslug reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1, /obj/item/stock_parts/capacitor/adv = 1, diff --git a/code/modules/projectiles/ammunition/ballistic/shotgun.dm b/code/modules/projectiles/ammunition/ballistic/shotgun.dm index 4c66939e5344b..39cf92416940f 100644 --- a/code/modules/projectiles/ammunition/ballistic/shotgun.dm +++ b/code/modules/projectiles/ammunition/ballistic/shotgun.dm @@ -92,10 +92,12 @@ variance = 35 /obj/item/ammo_casing/shotgun/laserslug - name = "laser slug" - desc = "An advanced shotgun shell that uses a micro laser to replicate the effects of a laser weapon in a ballistic package." + 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 = "lshell" - projectile_type = /obj/item/projectile/beam/laser + projectile_type = /obj/item/projectile/beam/weak + pellets = 6 + variance = 35 /obj/item/ammo_casing/shotgun/techshell name = "unloaded technological shell" diff --git a/code/modules/projectiles/ammunition/caseless/misc.dm b/code/modules/projectiles/ammunition/caseless/misc.dm index 77fa958328019..24f59ea65854f 100644 --- a/code/modules/projectiles/ammunition/caseless/misc.dm +++ b/code/modules/projectiles/ammunition/caseless/misc.dm @@ -17,6 +17,6 @@ firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/energy /obj/item/ammo_casing/caseless/laser/gatling - projectile_type = /obj/item/projectile/beam/weak + projectile_type = /obj/item/projectile/beam/weak/penetrator variance = 0.8 click_cooldown_override = 1 diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 566c5ed7b23e3..509d33faa0b60 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -38,6 +38,8 @@ /obj/item/projectile/beam/weak damage = 15 + +/obj/item/projectile/beam/weak/penetrator armour_penetration = 50 /obj/item/projectile/beam/practice