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

* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm

code/modules/reagents/reagent_containers/borghydro.dm

@@ -170,7 +170,8 @@ Borg Shaker
 					RG.add_reagent(reagent_ids[valueofi], 5)
 
 /obj/item/reagent_containers/borghypo/borgshaker/afterattack(obj/target, mob/user, proximity)
-	if(!proximity) return
+	if(!proximity)
+		return
 
 	else if(target.is_open_container() && target.reagents)
 		var/datum/reagents/R = reagent_list[mode]

code/modules/reagents/reagent_containers/dropper.dm

@@ -9,8 +9,10 @@
 	container_type = TRANSPARENT_1
 
 /obj/item/reagent_containers/dropper/afterattack(obj/target, mob/user , proximity)
-	if(!proximity) return
-	if(!target.reagents) return
+	if(!proximity)
+		return
+	if(!target.reagents)
+		return
 
 	if(reagents.total_volume > 0)
 		if(target.reagents.total_volume >= target.reagents.maximum_volume)

code/modules/reagents/reagent_containers/glass.dm

@@ -53,7 +53,8 @@
 			playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
 
 /obj/item/reagent_containers/glass/afterattack(obj/target, mob/user, proximity)
-	if((!proximity) || !check_allowed_items(target,target_self=1)) return
+	if((!proximity) || !check_allowed_items(target,target_self=1))
+		return
 
 	else if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us.
 

code/modules/reagents/reagent_containers/pill.dm

@@ -4,8 +4,8 @@
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "pill"
 	item_state = "pill"
-	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
+	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
 	possible_transfer_amounts = list()
 	volume = 50
 	var/apply_type = INGEST
@@ -54,7 +54,8 @@
 
 
 /obj/item/reagent_containers/pill/afterattack(obj/target, mob/user , proximity)
-	if(!proximity) return
+	if(!proximity)
+		return
 	if(target.is_open_container() != 0 && target.reagents)
 		if(!target.reagents.total_volume)
 			to_chat(user, "<span class='warning'>[target] is empty! There's nothing to dissolve [src] in.</span>")
@@ -150,4 +151,4 @@
 	desc = "I wouldn't eat this if I were you."
 	icon_state = "pill9"
 	color = "#454545"
-	list_reagents = list("shadowmutationtoxin" = 1)
+	list_reagents = list("shadowmutationtoxin" = 1)