shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14353 from dzahlus/small-big-iron-on-his-hip-in-his-pocket

Browse Source 
MWS-01 Changes
This commit is contained in:
silicons
2021-03-06 16:59:46 -07:00
committed by GitHub
parent f6a3ca1cef 594aa9b3c0
commit 21905f45f3
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/storage/secure.dm
+4
View File
@@ -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"
code/modules/projectiles/boxes_magazines/external/rechargable.dm
Vendored
+10 -3
View File
@@ -94,14 +94,15 @@
/obj/item/ammo_casing/mws_batt/lethal
name = "'MWS' microbattery - LETHAL"
type_color = "#bf3d3d"
type_name = "<span class='lethal'>LETHAL</span>"
type_name = "<span class='lethal'>LASE</span>"
projectile_type = /obj/item/projectile/beam
/obj/item/ammo_casing/mws_batt/stun
name = "'MWS' microbattery - STUN"
name = "'MWS' microbattery - DISABLER"
type_color = "#0f81bc"
type_name = "<span class='stun'>STUN</span>"
type_name = "<span class='stun'>DISABLE</span>"
projectile_type = /obj/item/projectile/beam/disabler
e_cost = 60 //gives it 10 disabler shots in line with literally all other eguns.
/obj/item/ammo_casing/mws_batt/xray
name = "'MWS' microbattery - XRAY"
@@ -114,3 +115,9 @@
type_color = "#d084d6"
type_name = "<span class='ion'>ION</span>"
projectile_type = /obj/item/projectile/ion
/obj/item/ammo_casing/mws_batt/taser
name = "'MWS' microbattery - TASER"
type_color = "#e5ff00"
type_name = "<span class='stun'>TASE</span>"
projectile_type = /obj/item/projectile/energy/electrode/security
code/modules/projectiles/guns/ballistic/revolver.dm
+2 -6
View File
@@ -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/MWSfire.ogg' //i spent 1 hour making a cool sound but byond just compresses it to shit so have this instead >:(
mag_type = /obj/item/ammo_box/magazine/mws_mag
spawnwithmagazine = FALSE
recoil = 0
var/charge_sections = 6