diff --git a/code/modules/projectiles/ammunition/energy_lens.dm b/code/modules/projectiles/ammunition/energy_lens.dm index 5935376b9bb..322d210681a 100644 --- a/code/modules/projectiles/ammunition/energy_lens.dm +++ b/code/modules/projectiles/ammunition/energy_lens.dm @@ -166,6 +166,15 @@ harmful = FALSE delay = 0.6 SECONDS +/obj/item/ammo_casing/energy/disabler/smg + projectile_type = /obj/item/projectile/beam/disabler/weak + e_cost = 25 + fire_sound = 'sound/weapons/taser3.ogg' + click_cooldown_override = 2 + variance = 15 + randomspread = 1 + delay = 2 + /obj/item/ammo_casing/energy/disabler/cyborg //seperate balancing for cyborg, again e_cost = 250 diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index 53c1120c998..1b299dd77fc 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -67,6 +67,18 @@ return ..() +/obj/item/gun/energy/disabler/smg + name = "disabler smg" + desc = "An automatic disabler variant, as opposed to the conventional model. Boasts a higher ammunition capacity at the cost of slightly reduced beam effectiveness." + icon_state = "disabler_smg" + weapon_weight = WEAPON_HEAVY + w_class = WEIGHT_CLASS_BULKY + ammo_type = list(/obj/item/ammo_casing/energy/disabler/smg) + burst_size = 2 + fire_delay = 2.5 + shaded_charge = TRUE + can_holster = FALSE + /obj/item/gun/energy/disabler/cyborg name = "cyborg disabler" desc = "An integrated disabler that draws from a cyborg's power cell. This weapon contains a limiter to prevent the cyborg's power cell from overheating." diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 3d6211b949d..d934d34dbe9 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -99,6 +99,12 @@ impact_effect_type = /obj/effect/temp_visual/impact_effect/blue_laser light_color = LIGHT_COLOR_CYAN +/obj/item/projectile/beam/disabler/weak + name = "weakened disabler beam" + damage = 15 + armour_penetration_flat = -10 + light_color = LIGHT_COLOR_BLUE + /obj/item/projectile/beam/pulse name = "pulse" icon_state = "u_laser" diff --git a/code/modules/supply/supply_packs/pack_security.dm b/code/modules/supply/supply_packs/pack_security.dm index f6e26bb1a44..ed278f83aaf 100644 --- a/code/modules/supply/supply_packs/pack_security.dm +++ b/code/modules/supply/supply_packs/pack_security.dm @@ -280,6 +280,14 @@ cost = 400 containername = "tranquilizer shell crate" +/datum/supply_packs/security/armory/disablersmg + name = "WT-450 Disabler SMG Crate" + contains = list(/obj/item/gun/energy/disabler/smg, + /obj/item/gun/energy/disabler/smg) + cost = 550 + containertype = /obj/structure/closet/crate/secure/plasma + containername = "disabler smg crate" + /////// Implants & etc /datum/supply_packs/security/armory/mindshield diff --git a/icons/mob/inhands/guns_lefthand.dmi b/icons/mob/inhands/guns_lefthand.dmi index 3e211172c99..7cb890d0548 100644 Binary files a/icons/mob/inhands/guns_lefthand.dmi and b/icons/mob/inhands/guns_lefthand.dmi differ diff --git a/icons/mob/inhands/guns_righthand.dmi b/icons/mob/inhands/guns_righthand.dmi index deac7d152f0..bbbda0e17cd 100644 Binary files a/icons/mob/inhands/guns_righthand.dmi and b/icons/mob/inhands/guns_righthand.dmi differ diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi index 8494991416e..60f136f507d 100644 Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ diff --git a/sound/weapons/taser3.ogg b/sound/weapons/taser3.ogg new file mode 100644 index 00000000000..bfe904c902a Binary files /dev/null and b/sound/weapons/taser3.ogg differ