cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2669 from CHOMPStationBot/upstream-merge-11259

Browse Source 
[MIRROR] AAAAAA
This commit is contained in:
Nadyr
2021-07-26 18:32:22 -04:00
committed by GitHub
parent c5a339b38b d2cfd655b4
commit 9cf1fa2a1f
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/_global_vars/bitfields.dm
View File

@@ -14,6 +14,8 @@ GLOBAL_LIST_INIT(bitfields, list(
"RESET_COLOR" = RESET_COLOR, "RESET_COLOR" = RESET_COLOR,
"RESET_TRANSFORM" = RESET_TRANSFORM, "RESET_TRANSFORM" = RESET_TRANSFORM,
"TILE_BOUND" = TILE_BOUND, "TILE_BOUND" = TILE_BOUND,
"PASS_MOUSE" = PASS_MOUSE,
"TILE_MOVER" = TILE_MOVER
), ),
"vis_flags" = list( "vis_flags" = list(
"VIS_HIDE" = VIS_HIDE, "VIS_HIDE" = VIS_HIDE,

5
code/game/objects/structures/droppod.dm
View File

@@ -5,7 +5,6 @@
icon_state = "pod" icon_state = "pod"
density = TRUE density = TRUE
anchored = TRUE anchored = TRUE
bound_height = 50
var/polite = FALSE // polite ones don't violently murder everything var/polite = FALSE // polite ones don't violently murder everything
var/finished = FALSE var/finished = FALSE
@@ -42,11 +41,11 @@
// Wheeeeeee // Wheeeeeee
plane = ABOVE_PLANE plane = ABOVE_PLANE
pixel_z = 300 pixel_y = 300
alpha = 0 alpha = 0
forceMove(T) forceMove(T)
playsound(T, 'sound/effects/droppod.ogg', 50, 1) 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) animate(src, alpha = 255, time = 1 SECOND, flags = ANIMATION_PARALLEL)
filters += filter(type="drop_shadow", x=-64, y=100, size=10) 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) animate(filters[filters.len], x=0, y=0, size=0, time=3 SECONDS, flags=ANIMATION_PARALLEL, easing=SINE_EASING|EASE_OUT)