From a205177ff527db323081d40f4588a0f388556691 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Tue, 26 Feb 2019 21:11:50 -0500 Subject: [PATCH] Reduces the pixel variance of thrown objects and tries to fix the bug where bartender glasses are rotated --- code/game/objects/items.dm | 4 ++-- code/modules/reagents/reagent_containers.dm | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index d14065b4c4..3dab6a66af 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -544,8 +544,8 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) var/matrix/M = matrix(transform) M.Turn(rand(-170, 170)) transform = M - pixel_x = rand(-12, 12) - pixel_y = rand(-12, 12) + pixel_x = rand(-8, 8) + pixel_y = rand(-8, 8) /obj/item/proc/remove_item_from_storage(atom/newLoc) //please use this if you're going to snowflake an item out of a obj/item/storage if(!newLoc) diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index 955b519e6a..98c85b875f 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -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("[src] lands onto the [target.name] without spilling a single drop.") transform = initial(transform) + addtimer(CALLBACK(src, .proc/ForceResetRotation), 1) return else