Fixes a handful of weapons shooting the wrong projectile, phase weapon nerf, floragun buff, one merc nerf. (#8791)

modular_chomp/code/modules/projectiles/ammo_refactor/ammo_overrides.dm

@@ -43,8 +43,8 @@ Small Weapons
 
 /obj/item/weapon/gun/projectile/revolver/detective45
 	caliber = "small"
-	ammo_type = /obj/item/ammo_casing/simple/small
-	projectile_type = /obj/item/projectile/bullet/pistol/rubber
+	ammo_type = /obj/item/ammo_casing/simple/small/rubber
+	projectile_type = /obj/item/projectile/bullet/pistol/medium
 
 /obj/item/weapon/gun/projectile/revolver/lombardi
 	caliber = "small"
@@ -586,19 +586,19 @@ Medium Weapons
 
 /obj/item/weapon/gun/projectile/automatic/serdy/krinkov
 	caliber = "medium"
-	projectile_type = /obj/item/projectile/bullet/rifle/a762x39
+	projectile_type = /obj/item/projectile/bullet/rifle/a762
 	allowed_magazines = list(/obj/item/ammo_magazine/medium,/obj/item/ammo_magazine/medium_small)
 	magazine_type = /obj/item/ammo_magazine/medium
 
 /obj/item/weapon/gun/projectile/automatic/serdy/akm
 	caliber = "medium"
-	projectile_type = /obj/item/projectile/bullet/rifle/a762x39
+	projectile_type = /obj/item/projectile/bullet/rifle/a762
 	allowed_magazines = list(/obj/item/ammo_magazine/medium,/obj/item/ammo_magazine/medium_small)
 	magazine_type = /obj/item/ammo_magazine/medium
 
 /obj/item/weapon/gun/projectile/automatic/serdy/scrapak
 	caliber = "medium"
-	projectile_type = /obj/item/projectile/bullet/rifle/a762x39
+	projectile_type = /obj/item/projectile/bullet/rifle/a762
 	allowed_magazines = list(/obj/item/ammo_magazine/medium,/obj/item/ammo_magazine/medium_small)
 	magazine_type = /obj/item/ammo_magazine/medium
 
@@ -676,7 +676,7 @@ Medium Weapons
 /obj/item/weapon/gun/projectile/automatic/serdy/sks
 	caliber = "medium"
 	ammo_type = /obj/item/ammo_casing/simple/medium
-	projectile_type = /obj/item/projectile/bullet/rifle/a762x39
+	projectile_type = /obj/item/projectile/bullet/rifle/a762/sniper
 
 /obj/item/weapon/gun/projectile/automatic/serdy/mosin
 	caliber = "medium"
@@ -702,19 +702,19 @@ Medium Weapons
 
 /obj/item/weapon/gun/projectile/automatic/serdy/memegun
 	caliber = "medium"
-	projectile_type = /obj/item/projectile/bullet/rifle/a762x39
+	projectile_type = /obj/item/projectile/bullet/rifle/a762
 	allowed_magazines = list(/obj/item/ammo_magazine/medium,/obj/item/ammo_magazine/medium_small)
 	magazine_type = /obj/item/ammo_magazine/medium
 
 /obj/item/weapon/gun/projectile/automatic/serdy/tkb408
 	caliber = "medium"
-	projectile_type = /obj/item/projectile/bullet/rifle/a762x39
+	projectile_type = /obj/item/projectile/bullet/rifle/a762
 	allowed_magazines = list(/obj/item/ammo_magazine/medium,/obj/item/ammo_magazine/medium_small)
 	magazine_type = /obj/item/ammo_magazine/medium
 
 /obj/item/weapon/gun/projectile/automatic/serdy/groza
 	caliber = "medium"
-	projectile_type = /obj/item/projectile/bullet/rifle/a762x39
+	projectile_type = /obj/item/projectile/bullet/rifle/a762
 	allowed_magazines = list(/obj/item/ammo_magazine/medium,/obj/item/ammo_magazine/medium_small)
 	magazine_type = /obj/item/ammo_magazine/medium
 
@@ -738,13 +738,13 @@ Medium Weapons
 
 /obj/item/weapon/gun/projectile/automatic/serdy/rpd
 	caliber = "medium"
-	projectile_type = /obj/item/projectile/bullet/rifle/a762x39
+	projectile_type = /obj/item/projectile/bullet/rifle/a762
 	allowed_magazines = list(/obj/item/ammo_magazine/medium_box)
 	magazine_type = /obj/item/ammo_magazine/medium_box
 
 /obj/item/weapon/gun/projectile/automatic/serdy/rpk
 	caliber = "medium"
-	projectile_type = /obj/item/projectile/bullet/rifle/a762x39
+	projectile_type = /obj/item/projectile/bullet/rifle/a762
 	allowed_magazines = list(/obj/item/ammo_magazine/medium,/obj/item/ammo_magazine/medium_drum)
 	magazine_type = /obj/item/ammo_magazine/medium_drum
 

modular_chomp/code/modules/projectiles/guns/bullet.dm

@@ -1,12 +1,43 @@
 /obj/item/projectile/bullet
 	damage = 25 //seems many bullets use this value for some reason
 
+//These are projectiles that do not have damage defined anywhere. Gonna follow laser weapons sorta with a extra kick, 25/35/60
 /obj/item/projectile/bullet/a38 //These projectiles are used but dont exist, revolvers were super underpowered forever
 	damage = 25 //.38 pretty bwoomp
 
-/obj/item/projectile/bullet/rifle/a45lc
-	damage = 35 //.45 used by a single revolver
+/obj/item/projectile/bullet/a10mm
+	damage = 20 //CR-20 do 20 lol
 
+/obj/item/projectile/bullet/rifle/a45lc
+	damage = 35 //.45 used by a one revolver
+
+/obj/item/projectile/bullet/rifle/a762/lmg
+	damage = 30
+
+/obj/item/projectile/bullet/a57 //P90s pack a punch?
+	damage = 30
+
+/obj/item/projectile/bullet/rifle/a545
+	fire_sound = 'sound/weapons/Gunshot_light.ogg'
+	damage = 30
+	hud_state = "rifle"
+
+/obj/item/projectile/bullet/rifle/a545/ap
+	damage = 25
+	armor_penetration = 50 // At 40 or more armor, this will do more damage than standard rounds.
+	hud_state = "rifle_ap"
+
+/obj/item/projectile/bullet/rifle/a545/hp
+	damage = 40
+	armor_penetration = -50
+	penetrating = 0
+	hud_state = "hivelo_iff"
+
+/obj/item/projectile/bullet/rifle/a545/hunter
+	damage = 15
+	SA_bonus_damage = 35 // 50 total on animals.
+	SA_vulnerability = SA_ANIMAL
+	hud_state = "rifle_heavy"
 
 /* Combat refactor walkback, default bullets do 60 damage I think so im keeping this, were not getting the CR20 incident again lol
 /obj/item/projectile/bullet/pistol

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

@@ -1,4 +1,8 @@
-//File has been unticked due to combat refactor walk-back, things do more damage now
+/obj/item/weapon/gun/energy/floragun
+	charge_cost = 80
+
+/*
+//Combat refactor walk-back
 /obj/item/weapon/gun/energy
 	charge_cost = 80
 
@@ -92,3 +96,4 @@
 		list(mode_name="laser", fire_delay = 8, projectile_type=/obj/item/projectile/beam, modifystate="x01laser", fire_sound='sound/weapons/Laser.ogg', charge_cost = 160),
 		list(mode_name="gauss", fire_delay=15, projectile_type=/obj/item/projectile/energy/gauss, modifystate="x01gauss", fire_sound='sound/weapons/gauss_shoot.ogg', charge_cost = 120)
 		)
+*/