From 0cf21df8b590be79a2840b101f02a4be12a1de23 Mon Sep 17 00:00:00 2001
From: mwerezak <mwerezak@gmail.com>
Date: Wed, 17 Jun 2015 20:59:56 -0400
Subject: [PATCH] Adjusts projectile values

---
 code/modules/projectiles/guns/energy/laser.dm  |  7 +++----
 code/modules/projectiles/projectile/beams.dm   | 12 ++++++++++--
 code/modules/projectiles/projectile/bullets.dm | 18 +++++++++++-------
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index b1c47fd605..3b53c8b5f4 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -7,10 +7,9 @@
 	slot_flags = SLOT_BELT|SLOT_BACK
 	w_class = 3
 	force = 10
-	origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
-	matter = list(DEFAULT_WALL_MATERIAL = 2000)
-	projectile_type = /obj/item/projectile/beam
-	fire_delay = 1 //rapid fire
+	origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
+	matter = list(DEFAULT_WALL_MATERIAL = 2000)
+	projectile_type = /obj/item/projectile/beam/midlaser
 
 /obj/item/weapon/gun/energy/laser/mounted
 	self_recharge = 1
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 8aa493404a..68c61c9d3a 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -23,10 +23,15 @@
 	check_armour = "laser"
 	eyeblur = 2
 
+/obj/item/projectile/beam/midlaser
+	damage = 40
+	armorpen = 10
+
 /obj/item/projectile/beam/heavylaser
 	name = "heavy laser"
 	icon_state = "heavylaser"
 	damage = 60
+	armorpen = 30
 
 	muzzle_type = /obj/effect/projectile/laser_heavy/muzzle
 	tracer_type = /obj/effect/projectile/laser_heavy/tracer
@@ -35,7 +40,8 @@
 /obj/item/projectile/beam/xray
 	name = "xray beam"
 	icon_state = "xray"
-	damage = 30
+	damage = 25
+	armorpen = 50
 
 	muzzle_type = /obj/effect/projectile/xray/muzzle
 	tracer_type = /obj/effect/projectile/xray/tracer
@@ -45,6 +51,7 @@
 	name = "pulse"
 	icon_state = "u_laser"
 	damage = 50
+	armorpen = 30
 
 	muzzle_type = /obj/effect/projectile/laser_pulse/muzzle
 	tracer_type = /obj/effect/projectile/laser_pulse/tracer
@@ -122,7 +129,8 @@
 /obj/item/projectile/beam/sniper
 	name = "sniper beam"
 	icon_state = "xray"
-	damage = 60
+	damage = 50
+	armorpen = 10
 	stun = 3
 	weaken = 3
 	stutter = 3
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index 2038d718e0..7a8f44e7f9 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -119,7 +119,8 @@
 
 /obj/item/projectile/bullet/shotgun
 	name = "slug"
-	damage = 60
+	damage = 50
+	armorpen = 15
 
 /obj/item/projectile/bullet/shotgun/beanbag		//because beanbags are not bullets
 	name = "beanbag"
@@ -139,21 +140,24 @@
 
 /* "Rifle" rounds */
 
-/obj/item/projectile/bullet/rifle/a762
-	damage = 30
+/obj/item/projectile/bullet/rifle
+	armorpen = 20
 	penetrating = 1
 
+/obj/item/projectile/bullet/rifle/a762
+	damage = 25
+
+/obj/item/projectile/bullet/rifle/a556
+	damage = 35
+
 /obj/item/projectile/bullet/rifle/a145
 	damage = 80
 	stun = 3
 	weaken = 3
 	penetrating = 5
+	armorpen = 50
 	hitscan = 1 //so the PTR isn't useless as a sniper weapon
 
-/obj/item/projectile/bullet/rifle/a556
-	damage = 40
-	penetrating = 1
-
 /* Miscellaneous */
 
 /obj/item/projectile/bullet/suffocationbullet//How does this even work?