Merge pull request #8051 from deathride58/gitgudscrub

Reduces the pixel variance of thrown objects by four pixels and attempts to fix bartender glasses tilting uncontrollably
2019-03-01 02:27:55 -08:00
parent ba19aad791 a205177ff5
commit 2bd991042c
2 changed files with 6 additions and 2 deletions
@@ -82,6 +82,9 @@
 			if(D.active)
 				return TRUE

+/obj/item/reagent_containers/proc/ForceResetRotation()
+	transform = initial(transform)
+
 /obj/item/reagent_containers/proc/SplashReagents(atom/target, thrown = FALSE)
 	if(!reagents || !reagents.total_volume || !spillable)
 		return
@@ -104,6 +107,7 @@
 	else if(bartender_check(target) && thrown)
 		visible_message("<span class='notice'>[src] lands onto the [target.name] without spilling a single drop.</span>")
 		transform = initial(transform)
+		addtimer(CALLBACK(src, .proc/ForceResetRotation), 1)
 		return

 	else