Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard

code/modules/projectiles/guns/energy/laser.dm

@@ -68,13 +68,14 @@ obj/item/weapon/gun/energy/retro
 	fire_sound = 'sound/weapons/lasercannonfire.ogg'
 	origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_POWER = 3)
 	slot_flags = SLOT_BELT|SLOT_BACK
-	projectile_type = /obj/item/projectile/beam/heavylaser
-	charge_cost = 400
-	max_shots = 6
-	fire_delay = 20
+	projectile_type = /obj/item/projectile/beam/heavylaser/cannon
+	max_shots = 1
+	fire_delay = 30
 //	requires_two_hands = 1
 	one_handed_penalty = 6 // The thing's heavy and huge.
-	accuracy = 2
+	accuracy = 3
+	charge_cost = 400
+
 
 /obj/item/weapon/gun/energy/lasercannon/mounted
 	name = "mounted laser cannon"
@@ -83,6 +84,10 @@ obj/item/weapon/gun/energy/retro
 	recharge_time = 10
 	accuracy = 0 // Mounted cannons are just fine the way they are.
 	requires_two_hands = 0 // Not sure if two-handing gets checked for mounted weapons, but better safe than sorry.
+	projectile_type = /obj/item/projectile/beam/heavylaser
+	charge_cost = 400
+	max_shots = 6
+	fire_delay = 20
 
 /obj/item/weapon/gun/energy/xray
 	name = "xray laser gun"

code/modules/projectiles/guns/projectile/sniper.dm

@@ -10,15 +10,14 @@
 	slot_flags = SLOT_BACK
 	origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 2, TECH_ILLEGAL = 8)
 	caliber = "14.5mm"
-	recoil = 3 //extra kickback
+	recoil = 5 //extra kickback
 	fire_sound = 'sound/weapons/sniper.ogg' // extra boom
 	handle_casings = HOLD_CASINGS
 	load_method = SINGLE_CASING
 	max_shells = 1
 	ammo_type = /obj/item/ammo_casing/a145
-	//+2 accuracy over the LWAP because only one shot
-	accuracy = -1
-	scoped_accuracy = 2
+	accuracy = -5
+	scoped_accuracy = 5
 	var/bolt_open = 0
 
 /obj/item/weapon/gun/projectile/heavysniper/update_icon()

code/modules/projectiles/projectile/beams.dm

@@ -42,6 +42,10 @@
 	tracer_type = /obj/effect/projectile/laser_heavy/tracer
 	impact_type = /obj/effect/projectile/laser_heavy/impact
 
+/obj/item/projectile/beam/heavylaser/cannon
+	damage = 90
+	armor_penetration = 100
+
 /obj/item/projectile/beam/xray
 	name = "xray beam"
 	icon_state = "xray"

code/modules/projectiles/projectile/energy.dm

@@ -80,7 +80,8 @@
 	icon_state = "toxin"
 	damage = 5
 	damage_type = TOX
-	weaken = 5
+	agony = 120
+	check_armour = "energy"
 
 
 /obj/item/projectile/energy/bolt