Merge pull request #14497 from Seris02/capcrystalunleashfix

cap crystal ooc escape fix
This commit is contained in:
Heroman3003
2023-02-22 18:50:13 +10:00
committed by CHOMPStation2
parent 0905d37574
commit b34a6da9bd

View File

@@ -452,7 +452,9 @@
//Let's let our mob out!
/obj/item/capture_crystal/proc/unleash(mob/living/user, atom/target)
if(!user && !target) //We got thrown but we're not sure who did it, let's go to where the crystal is
bound_mob.forceMove(src.drop_location())
var/drop_loc = get_turf(src)
if (drop_loc)
bound_mob.forceMove(drop_loc)
return
if(!target) //We know who wants to let us out, but they didn't say where, so let's drop us on them
bound_mob.forceMove(user.drop_location())