Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 3/30/2016_dumb_gun_balance

# Conflicts resolved:
#	code/modules/projectiles/projectile/beams.dm

code/modules/projectiles/guns/alien.dm

@@ -5,7 +5,7 @@
 	desc = "A vicious alien projectile weapon. Parts of it quiver gelatinously, as though the thing is insectile and alive."
 
 	var/last_regen = 0
-	var/spike_gen_time = 100
+	var/spike_gen_time = 150
 	var/max_spikes = 3
 	var/spikes = 3
 	release_force = 30

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

@@ -110,7 +110,7 @@ obj/item/weapon/gun/energy/retro
 	max_shots = 4
 	fire_delay = 35
 	force = 10
-	w_class = 4
+	w_class = 5 // So it can't fit in a backpack.
 	accuracy = -3 //shooting at the hip
 	scoped_accuracy = 0
 //	requires_two_hands = 1

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

@@ -3,7 +3,7 @@
 	desc = "A portable anti-armour rifle fitted with a scope, the HI PTR-7 Rifle was originally designed to used against armoured exosuits. It is capable of punching through windows and non-reinforced walls with ease. Fires armor piercing 14.5mm shells."
 	icon_state = "heavysniper"
 	item_state = "l6closednomag" //placeholder
-	w_class = 4
+	w_class = 5 // So it can't fit in a backpack.
 	force = 10
 	slot_flags = SLOT_BACK
 	origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 2, TECH_ILLEGAL = 8)