Reapply "Update"

This reverts commit 4a75bbd.

code/datums/ammo/bullet/rifle.dm

@@ -18,6 +18,33 @@
 	damage_falloff = DAMAGE_FALLOFF_TIER_7
 	max_range = 24 //So S8 users don't have their bullets magically disappaer at 22 tiles (S8 can see 24 tiles)
 
+/datum/ammo/bullet/rifle/heavy
+	name = "heavy rifle bullet"
+	headshot_state = HEADSHOT_OVERLAY_MEDIUM
+
+	damage = 55
+	penetration = ARMOR_PENETRATION_TIER_4
+	accuracy = HIT_ACCURACY_TIER_3
+	shell_speed = AMMO_SPEED_TIER_6
+	effective_range_max = 10
+	damage_falloff = DAMAGE_FALLOFF_TIER_9
+
+/datum/ammo/bullet/rifle/heavy/ap
+	name = "armor-piercing heavy rifle bullet"
+	headshot_state = HEADSHOT_OVERLAY_MEDIUM
+
+	damage = 45
+	penetration = ARMOR_PENETRATION_TIER_8
+
+/datum/ammo/bullet/rifle/heavy/heap
+	headshot_state = HEADSHOT_OVERLAY_HEAVY
+	name = "armor-piercing heavy rifle bullet"
+	headshot_state = HEADSHOT_OVERLAY_MEDIUM
+
+	damage = 70
+	penetration = ARMOR_PENETRATION_TIER_10
+
+
 /datum/ammo/bullet/rifle/holo_target
 	name = "holo-targeting rifle bullet"
 	damage = 30

code/modules/defenses/sentry.dm

@@ -23,7 +23,7 @@
 	var/obj/item/ammo_magazine/ammo = new /obj/item/ammo_magazine/sentry
 
 	/// Sound used when firing
-	var/firing_sound = 'sound/weapons/sentry_shoot_loop_01.ogg'
+	var/firing_sound = 'sound/weapons/gun_smartgun1.ogg'
 
 	var/sentry_type = "sentry" //Used for the icon
 	display_additional_stats = TRUE

code/modules/projectiles/guns/rifles.dm

@@ -403,7 +403,7 @@
 	scatter = SCATTER_AMOUNT_TIER_9
 	burst_scatter_mult = SCATTER_AMOUNT_TIER_9
 	scatter_unwielded = SCATTER_AMOUNT_TIER_2
-	damage_mult = BASE_BULLET_DAMAGE_MULT + BULLET_DAMAGE_MULT_TIER_2
+	damage_mult = BASE_BULLET_DAMAGE_MULT
 	recoil_unwielded = RECOIL_AMOUNT_TIER_2
 
 /obj/item/weapon/gun/rifle/m41aMK1/ap //for making it start with ap loaded
@@ -1586,12 +1586,13 @@
 
 /obj/item/weapon/gun/rifle/m4ra/set_gun_config_values()
 	..()
-	set_fire_delay(FIRE_DELAY_TIER_9)
+	set_fire_delay(FIRE_DELAY_TIER_4)
 	set_burst_amount(0)
 	accuracy_mult = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_5
 	accuracy_mult_unwielded = BASE_ACCURACY_MULT - HIT_ACCURACY_MULT_TIER_4
-	damage_mult = BASE_BULLET_DAMAGE_MULT + BULLET_DAMAGE_MULT_TIER_8
-	recoil_unwielded = RECOIL_AMOUNT_TIER_4
+	damage_mult = BASE_BULLET_DAMAGE_MULT
+	recoil_unwielded = RECOIL_AMOUNT_TIER_1
+	recoil = RECOIL_AMOUNT_TIER_3
 	damage_falloff_mult = 0
 	scatter = SCATTER_AMOUNT_TIER_8
 

code/modules/projectiles/guns/smartgun.dm

