cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjusts projectile values

Browse Source
This commit is contained in:
mwerezak
2015-06-17 20:59:56 -04:00
parent bb8f706943
commit 0cf21df8b5
3 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/projectiles/guns/energy/laser.dm
View File

@@ -9,8 +9,7 @@
force = 10 force = 10
origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2) origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
matter = list(DEFAULT_WALL_MATERIAL = 2000) matter = list(DEFAULT_WALL_MATERIAL = 2000)
projectile_type = /obj/item/projectile/beam projectile_type = /obj/item/projectile/beam/midlaser
fire_delay = 1 //rapid fire
/obj/item/weapon/gun/energy/laser/mounted /obj/item/weapon/gun/energy/laser/mounted
self_recharge = 1 self_recharge = 1

12
code/modules/projectiles/projectile/beams.dm
View File

@@ -23,10 +23,15 @@
check_armour = "laser" check_armour = "laser"
eyeblur = 2 eyeblur = 2
/obj/item/projectile/beam/midlaser
damage = 40
armorpen = 10
/obj/item/projectile/beam/heavylaser /obj/item/projectile/beam/heavylaser
name = "heavy laser" name = "heavy laser"
icon_state = "heavylaser" icon_state = "heavylaser"
damage = 60 damage = 60
armorpen = 30
muzzle_type = /obj/effect/projectile/laser_heavy/muzzle muzzle_type = /obj/effect/projectile/laser_heavy/muzzle
tracer_type = /obj/effect/projectile/laser_heavy/tracer tracer_type = /obj/effect/projectile/laser_heavy/tracer
@@ -35,7 +40,8 @@
/obj/item/projectile/beam/xray /obj/item/projectile/beam/xray
name = "xray beam" name = "xray beam"
icon_state = "xray" icon_state = "xray"
damage = 30 damage = 25
armorpen = 50
muzzle_type = /obj/effect/projectile/xray/muzzle muzzle_type = /obj/effect/projectile/xray/muzzle
tracer_type = /obj/effect/projectile/xray/tracer tracer_type = /obj/effect/projectile/xray/tracer
@@ -45,6 +51,7 @@
name = "pulse" name = "pulse"
icon_state = "u_laser" icon_state = "u_laser"
damage = 50 damage = 50
armorpen = 30
muzzle_type = /obj/effect/projectile/laser_pulse/muzzle muzzle_type = /obj/effect/projectile/laser_pulse/muzzle
tracer_type = /obj/effect/projectile/laser_pulse/tracer tracer_type = /obj/effect/projectile/laser_pulse/tracer
@@ -122,7 +129,8 @@
/obj/item/projectile/beam/sniper /obj/item/projectile/beam/sniper
name = "sniper beam" name = "sniper beam"
icon_state = "xray" icon_state = "xray"
damage = 60 damage = 50
armorpen = 10
stun = 3 stun = 3
weaken = 3 weaken = 3
stutter = 3 stutter = 3

18
code/modules/projectiles/projectile/bullets.dm
View File

@@ -119,7 +119,8 @@
/obj/item/projectile/bullet/shotgun /obj/item/projectile/bullet/shotgun
name = "slug" name = "slug"
damage = 60 damage = 50
armorpen = 15
/obj/item/projectile/bullet/shotgun/beanbag //because beanbags are not bullets /obj/item/projectile/bullet/shotgun/beanbag //because beanbags are not bullets
name = "beanbag" name = "beanbag"
@@ -139,21 +140,24 @@
/* "Rifle" rounds */ /* "Rifle" rounds */
/obj/item/projectile/bullet/rifle/a762 /obj/item/projectile/bullet/rifle
damage = 30 armorpen = 20
penetrating = 1 penetrating = 1
/obj/item/projectile/bullet/rifle/a762
damage = 25
/obj/item/projectile/bullet/rifle/a556
damage = 35
/obj/item/projectile/bullet/rifle/a145 /obj/item/projectile/bullet/rifle/a145
damage = 80 damage = 80
stun = 3 stun = 3
weaken = 3 weaken = 3
penetrating = 5 penetrating = 5
armorpen = 50
hitscan = 1 //so the PTR isn't useless as a sniper weapon hitscan = 1 //so the PTR isn't useless as a sniper weapon
/obj/item/projectile/bullet/rifle/a556
damage = 40
penetrating = 1
/* Miscellaneous */ /* Miscellaneous */
/obj/item/projectile/bullet/suffocationbullet//How does this even work? /obj/item/projectile/bullet/suffocationbullet//How does this even work?