[MIRROR] Does some code standardization/consistency. (#3161)

* Does some code standardization/consistency. * fixes merge conflict generation * Missed a few, oops * Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
parent 953a353ce7
commit adc2e46114
151 changed files with 970 additions and 524 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))