From 5d6d45904d186256a4f80cb4253ad060bc850e76 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Mon, 26 Jul 2021 17:23:32 -0400 Subject: [PATCH 1/2] Merge pull request #11259 from VOREStation/Arokha/dropfix AAAAAA --- code/_global_vars/bitfields.dm | 2 ++ code/game/objects/structures/droppod.dm | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/_global_vars/bitfields.dm b/code/_global_vars/bitfields.dm index be3de4adeb..90f98b6fa1 100644 --- a/code/_global_vars/bitfields.dm +++ b/code/_global_vars/bitfields.dm @@ -14,6 +14,8 @@ GLOBAL_LIST_INIT(bitfields, list( "RESET_COLOR" = RESET_COLOR, "RESET_TRANSFORM" = RESET_TRANSFORM, "TILE_BOUND" = TILE_BOUND, + "PASS_MOUSE" = PASS_MOUSE, + "TILE_MOVER" = TILE_MOVER ), "vis_flags" = list( "VIS_HIDE" = VIS_HIDE, diff --git a/code/game/objects/structures/droppod.dm b/code/game/objects/structures/droppod.dm index 3f9c3417d1..5d2edc3158 100644 --- a/code/game/objects/structures/droppod.dm +++ b/code/game/objects/structures/droppod.dm @@ -5,7 +5,6 @@ icon_state = "pod" density = TRUE anchored = TRUE - bound_height = 50 var/polite = FALSE // polite ones don't violently murder everything var/finished = FALSE @@ -42,11 +41,11 @@ // Wheeeeeee plane = ABOVE_PLANE - pixel_z = 300 + pixel_y = 300 alpha = 0 forceMove(T) playsound(T, 'sound/effects/droppod.ogg', 50, 1) - animate(src, pixel_z = 0, time = 3 SECONDS, easing = SINE_EASING|EASE_OUT) + animate(src, pixel_y = 0, time = 3 SECONDS, easing = SINE_EASING|EASE_OUT) animate(src, alpha = 255, time = 1 SECOND, flags = ANIMATION_PARALLEL) filters += filter(type="drop_shadow", x=-64, y=100, size=10) animate(filters[filters.len], x=0, y=0, size=0, time=3 SECONDS, flags=ANIMATION_PARALLEL, easing=SINE_EASING|EASE_OUT)