Merge branch 'master' into upstream-merge-31737

2017-10-21 07:18:14 -05:00
parent 448e2d9448 d25cb1ba5d
commit 62273a3867
591 changed files with 181531 additions and 178280 deletions
@@ -558,7 +558,8 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 	..()
 	if(current_size >= STAGE_FOUR)
 		throw_at(S,14,3, spin=0)
-	else return
+	else
+		return

 /obj/item/throw_impact(atom/A)
 	if(A && !QDELETED(A))