[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
@@ -434,7 +434,8 @@
 		overlays = list()
 		string_attached = null
 		to_chat(user, "<span class='notice'>You detach the string from the coin.</span>")
-	else ..()
+	else
+		..()

 /obj/item/coin/attack_self(mob/user)
 	if(cooldown < world.time)