diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index 434437d20b1..98d4d381635 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -18,11 +18,11 @@
 	damage = 10
 
 /datum/embedding/bullet
-	embed_chance=20
-	fall_chance=2
-	jostle_chance=0
-	ignore_throwspeed_threshold=TRUE
-	pain_stam_pct=0.5
-	pain_mult=3
-	rip_time=10
+	embed_chance = 20
+	fall_chance = 2
+	jostle_chance = 0
+	ignore_throwspeed_threshold = TRUE
+	pain_stam_pct = 0.5
+	pain_mult = 3
+	rip_time = 1 SECONDS
 	stealthy_embed = TRUE
diff --git a/code/modules/projectiles/projectile/bullets/junk.dm b/code/modules/projectiles/projectile/bullets/junk.dm
index 4b6a6bbd60d..a49d7aae4ba 100644
--- a/code/modules/projectiles/projectile/bullets/junk.dm
+++ b/code/modules/projectiles/projectile/bullets/junk.dm
@@ -4,7 +4,7 @@
 	name = "junk bullet"
 	icon_state = "trashball"
 	damage = 30
-	embed_type = /datum/embedding/bullet_junk
+	embed_type = /datum/embedding/bullet/junk
 	/// What biotype does our junk projectile especially harm?
 	var/extra_damage_mob_biotypes = MOB_ROBOTIC
 	/// How much do we multiply our total base damage?
@@ -28,7 +28,7 @@
 		if(finalized_damage)
 			living_target.apply_damage(finalized_damage, damagetype = extra_damage_type, def_zone = BODY_ZONE_CHEST, wound_bonus = wound_bonus)
 
-/datum/embedding/bullet_junk
+/datum/embedding/bullet/junk
 	embed_chance = 15
 	fall_chance = 3
 	jostle_chance = 4
@@ -37,6 +37,7 @@
 	pain_mult = 5
 	jostle_pain_mult = 6
 	rip_time = 1 SECONDS
+	stealthy_embed = FALSE
 
 /obj/projectile/bullet/incendiary/fire/junk
 	name = "burning oil"
@@ -75,11 +76,11 @@
 	name = "junk ripper bullet"
 	icon_state = "redtrac"
 	damage = 10
-	embed_type = /datum/embedding/bullet_junk_ripper
+	embed_type = /datum/embedding/bullet/junk/ripper
 	wound_bonus = 10
 	bare_wound_bonus = 30
 
-/datum/embedding/bullet_junk_ripper
+/datum/embedding/bullet/junk/ripper
 	embed_chance = 100
 	fall_chance = 3
 	jostle_chance = 4
diff --git a/code/modules/projectiles/projectile/bullets/pistol.dm b/code/modules/projectiles/projectile/bullets/pistol.dm
index a19574474d2..9c799fb9c0a 100644
--- a/code/modules/projectiles/projectile/bullets/pistol.dm
+++ b/code/modules/projectiles/projectile/bullets/pistol.dm
@@ -3,9 +3,9 @@
 /obj/projectile/bullet/c9mm
 	name = "9mm bullet"
 	damage = 30
-	embed_type = /datum/embedding/bullet_c9mm
+	embed_type = /datum/embedding/bullet/c9mm
 
-/datum/embedding/bullet_c9mm
+/datum/embedding/bullet/c9mm
 	embed_chance = 15
 	fall_chance = 3
 	jostle_chance = 4
@@ -79,13 +79,13 @@
 	name = ".160 smart bullet"
 	icon_state = "smartgun"
 	damage = 10
-	embed_type = /datum/embedding/bullet_c160smart
+	embed_type = /datum/embedding/bullet/c160smart
 	speed = 0.5
 	homing_turn_speed = 5
 	homing_inaccuracy_min = 4
 	homing_inaccuracy_max = 10
 
-/datum/embedding/bullet_c160smart
+/datum/embedding/bullet/c160smart
 	embed_chance = 10
 	fall_chance = 5
 	jostle_chance = 3
diff --git a/code/modules/projectiles/projectile/bullets/revolver.dm b/code/modules/projectiles/projectile/bullets/revolver.dm
index df798142a12..4c6322a4c75 100644
--- a/code/modules/projectiles/projectile/bullets/revolver.dm
+++ b/code/modules/projectiles/projectile/bullets/revolver.dm
@@ -21,10 +21,10 @@
 	ricochet_auto_aim_range = 3
 	wound_bonus = -20
 	bare_wound_bonus = 10
-	embed_type = /datum/embedding/bullet_c38
+	embed_type = /datum/embedding/bullet/c38
 	embed_falloff_tile = -4
 
-/datum/embedding/bullet_c38
+/datum/embedding/bullet/c38
 	embed_chance = 25
 	fall_chance = 2
 	jostle_chance = 2
@@ -75,11 +75,11 @@
 	sharpness = SHARP_EDGED
 	wound_bonus = 20
 	bare_wound_bonus = 20
-	embed_type = /datum/embedding/bullet_c38_dumdum
+	embed_type = /datum/embedding/bullet/c38/dumdum
 	wound_falloff_tile = -5
 	embed_falloff_tile = -15
 
-/datum/embedding/bullet_c38_dumdum
+/datum/embedding/bullet/c38/dumdum
 	embed_chance = 75
 	fall_chance = 3
 	jostle_chance = 4
@@ -188,4 +188,3 @@
 	if(reagents & NO_REACT) //first impact on a noncarbon
 		reagents.flags &= ~(NO_REACT)
 		reagents.handle_reactions()
-