Skip to content

Commit b8069b1

Browse files
Adding fadeout effect to go with fadein.
1 parent 90298d0 commit b8069b1

File tree

4 files changed

+36
-15
lines changed

4 files changed

+36
-15
lines changed
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/obj/effect/dummy/fadein/Initialize(mapload, fade_dir = SOUTH, atom/donor)
2+
. = ..()
3+
set_dir(fade_dir)
4+
appearance = donor // grab appearance before ghostizing in case they fall over etc
5+
var/initial_alpha = alpha
6+
alpha = 0
7+
switch(dir)
8+
if(NORTH)
9+
pixel_z = -32
10+
if(SOUTH)
11+
pixel_z = 32
12+
if(EAST)
13+
pixel_w = -32
14+
if(WEST)
15+
pixel_w = 32
16+
animate(src, pixel_z = 0, pixel_w = 0, alpha = initial_alpha, time = 1 SECOND)
17+
QDEL_IN(src, 1 SECOND)
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/obj/effect/dummy/fadeout/Initialize(mapload, fade_dir = SOUTH, atom/donor)
2+
. = ..()
3+
set_dir(fade_dir)
4+
appearance = donor // grab appearance before ghostizing in case they fall over etc
5+
switch(dir)
6+
if(NORTH)
7+
animate(src, pixel_z = 32, alpha = 0, time = 1 SECOND)
8+
if(SOUTH)
9+
animate(src, pixel_z = -32, alpha = 0, time = 1 SECOND)
10+
if(EAST)
11+
animate(src, pixel_w = 32, alpha = 0, time = 1 SECOND)
12+
if(WEST)
13+
animate(src, pixel_w = -32, alpha = 0, time = 1 SECOND)
14+
else
15+
animate(src, alpha = 0, time = 1 SECOND)
16+
QDEL_IN(src, 1 SECOND)

mods/content/fantasy/props/signpost.dm

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,7 @@
3535
var/choice = alert(user, "Are you sure you wish to depart? This will permanently remove your character from the round.", "Venture Forth?", "No", "Yes")
3636
if(choice != "Yes" || QDELETED(user) || user.incapacitated() || QDELETED(src) || !user.Adjacent(src))
3737
return TRUE
38-
var/obj/effect/dummy/fadeout = new(get_turf(user))
39-
fadeout.set_dir(dir)
40-
fadeout.appearance = user // grab appearance before ghostizing in case they fall over etc
41-
switch(dir)
42-
if(NORTH)
43-
animate(fadeout, pixel_z = 32, alpha = 0, time = 1 SECOND)
44-
if(SOUTH)
45-
animate(fadeout, pixel_z = -32, alpha = 0, time = 1 SECOND)
46-
if(EAST)
47-
animate(fadeout, pixel_w = 32, alpha = 0, time = 1 SECOND)
48-
if(WEST)
49-
animate(fadeout, pixel_w = -32, alpha = 0, time = 1 SECOND)
50-
else
51-
animate(fadeout, alpha = 0, time = 1 SECOND)
52-
QDEL_IN(fadeout, 1 SECOND)
38+
new /obj/effect/dummy/fadeout(get_turf(user), dir, user)
5339
despawn_character(user)
5440
return TRUE
5541

nebula.dme

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,6 +1177,8 @@
11771177
#include "code\game\objects\items\devices\cable_painter.dm"
11781178
#include "code\game\objects\items\devices\chameleonproj.dm"
11791179
#include "code\game\objects\items\devices\dociler.dm"
1180+
#include "code\game\objects\items\devices\fadein.dm"
1181+
#include "code\game\objects\items\devices\fadeout.dm"
11801182
#include "code\game\objects\items\devices\flash.dm"
11811183
#include "code\game\objects\items\devices\geiger.dm"
11821184
#include "code\game\objects\items\devices\gps.dm"

0 commit comments

Comments
 (0)