Merge master into dev.

2026-07-19 11:05:50 +01:00 · 2015-02-12 23:01:08 +10:30
parent d40eecd163 0955b001dc
commit a8089d4437
25 changed files with 1252 additions and 1209 deletions
@@ -141,9 +141,10 @@
 		if(isliving(src.loc))
 			return
 		user.next_move = max(user.next_move+2,world.time + 2)
-	src.pickup(user)
 	add_fingerprint(user)
 	user.put_in_active_hand(src)
+	if(src.loc == user)
+		src.pickup(user)
 	return


@@ -104,7 +104,7 @@
 		return

 	..()
-	take_damage(Proj.damage * 4)
+	take_damage(Proj.damage)
 	return