diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm index 2988b54e8f..956b91929e 100644 --- a/code/game/objects/items/storage/secure.dm +++ b/code/game/objects/items/storage/secure.dm @@ -164,11 +164,15 @@ /obj/item/storage/secure/briefcase/hos/mws_pack_hos/PopulateContents() new /obj/item/gun/ballistic/revolver/mws(src) new /obj/item/ammo_box/magazine/mws_mag(src) + new /obj/item/ammo_box/magazine/mws_mag(src) new /obj/item/ammo_casing/mws_batt/lethal(src) new /obj/item/ammo_casing/mws_batt/lethal(src) + new /obj/item/ammo_casing/mws_batt/lethal(src) + new /obj/item/ammo_casing/mws_batt/stun(src) new /obj/item/ammo_casing/mws_batt/stun(src) new /obj/item/ammo_casing/mws_batt/stun(src) new /obj/item/ammo_casing/mws_batt/ion(src) + new /obj/item/ammo_casing/mws_batt/taser(src) /obj/item/storage/secure/briefcase/hos/multiphase_box name = "\improper X-01 Multiphase energy gun box" diff --git a/code/modules/projectiles/boxes_magazines/external/rechargable.dm b/code/modules/projectiles/boxes_magazines/external/rechargable.dm index 76b2102731..f7f3dc7801 100644 --- a/code/modules/projectiles/boxes_magazines/external/rechargable.dm +++ b/code/modules/projectiles/boxes_magazines/external/rechargable.dm @@ -94,23 +94,35 @@ /obj/item/ammo_casing/mws_batt/lethal name = "'MWS' microbattery - LETHAL" type_color = "#bf3d3d" - type_name = "LETHAL" + type_name = "LASE" projectile_type = /obj/item/projectile/beam + fire_sound = 'sound/weapons/laser.ogg' /obj/item/ammo_casing/mws_batt/stun - name = "'MWS' microbattery - STUN" + name = "'MWS' microbattery - DISABLER" type_color = "#0f81bc" - type_name = "STUN" + type_name = "DISABLE" projectile_type = /obj/item/projectile/beam/disabler + e_cost = 60 //gives it 10 disabler shots in line with literally all other eguns. + fire_sound = 'sound/weapons/taser2.ogg' /obj/item/ammo_casing/mws_batt/xray name = "'MWS' microbattery - XRAY" type_color = "#32c025" type_name = "XRAY" projectile_type = /obj/item/projectile/beam/xray + fire_sound = 'sound/weapons/laser3.ogg' /obj/item/ammo_casing/mws_batt/ion name = "'MWS' microbattery - ION" type_color = "#d084d6" type_name = "ION" projectile_type = /obj/item/projectile/ion + fire_sound = 'sound/weapons/IonRifle.ogg' + +/obj/item/ammo_casing/mws_batt/taser + name = "'MWS' microbattery - TASER" + type_color = "#e5ff00" + type_name = "TASE" + projectile_type = /obj/item/projectile/energy/electrode + fire_sound = 'sound/weapons/taser.ogg' diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index 06342937dc..08f52b8e43 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -390,16 +390,12 @@ // ---------- Code originally from VoreStation ---------- /obj/item/gun/ballistic/revolver/mws name = "MWS-01 'Big Iron'" - desc = "Modular Weapons System" - + desc = "Modular Weapon System-01, does fit on your hip." icon = 'icons/obj/guns/projectile.dmi' icon_state = "mws" - - fire_sound = 'sound/weapons/Taser.ogg' - + fire_sound = 'sound/weapons/pulse2.ogg' //if you hear this sound something went wrong! mag_type = /obj/item/ammo_box/magazine/mws_mag spawnwithmagazine = FALSE - recoil = 0 var/charge_sections = 6 diff --git a/sound/weapons/MWSfire.ogg b/sound/weapons/MWSfire.ogg new file mode 100644 index 0000000000..05884e18ca Binary files /dev/null and b/sound/weapons/MWSfire.ogg differ