Merge remote-tracking branch 'upstream/master'

2026-08-22 11:37:40 +01:00 · 2011-12-23 02:22:39 -05:00
parent 8f53cb2d87 d930fd6ce9
commit a302464d3b
8 changed files with 18 additions and 18 deletions
@@ -73,7 +73,7 @@
 		if(isrobot(user))
 			return

-		else
+		else if (!isnull(I)) // As per code/game/atom_procs.dm, this shouldn't even be required, but for some reason is. -- Abi79
 			user.drop_item()

 			I.loc = src