@@ -34,8 +34,8 @@
 		///datum/action/item_action/smartgun/toggle_motion_detector,
 		/datum/action/item_action/smartgun/toggle_recoil_compensation,
 	)
-	var/datum/ammo/ammo_primary = /datum/ammo/bullet/smartgun //Toggled ammo type
-	var/datum/ammo/ammo_secondary = /datum/ammo/bullet/smartgun/armor_piercing //Toggled ammo type
+	var/datum/ammo/ammo_primary = /datum/ammo/bullet/rifle/heavy //Toggled ammo type
+	var/datum/ammo/ammo_secondary = /datum/ammo/bullet/rifle/heavy/ap //Toggled ammo type
 	var/iff_enabled = TRUE //Begin with the safety on.
 	var/secondary_toggled = 0 //which ammo we use
 	var/recoil_compensation = 0

code/modules/projectiles/magazines/rifles.dm

@@ -138,59 +138,59 @@
 //M4RA, l42 reskin, same stats as before but different, lore friendly, shell.
 
 /obj/item/ammo_magazine/rifle/m4ra
-	name = "\improper M4RA magazine (10x24mm)"
-	desc = "A magazine of standard 10x24mm rounds for use in the M4RA battle rifle."
+	name = "\improper M4RA magazine (10x28mm)"
+	desc = "A magazine of standard 10x28mm rounds for use in the M4RA battle rifle."
 	icon_state = "m4ra"
-	default_ammo = /datum/ammo/bullet/rifle
-	max_rounds = 25
+	caliber = "10x28mm"
+	default_ammo = /datum/ammo/bullet/rifle/heavy
+	max_rounds = 30
 	gun_type = /obj/item/weapon/gun/rifle/m4ra
 	ammo_band_icon = "+m4ra_band"
 	ammo_band_icon_empty = "+m4ra_band_e"
 
 /obj/item/ammo_magazine/rifle/m4ra/ap
-	name = "\improper M4RA armor-piercing magazine (10x24mm)"
-	desc = "A magazine of armor-piercing 10x24mm rounds for use in the M4RA battle rifle."
-	default_ammo = /datum/ammo/bullet/rifle/ap
-	max_rounds = 25
+	name = "\improper M4RA armor-piercing magazine (10x28mm)"
+	desc = "A magazine of armor-piercing 10x28mm rounds for use in the M4RA battle rifle."
+	default_ammo = /datum/ammo/bullet/rifle/heavy/ap
+	max_rounds = 30
 	ammo_band_color = AMMO_BAND_COLOR_AP
 
 /obj/item/ammo_magazine/rifle/m4ra/ext
-	name = "\improper M4RA extended magazine (10x24mm)"
-	desc = "A magazine of armor-piercing 10x24mm rounds for use in the M4RA battle rifle. Holds an additional 10 rounds, up to 35."
+	name = "\improper M4RA extended magazine (10x28mm)"
+	desc = "A magazine of armor-piercing 10x28mm rounds for use in the M4RA battle rifle. Holds an additional 10 rounds, up to 35."
 	icon_state = "m4ra_extended"
 	bonus_overlay = "m4ra_ex"
-	max_rounds = 35
+	max_rounds = 40
 
 /obj/item/ammo_magazine/rifle/m4ra/rubber
-	name = "M4RA rubber magazine (10x24mm)"
-	desc = "A magazine of less than lethal rubber 10x24mm rounds for use in the M4RA battle rifle."
+	name = "M4RA rubber magazine (10x28mm)"
+	desc = "A magazine of less than lethal rubber 10x28mm rounds for use in the M4RA battle rifle."
 	default_ammo = /datum/ammo/bullet/rifle/rubber
 	ammo_band_color = AMMO_BAND_COLOR_RUBBER
 
 /obj/item/ammo_magazine/rifle/m4ra/heap
