diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm
index 16b7f855e99..f5f27274b07 100644
--- a/code/modules/projectiles/guns/ballistic/rifle.dm
+++ b/code/modules/projectiles/guns/ballistic/rifle.dm
@@ -273,6 +273,7 @@
 	obj_flags = UNIQUE_RENAME
 	can_be_sawn_off = FALSE
 	trigger_guard = TRIGGER_GUARD_ALLOW_ALL
+	pb_knockback = 3
 
 	SET_BASE_PIXEL(-8, 0)
 
@@ -303,13 +304,16 @@
 	accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/pipegun/pistol
 	projectile_damage_multiplier = 0.50
 	spread = 15 //kinda inaccurate
+	burst_size = 3 //but it empties the entire magazine when it fires
+	fire_delay = 0.3 // and by empties, I mean it does it all at once
 	slot_flags = ITEM_SLOT_BELT
 	w_class = WEIGHT_CLASS_NORMAL
 	weapon_weight = WEAPON_MEDIUM
+	semi_auto = TRUE
 
 	SET_BASE_PIXEL(0, 0)
 
-/obj/item/gun/ballistic/rifle/boltaction/pipegun/pipepistol/add_bayonet_point()
+/obj/item/gun/ballistic/rifle/boltaction/pipegun/pistol/add_bayonet_point()
 	return
 
 /obj/item/gun/ballistic/rifle/boltaction/pipegun/prime
@@ -330,6 +334,7 @@
 	inhand_icon_state = "regal_pipepistol"
 	accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/pipegun/pistol/prime
 	projectile_damage_multiplier = 1
+	burst_size = 6 // WHOLE CLIP
 	spread = 0
 
 /// MAGICAL BOLT ACTIONS ///
diff --git a/code/modules/projectiles/projectile/bullets/junk.dm b/code/modules/projectiles/projectile/bullets/junk.dm
index 285c3ea2815..1c6ea89962e 100644
--- a/code/modules/projectiles/projectile/bullets/junk.dm
+++ b/code/modules/projectiles/projectile/bullets/junk.dm
@@ -5,9 +5,28 @@
 	icon_state = "trashball"
 	damage = 30
 	embed_type = /datum/embed_data/bullet_junk
-	var/bane_mob_biotypes = MOB_ROBOTIC
-	var/bane_multiplier = 1.5
-	var/bane_added_damage = 0
+	/// What biotype does our junk projectile especially harm?
+	var/extra_damage_mob_biotypes = MOB_ROBOTIC
+	/// How much do we multiply our total base damage?
+	var/extra_damage_multiplier = 1.5
+	/// How much extra damage do we do on top of this total damage? Separate from the multiplier and unaffected by it.
+	var/extra_damage_added_damage = 0
+	/// What damage type is our extra damage?
+	var/extra_damage_type = BRUTE
+
+/obj/projectile/bullet/junk/on_hit(atom/target, blocked = 0, pierce_hit)
+	. = ..()
+
+	if(!isliving(target))
+		return
+	var/mob/living/living_target = target
+
+	var/is_correct_biotype = living_target.mob_biotypes & extra_damage_mob_biotypes
+	if(extra_damage_mob_biotypes && is_correct_biotype)
+		var/multiplied_damage = extra_damage_multiplier ? ((damage * extra_damage_multiplier) - damage) : 0
+		var/finalized_damage = multiplied_damage + extra_damage_added_damage
+		if(finalized_damage)
+			living_target.apply_damage(finalized_damage, damagetype = extra_damage_type, def_zone = BODY_ZONE_CHEST, wound_bonus = wound_bonus)
 
 /datum/embed_data/bullet_junk
 	embed_chance=15
@@ -19,10 +38,6 @@
 	jostle_pain_mult=6
 	rip_time=10
 
-/obj/projectile/bullet/junk/Initialize(mapload)
-	. = ..()
-	AddElement(/datum/element/bane, mob_biotypes = bane_mob_biotypes, target_type = /mob/living, damage_multiplier = bane_multiplier, added_damage = bane_added_damage, requires_combat_mode = FALSE)
-
 /obj/projectile/bullet/incendiary/fire/junk
 	name = "burning oil"
 	damage = 30
@@ -40,7 +55,8 @@
 	damage = 15
 	embed_type = null
 	shrapnel_type = null
-	bane_multiplier = 3
+	extra_damage_added_damage = 30
+	extra_damage_type = BURN
 
 /obj/projectile/bullet/junk/shock/on_hit(atom/target, blocked = 0, pierce_hit)
 	. = ..()
@@ -51,9 +67,9 @@
 /obj/projectile/bullet/junk/hunter
 	name = "junk hunter bullet"
 	icon_state = "gauss"
-	bane_mob_biotypes = MOB_ROBOTIC | MOB_BEAST | MOB_SPECIAL
-	bane_multiplier = 0
-	bane_added_damage = 50
+	extra_damage_mob_biotypes = MOB_ROBOTIC | MOB_BEAST | MOB_SPECIAL
+	extra_damage_multiplier = 0
+	extra_damage_added_damage = 50
 
 /obj/projectile/bullet/junk/ripper
 	name = "junk ripper bullet"