diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index 355e2cd4b09..c0a3fada1ed 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -325,7 +325,7 @@ //This is used to make sure the victim hasn't managed to yackety sax away before using the grab. /obj/item/grab/proc/confirm() - if(!assailant || !affecting) + if(!assailant || !affecting || QDELETED(affecting)) qdel(src) return 0 diff --git a/html/changelogs/doxxmedearly - holodeck grabs.yml b/html/changelogs/doxxmedearly - holodeck grabs.yml new file mode 100644 index 00000000000..24a890b56fe --- /dev/null +++ b/html/changelogs/doxxmedearly - holodeck grabs.yml @@ -0,0 +1,6 @@ +author: Doxxmedearly + +delete-after: True + +changes: + - bugfix: "Fixed a bug where deleted mobs would sometimes reappear in someone's hands if grabbed, such as holodeck penguins." \ No newline at end of file