-	name = "\improper M4RA high-explosive armor-piercing magazine (10x24mm)"
-	desc = "A magazine of high explosive armor piercing 10x24mm rounds for use in the M4RA battle rifle."
-	default_ammo = /datum/ammo/bullet/rifle/heap
+	name = "\improper M4RA high-explosive armor-piercing magazine (10x28mm)"
+	desc = "A magazine of high explosive armor piercing 10x28mm rounds for use in the M4RA battle rifle."
+	default_ammo = /datum/ammo/bullet/rifle/heavy/heap
 	ammo_band_color = AMMO_BAND_COLOR_HEAP
 
 /obj/item/ammo_magazine/rifle/m4ra/penetrating
-	name = "\improper M4RA wall-penetrating magazine (10x24mm)"
-	desc = "A magazine of wall-penetrating 10x24mm rounds for use in the M4RA battle rifle."
+	name = "\improper M4RA wall-penetrating magazine (10x28mm)"
+	desc = "A magazine of wall-penetrating 10x28mm rounds for use in the M4RA battle rifle."
 	default_ammo = /datum/ammo/bullet/rifle/ap/penetrating
 	ammo_band_color = AMMO_BAND_COLOR_PENETRATING
 
 /obj/item/ammo_magazine/rifle/m4ra/incendiary
-	name = "\improper M4RA incendiary magazine (10x24mm)"
-	desc = "A magazine of incendiary 10x24mm rounds for use in the M4RA battle rifle."
+	name = "\improper M4RA incendiary magazine (10x28mm)"
+	desc = "A magazine of incendiary 10x28mm rounds for use in the M4RA battle rifle."
 	default_ammo = /datum/ammo/bullet/rifle/incendiary
 	ammo_band_color = AMMO_BAND_COLOR_INCENDIARY
 
 /obj/item/ammo_magazine/rifle/m4ra/pve
-	name = "\improper M4RA depleted uranium magazine (10x24mm)"
-	desc = "A magazine of wall-penetrating, body-penetrating, toxic 10x24mm rounds for use in the M4RA-R2 battle rifle."
+	name = "\improper M4RA depleted uranium magazine (10x28mm)"
+	desc = "A magazine of wall-penetrating, body-penetrating, toxic 10x28mm rounds for use in the M4RA-R2 battle rifle."
 	icon_state = "m4ra"
 	default_ammo = /datum/ammo/bullet/rifle/m4ra/du
-	max_rounds = 30
 	gun_type = /obj/item/weapon/gun/rifle/m4ra/pve
 	ammo_band_color = AMMO_BAND_COLOR_TOXIN
 

code/modules/projectiles/magazines/sentries.dm

@@ -8,7 +8,7 @@
 	flags_magazine = NO_FLAGS //can't be refilled or emptied by hand
 	caliber = "10x28mm"
 	max_rounds = 500
-	default_ammo = /datum/ammo/bullet/turret
+	default_ammo = /datum/ammo/bullet/rifle/heavy
 	gun_type = null
 
 /obj/item/ammo_magazine/sentry/dropped
@@ -20,7 +20,7 @@
 	current_rounds = 99999
 
 /obj/item/ammo_magazine/sentry/premade/dumb
-	default_ammo = /datum/ammo/bullet/turret/dumb
+	default_ammo = /datum/ammo/bullet/rifle/heavy
 
 /obj/item/ammo_magazine/sentry/upp
 	name = "AK-500 ammo drum (7.62mm Caseless)"

code/modules/projectiles/magazines/specialist.dm

@@ -101,7 +101,7 @@
 	icon_state = "m56_drum"
 	max_rounds = 500 //Should be 500 in total.
 	w_class = SIZE_MEDIUM
-	default_ammo = /datum/ammo/bullet/smartgun
+	default_ammo = /datum/ammo/bullet/rifle/heavy
 	gun_type = /obj/item/weapon/gun/smartgun
 
 /obj/item/ammo_magazine/smartgun/dirty