Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-merge-2017-05-26

# Conflicts:
#	code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
#	code/game/machinery/computer/Operating.dm
#	code/game/machinery/computer/camera.dm
#	code/game/machinery/computer/communications.dm
#	code/game/machinery/computer/security.dm
#	code/game/machinery/computer/skills.dm
#	code/game/objects/items/devices/radio/jammer.dm
#	html/changelogs/.all_changelog.yml
#	maps/~map_system/maps.dm
#	nano/images/nanomap_z1.png
#	nano/images/nanomap_z5.png

code/modules/projectiles/projectile/bullets.dm

@@ -198,26 +198,26 @@
 	penetrating = 1
 
 /obj/item/projectile/bullet/rifle/a762
-	damage = 25
+	damage = 35
 
 /obj/item/projectile/bullet/rifle/a762/ap
-	damage = 20
-	armor_penetration = 50 // At 40 or more armor, this will do more damage than standard rounds.
+	damage = 30
+	armor_penetration = 50 // At 30 or more armor, this will do more damage than standard rounds.
 
 /obj/item/projectile/bullet/rifle/a762/hollow
-	damage = 35
+	damage = 40
 	armor_penetration = -50
 	penetrating = 0
 
 /obj/item/projectile/bullet/rifle/a556
-	damage = 35
+	damage = 25
 
 /obj/item/projectile/bullet/rifle/a556/ap
-	damage = 30
-	armor_penetration = 50 // At 30 or more armor, this will do more damage than standard rounds.
+	damage = 20
+	armor_penetration = 50 // At 40 or more armor, this will do more damage than standard rounds.
 
 /obj/item/projectile/bullet/rifle/a556/hollow
-	damage = 40
+	damage = 35
 	armor_penetration = -50
 	penetrating = 0