Merge pull request #1879 from SpadesNeil/revert-ammo-fix-p90

Reverts ammo change, fixes P90, changes SVD mag name

code/modules/projectiles/ammunition/boxes.dm

@@ -387,8 +387,8 @@
 /obj/item/ammo_magazine/c762/empty
 	initial_ammo = 0
 
-/obj/item/ammo_magazine/SVD
-	name = "\improper SVD magazine (7.62mm)"
+/obj/item/ammo_magazine/s762 // 's' for small!
+	name = "magazine (7.62mm)"
 	icon_state = "SVD"
 	mag_type = MAGAZINE
 	caliber = "a762"
@@ -397,11 +397,11 @@
 	max_ammo = 10
 	multiple_sprites = 1
 
-/obj/item/ammo_magazine/SVD/empty
+/obj/item/ammo_magazine/s762/empty
 	initial_ammo = 0
 
-/obj/item/ammo_magazine/SVD/ap
-	name = "\improper SVD magazine (7.62mm armor-piercing)"
+/obj/item/ammo_magazine/s762/ap
+	name = "magazine (7.62mm armor-piercing)"
 	ammo_type = /obj/item/ammo_casing/a762/ap
 
 /obj/item/ammo_magazine/clip/a762

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

@@ -61,7 +61,7 @@
 	slot_flags = SLOT_BACK
 	load_method = MAGAZINE
 	magazine_type = /obj/item/ammo_magazine/c762
-	allowed_magazines = list(/obj/item/ammo_magazine/c762, /obj/item/ammo_magazine/SVD)
+	allowed_magazines = list(/obj/item/ammo_magazine/c762, /obj/item/ammo_magazine/s762)
 
 	one_handed_penalty = 4
 
@@ -73,7 +73,7 @@
 
 /obj/item/weapon/gun/projectile/automatic/sts35/update_icon(var/ignore_inhands)
 	..()
-	if(istype(ammo_magazine,/obj/item/ammo_magazine/SVD))
+	if(istype(ammo_magazine,/obj/item/ammo_magazine/s762))
 		icon_state = "arifle-small"
 	else
 		icon_state = (ammo_magazine)? "arifle" : "arifle-empty"
@@ -305,7 +305,7 @@
 	icon_state = "p90smg"
 	item_state = "p90"
 	w_class = 3
-	caliber = "5mm"
+	caliber = "9mm"
 	origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2)
 	slot_flags = SLOT_BELT // ToDo: Belt sprite.
 	fire_sound = 'sound/weapons/Gunshot_light.ogg'

code/modules/projectiles/projectile/bullets.dm

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