cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 17:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disruptor Nerf (#10698)

Browse Source
This commit is contained in:
Geeves
2021-01-02 14:56:22 +02:00
committed by GitHub
parent e629af762c
commit 114224e094
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/projectiles/guns/energy/disrupter.dm
View File

@@ -15,7 +15,7 @@
matter = list(DEFAULT_WALL_MATERIAL = 2000)
projectile_type = /obj/item/projectile/energy/disruptorstun
secondary_projectile_type = /obj/item/projectile/energy/blaster
max_shots = 12 //12 shots stun, 8 shots lethal.
max_shots = 8
charge_cost = 150
fire_delay = 8
accuracy = 1
@@ -24,8 +24,8 @@
sel_mode = 1
var/selectframecheck = FALSE
firemodes = list(
list(mode_name="stun", projectile_type=/obj/item/projectile/energy/disruptorstun, modifystate="disruptorpistolstun", charge_cost = 150, fire_sound = 'sound/weapons/gunshot/bolter.ogg'),
list(mode_name="lethal", projectile_type=/obj/item/projectile/energy/blaster, modifystate="disruptorpistolkill", recoil = 1, charge_cost = 225, fire_sound = 'sound/weapons/gunshot/bolter.ogg')
list(mode_name="stun", projectile_type=/obj/item/projectile/energy/disruptorstun, modifystate="disruptorpistolstun", fire_sound = 'sound/weapons/gunshot/bolter.ogg'),
list(mode_name="lethal", projectile_type=/obj/item/projectile/energy/blaster/disruptor, modifystate="disruptorpistolkill", recoil = 1, fire_sound = 'sound/weapons/gunshot/bolter.ogg')
)
/obj/item/gun/energy/disruptorpistol/security
@@ -35,7 +35,7 @@
name = "miniature disruptor pistol"
desc = "A Nanotrasen designed blaster pistol with two settings: stun and lethal. This is the miniature version."
icon = 'icons/obj/guns/disruptorpistol/disruptorpistolc.dmi'
max_shots = 7
max_shots = 5
force = 3
slot_flags = SLOT_BELT|SLOT_HOLSTER|SLOT_POCKET
w_class = ITEMSIZE_SMALL
@@ -47,7 +47,7 @@
name = "magnum disruptor pistol"
desc = "A Nanotrasen designed blaster pistol with two settings: stun and lethal. This is the magnum version."
icon = 'icons/obj/guns/disruptorpistol/disruptorpistolm.dmi'
max_shots = 20
max_shots = 12
force = 6
/obj/item/gun/energy/disruptorpistol/magnum/security

6
code/modules/projectiles/projectile/energy.dm
View File

@@ -201,10 +201,14 @@
muzzle_type = /obj/effect/projectile/muzzle/bolt
hit_effect = /obj/effect/temp_visual/blaster_effect
/obj/item/projectile/energy/blaster/disruptor
damage = 20
pass_flags = PASSTABLE
/obj/item/projectile/energy/disruptorstun
name = "disruptor bolt"
icon_state = "blue_laser"
agony = 45
agony = 25
speed = 0.4
damage_type = PAIN // Can't blow your own head off with a stunbolt.
taser_effect = TRUE