diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm
index b48636f9ba4..d747680baee 100644
--- a/code/game/objects/structures/crates_lockers/largecrate.dm
+++ b/code/game/objects/structures/crates_lockers/largecrate.dm
@@ -17,15 +17,20 @@
I.forceMove(src)
/obj/structure/largecrate/attack_hand(mob/user as mob)
- user << "You need a crowbar to pry this open!"
+ to_chat(user, "You need a crowbar to pry this open!")
return
/obj/structure/largecrate/attackby(obj/item/weapon/W as obj, mob/user as mob)
+ var/turf/T = get_turf(src)
+ if(!T)
+ to_chat(user, "You can't open this here!")
if(W.is_crowbar())
new /obj/item/stack/material/wood(src)
- var/turf/T = get_turf(src)
+
for(var/atom/movable/AM in contents)
- if(AM.simulated) AM.forceMove(T)
+ if(AM.simulated)
+ AM.forceMove(T)
+
user.visible_message("[user] pries \the [src] open.", \
"You pry open \the [src].", \
"You hear splitting wood.")