bugfixes

code/datums/components/embedded.dm

@@ -53,8 +53,6 @@
 	var/harmful
 	var/mutable_appearance/overlay
 
-	var/damage = weapon.throwforce
-
 /datum/component/embedded/Initialize(obj/item/I,
 			datum/thrownthing/throwingdatum,
 			obj/item/bodypart/part,
@@ -142,39 +140,35 @@
 	weapon.forceMove(victim)
 	RegisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING), .proc/byeItemCarbon)
 
+	var/damage = weapon.throwforce
 	if(harmful)
 		victim.visible_message("<span class='danger'>[weapon] embeds itself in [victim]'s [limb.name]!</span>",ignored_mobs=victim)
 		to_chat(victim, "<span class='userdanger'>[weapon] embeds itself in your [limb.name]!</span>")
 		victim.throw_alert("embeddedobject", /obj/screen/alert/embeddedobject)
 		playsound(victim,'sound/weapons/bladeslice.ogg', 40)
 		weapon.add_mob_blood(victim)//it embedded itself in you, of course it's bloody!
-		var/damage += weapon.w_class * impact_pain_mult
+		damage += weapon.w_class * impact_pain_mult
 		SEND_SIGNAL(victim, COMSIG_ADD_MOOD_EVENT, "embedded", /datum/mood_event/embedded)
 	else
 		victim.visible_message("<span class='danger'>[weapon] sticks itself to [victim]'s [limb.name]!</span>",ignored_mobs=victim)
 		to_chat(victim, "<span class='userdanger'>[weapon] sticks itself to your [limb.name]!</span>")
 
 	if(damage > 0)
-		var/armor = victim.run_armor_check(limb.body_zone, "melee", "Your armor has protected your [limb.name].", "Your armor has softened a hit to your [limb.name].",I.armour_penetration)
-		limb.receive_damage(brute=(1-pain_stam_pct) * damage, stamina=pain_stam_pct * damage, blocked=armor, sharpness = I.get_sharpness())
+		var/armor = victim.run_armor_check(limb.body_zone, "melee", "Your armor has protected your [limb.name].", "Your armor has softened a hit to your [limb.name].",weapon.armour_penetration)
+		limb.receive_damage(brute=(1-pain_stam_pct) * damage, stamina=pain_stam_pct * damage, blocked=armor, sharpness = weapon.get_sharpness())
 
 /// Called every time a carbon with a harmful embed moves, rolling a chance for the item to cause pain. The chance is halved if the carbon is crawling or walking.
 /datum/component/embedded/proc/jostleCheck()
 	var/mob/living/carbon/victim = parent
-
-	var/pain_chance_current = jostle_chance
+	var/chance = jostle_chance
 	if(victim.m_intent == MOVE_INTENT_WALK || !(victim.mobility_flags & MOBILITY_STAND))
-		pain_chance_current *= 0.5
+		chance *= 0.5
 
-	if(pain_stam_pct && victim.stam_paralyzed) //if it's a less-lethal embed, give them a break if they're already stamcritted
-		pain_chance_current *= 0.2
-		damage *= 0.5
-	if(harmful && prob(pain_chance_current))
+	if(harmful && prob(chance))
 		var/damage = weapon.w_class * jostle_pain_mult
 		limb.receive_damage(brute=(1-pain_stam_pct) * damage, stamina=pain_stam_pct * damage, wound_bonus = CANT_WOUND)
 		to_chat(victim, "<span class='userdanger'>[weapon] embedded in your [limb.name] jostles and stings!</span>")
 
-
 /// Called when then item randomly falls out of a carbon. This handles the damage and descriptors, then calls safe_remove()
 /datum/component/embedded/proc/fallOutCarbon()
 	var/mob/living/carbon/victim = parent

code/datums/components/pellet_cloud.dm

@@ -196,7 +196,7 @@
 			break
 
 ///One of our pellets hit something, record what it was and check if we're done (terminated == num_pellets)
-/datum/component/pellet_cloud/proc/pellet_hit(obj/projectile/P, atom/movable/firer, atom/target, Angle, hit_zone)
+/datum/component/pellet_cloud/proc/pellet_hit(obj/item/projectile/P, atom/movable/firer, atom/target, Angle, hit_zone)
 	pellets -= P
 	terminated++
 	hits++

code/datums/elements/embed.dm

@@ -2,7 +2,7 @@
 	The presence of this element allows an item (or a projectile carrying an item) to embed itself in a human or turf when it is thrown into a target (whether by hand, gun, or explosive wave) with either
 	at least 4 throwspeed (EMBED_THROWSPEED_THRESHOLD) or ignore_throwspeed_threshold set to TRUE. Items meant to be used as shrapnel for projectiles should have ignore_throwspeed_threshold set to true.
 
-	Whether we're dealing with a direct /obj/item (throwing a knife at someone) or an /obj/projectile with a shrapnel_type, how we handle things plays out the same, with one extra step separating them.
+	Whether we're dealing with a direct /obj/item (throwing a knife at someone) or an /obj/item/projectile with a shrapnel_type, how we handle things plays out the same, with one extra step separating them.
 	Items simply make their COMSIG_MOVABLE_IMPACT or COMSIG_MOVABLE_IMPACT_ZONE check (against a closed turf or a carbon, respectively), while projectiles check on COMSIG_PROJECTILE_SELF_ON_HIT.
 	Upon a projectile hitting a valid target, it spawns whatever type of payload it has defined, then has that try to embed itself in the target on its own.
 
@@ -169,7 +169,7 @@
   *	it to call tryForceEmbed() on its own embed element (it's out of our hands here, our projectile is done), where it will run through all the checks it needs to.
   */
 /datum/element/embed/proc/checkEmbedProjectile(obj/item/projectile/P, atom/movable/firer, atom/hit, angle, hit_zone)
-	if(!iscarbon(hit) && !isclosedturf(hit))
+	if(!iscarbon(hit))
 		Detach(P)
 		return // we don't care
 
@@ -178,16 +178,10 @@
 		payload.name = P.name
 	payload.embedding = P.embedding
 	payload.updateEmbedding()
-	var/did_embed
-	if(iscarbon(hit))
-		var/mob/living/carbon/C = hit
-		var/obj/item/bodypart/limb
-		limb = C.get_bodypart(hit_zone)
-		if(!limb)
-			limb = C.get_bodypart()
-		did_embed = payload.tryEmbed(limb)
-	else
-		did_embed = payload.tryEmbed(hit)
+	var/mob/living/carbon/C = hit
+	var/obj/item/bodypart/limb = C.get_bodypart(hit_zone)
+	if(!limb)
+		limb = C.get_bodypart()
 
 	payload.tryEmbed(limb)
 	Detach(P)
@@ -213,5 +207,5 @@
 		limb = target
 		hit_zone = limb.body_zone
 		C = limb.owner
-	checkEmbed(I, C, hit_zone, forced=TRUE)
+	checkEmbedMob(I, C, hit_zone, forced=TRUE)
 	return TRUE