From 6d6f49a95456962f6cd92c53233ff6d18a2ac1a5 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Mon, 25 Jan 2021 15:48:05 -0300 Subject: [PATCH 01/12] Removes the item dropping animations (#11039) --- code/game/atoms_movable.dm | 42 ------------------- code/modules/mob/inventory.dm | 1 - .../mob/living/silicon/robot/items/gripper.dm | 1 - html/changelogs/alberyk-putdownanimation.yml | 6 +++ 4 files changed, 6 insertions(+), 44 deletions(-) create mode 100644 html/changelogs/alberyk-putdownanimation.yml diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 5627fd9c2a8..29a70557039 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -367,48 +367,6 @@ sleep(1) animate(I, alpha = 0, transform = matrix(), time = 1) -/atom/movable/proc/do_putdown_animation(atom/target, mob/user) - spawn() - if(QDELETED(src)) - return - if(QDELETED(target)) - return - if(QDELETED(user)) - return - var/old_invisibility = invisibility // I don't know, it may be used. Basically turns the actual object invisible while the animation plays. - invisibility = 100 - var/turf/old_turf = get_turf(user) - if(QDELETED(old_turf)) - return - var/image/I = image(icon = src, loc = old_turf, layer = layer + 0.1) - I.transform = matrix() * 0 - I.appearance_flags = (RESET_COLOR|RESET_TRANSFORM|NO_CLIENT_COLOR|RESET_ALPHA|PIXEL_SCALE) - I.pixel_x = 0 - I.pixel_y = 0 - if (istype(target,/mob)) - I.dir = target.dir - - var/list/viewing = list() - for (var/mob/M in viewers(target)) - if (M.client) - viewing |= M.client - flick_overlay(I, viewing, 4) - - var/to_x = (target.x - old_turf.x) * 32 + pixel_x - var/to_y = (target.y - old_turf.y) * 32 + pixel_y - var/old_x = pixel_x - var/old_y = pixel_y - pixel_x = 0 - pixel_y = 0 - - animate(I, pixel_x = to_x, pixel_y = to_y, time = 3, transform = matrix(), easing = CUBIC_EASING) - sleep(3) - if(QDELETED(src)) - return - invisibility = old_invisibility - pixel_x = old_x - pixel_y = old_y - /atom/movable/proc/simple_move_animation(atom/target) set waitfor = FALSE diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index 9ae894fe523..98606f87fbe 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -194,7 +194,6 @@ var/list/slot_equipment_priority = list( \ remove_from_mob(W) if(!(W && W.loc)) return TRUE - W.do_putdown_animation(target, src) W.forceMove(target) update_icon() return TRUE diff --git a/code/modules/mob/living/silicon/robot/items/gripper.dm b/code/modules/mob/living/silicon/robot/items/gripper.dm index 2d69ac0c71b..6c539af7480 100644 --- a/code/modules/mob/living/silicon/robot/items/gripper.dm +++ b/code/modules/mob/living/silicon/robot/items/gripper.dm @@ -112,7 +112,6 @@ if(wrapped.loc == src) if(force_holder) wrapped.force = force_holder - wrapped.do_putdown_animation(target, loc) wrapped.forceMove(target) force_holder = null to_chat(loc, SPAN_NOTICE("You release \the [wrapped].")) // loc will always be the cyborg diff --git a/html/changelogs/alberyk-putdownanimation.yml b/html/changelogs/alberyk-putdownanimation.yml new file mode 100644 index 00000000000..c5973971996 --- /dev/null +++ b/html/changelogs/alberyk-putdownanimation.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - rscdel: "Removed the item dropping animations." From fa1b68fd0d9b6642b3bad166a9340f52202ed127 Mon Sep 17 00:00:00 2001 From: AuroraBuildBot Date: Mon, 25 Jan 2021 18:49:09 +0000 Subject: [PATCH 02/12] "[ci skip] Automatic Build - 2021.01.25.18.49.09" --- html/changelog.html | 6 ++++++ html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/alberyk-putdownanimation.yml | 6 ------ 3 files changed, 9 insertions(+), 6 deletions(-) delete mode 100644 html/changelogs/alberyk-putdownanimation.yml diff --git a/html/changelog.html b/html/changelog.html index 997257ba1ad..ac1f1796795 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -35,6 +35,12 @@ -->
+

25 January 2021

+

Alberyk updated:

+
    +
  • Removed the item dropping animations.
    • +
+

24 January 2021

Alberyk updated: