diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm
index d899a1b86cf..82b874df0bd 100644
--- a/code/game/objects/items/weapons/material/twohanded.dm
+++ b/code/game/objects/items/weapons/material/twohanded.dm
@@ -261,6 +261,7 @@
var/image/IM = image(I.icon,I.icon_state)
IM.overlays = I.overlays.Copy()
HS.overlays += IM
+ HS.name = "[I.name] on a spear"
qdel(src)
return
return ..()
diff --git a/code/modules/mob/living/simple_animal/bees.dm b/code/modules/mob/living/simple_animal/bees.dm
index 61ea0a26619..2f4f70ea7f9 100644
--- a/code/modules/mob/living/simple_animal/bees.dm
+++ b/code/modules/mob/living/simple_animal/bees.dm
@@ -233,3 +233,8 @@
/mob/living/simple_animal/bee/attempt_pull(var/mob/living/grabber)
return attempt_grab(grabber)
+
+/mob/living/simple_animal/bee/beegun
+ maxHealth = 30
+ strength = 5
+ feral = 30
\ No newline at end of file
diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm
index 8294efdbf80..6f13e73e952 100644
--- a/code/modules/organs/organ_external.dm
+++ b/code/modules/organs/organ_external.dm
@@ -735,13 +735,9 @@ Note that amputating the affected organ does in fact remove the infection from t
switch(disintegrate)
if(DROPLIMB_EDGE)
- compile_icon()
add_blood(victim)
- var/matrix/M = matrix()
- M.Turn(rand(180))
- src.transform = M
if(!clean)
- // Throw limb around.
+ //Throw limb around.
if(src && istype(loc,/turf))
throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),30)
dir = 2
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index cce7c759cbf..c526a029c83 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -179,7 +179,7 @@
distance = 0
if(distance <= range)
var/mob/living/M = T
- if (M.mob_size <= 2 && (M.find_type() & TYPE_ORGANIC))
+ if ((istype(M)) && M.mob_size <= 2 && (M.find_type() & TYPE_ORGANIC))
M.visible_message("[M] bursts like a balloon!")
M.gib()
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm
index ca679df2839..2c5502e1c7e 100644
--- a/code/modules/projectiles/projectile/energy.dm
+++ b/code/modules/projectiles/projectile/energy.dm
@@ -130,7 +130,7 @@
icon = 'icons/obj/apiary_bees_etc.dmi'
icon_state = "beegun"
check_armour = "bio"
- damage = 0
+ damage = 5
damage_type = BRUTE
pass_flags = PASSTABLE | PASSGRILLE
embed = 0
@@ -138,16 +138,13 @@
/obj/item/projectile/energy/bee/on_impact(var/atom/A)
playsound(src.loc, pick('sound/effects/Buzz1.ogg','sound/effects/Buzz2.ogg'), 70, 1)
- for(var/i=1, i<=8, i++)
- var/mob/living/simple_animal/bee/x = new /mob/living/simple_animal/bee
- x.loc = A
- x.feral = 25
- if(ismob(A))
- x.target_mob = A
- if(prob(50))
- for(var/j = 1, j <= rand(1, 3), j++)
- step(x, pick(NORTH,SOUTH,EAST,WEST))
-
+ var/turf/T = get_turf(A)
+ if(!istype(T, /turf/simulated/wall) && !istype(T, /turf/simulated/shuttle/wall) && !istype(A, /obj/structure/window) && !istype(A, /obj/machinery/door))
+ for(var/i=1, i<=8, i++)
+ var/atom/movable/x = new /mob/living/simple_animal/bee/beegun //hackmaster pro, butt fuck it
+ x.forceMove(T)
+ else
+ src.visible_message("[src] splats sickly against [T]!")
..()
/obj/item/projectile/energy/blaster
diff --git a/html/changelogs/LordFowl - MiscUpdate.yml b/html/changelogs/LordFowl - MiscUpdate.yml
index ccd771d2d48..d99deb19cfc 100644
--- a/html/changelogs/LordFowl - MiscUpdate.yml
+++ b/html/changelogs/LordFowl - MiscUpdate.yml
@@ -39,4 +39,7 @@ changes:
- rscadd: "Syndicate manhack delivery grenades are now available via the traitor uplink."
- rscadd: "Manhacks will no longer attack anyone belonging to the 'syndicate' faction, including Heist pirates."
- tweak: "Tweaked loadout customisation whitelists, generally making them more restrictive by role."
+ - tweak: "Dismembered limbs no longer suffer from pixelation due to unnecessary rotation of the sprite."
+ - bugfix: "Severed heads retain the facial features of their owner."
+ - bugfix: "Heads impaled on spears now look like the head of their owner."
- bugfix: "It is no longer possible to be older or younger than your species ought to be."
diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi
index 5581b2effa9..eeda221bcd9 100644
Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