cleanup

cmss13-devs · Jan 16, 2024 · f508aeb · f508aeb
1 parent 66fd09a
commit f508aeb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/code/datums/ammo/bullet/rifle.dm b/code/datums/ammo/bullet/rifle.dm
@@ -200,9 +200,9 @@
 		BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_penetrating)
 	))
 
-/datum/ammo/bullet/rifle/m4ra/du/on_hit_mob(mob/M,obj/projectile/P)
-	M.AddComponent(/datum/component/toxic_buildup, acid_per_hit)
-	knockback(M, P, 2)
+/datum/ammo/bullet/rifle/m4ra/du/on_hit_mob(mob/target, obj/projectile/fired_proj)
+	target.AddComponent(/datum/component/toxic_buildup, acid_per_hit)
+	knockback(target, fired_proj, max_range = 2)
 
 
 /datum/ammo/bullet/rifle/mar40

diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm
@@ -2232,14 +2232,8 @@ Defined in conflicts.dm of the #defines folder.
 
 /obj/item/attachable/m4ra_barrel/pve
 	name = "M4RA-R2 muzzle break"
-	desc = "This isn't supposed to be seperated from the gun, how'd this happen?"
 	icon_state = "pve_m4ra_barrel"
 	attach_icon = "pve_m4ra_barrel"
-	slot = "special"
-	wield_delay_mod = WIELD_DELAY_NONE
-	flags_attach_features = NO_FLAGS
-	melee_mod = 0 //Integrated attachment for visuals, stats handled on main gun.
-	size_mod = 0
 
 /obj/item/attachable/upp_rpg_breech
 	name = "HJRA-12 Breech"

diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm
@@ -1636,7 +1636,6 @@
 	)
 
 /obj/item/weapon/gun/rifle/m4ra/pve/handle_starting_attachment()
-
 	..()
 	var/obj/item/attachable/m4ra_barrel/pve/integrated = new(src)
 	integrated.flags_attach_features &= ~ATTACH_REMOVABLE