From 587bc1795c293d1bcb75980e2671129c8c6ebd08 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Sun, 21 May 2017 00:37:47 -0500 Subject: [PATCH] missing files --- .../effects/temporary_visuals/clockcult.dm | 82 ++++++------- .../objects/effects/temporary_visuals/cult.dm | 70 +++++------ .../temporary_visuals/miscellaneous.dm | 116 +++++++++--------- .../temporary_visuals/temporary_visual.dm | 16 +-- 4 files changed, 142 insertions(+), 142 deletions(-) diff --git a/code/game/objects/effects/temporary_visuals/clockcult.dm b/code/game/objects/effects/temporary_visuals/clockcult.dm index 65c9d30e47..1eae2a3c64 100644 --- a/code/game/objects/effects/temporary_visuals/clockcult.dm +++ b/code/game/objects/effects/temporary_visuals/clockcult.dm @@ -1,68 +1,68 @@ -//temporary visual effects(/obj/effect/overlay/temp) used by clockcult stuff -/obj/effect/overlay/temp/ratvar +//temporary visual effects(/obj/effect/temp_visual) used by clockcult stuff +/obj/effect/temp_visual/ratvar name = "ratvar's light" icon = 'icons/effects/clockwork_effects.dmi' duration = 8 randomdir = 0 layer = ABOVE_NORMAL_TURF_LAYER -/obj/effect/overlay/temp/ratvar/door +/obj/effect/temp_visual/ratvar/door icon_state = "ratvardoorglow" layer = CLOSED_DOOR_LAYER //above closed doors -/obj/effect/overlay/temp/ratvar/door/window +/obj/effect/temp_visual/ratvar/door/window icon_state = "ratvarwindoorglow" layer = ABOVE_WINDOW_LAYER -/obj/effect/overlay/temp/ratvar/beam +/obj/effect/temp_visual/ratvar/beam icon_state = "ratvarbeamglow" -/obj/effect/overlay/temp/ratvar/beam/door +/obj/effect/temp_visual/ratvar/beam/door layer = CLOSED_DOOR_LAYER -/obj/effect/overlay/temp/ratvar/beam/grille +/obj/effect/temp_visual/ratvar/beam/grille layer = BELOW_OBJ_LAYER -/obj/effect/overlay/temp/ratvar/beam/itemconsume +/obj/effect/temp_visual/ratvar/beam/itemconsume layer = HIGH_OBJ_LAYER -/obj/effect/overlay/temp/ratvar/beam/falsewall +/obj/effect/temp_visual/ratvar/beam/falsewall layer = OBJ_LAYER -/obj/effect/overlay/temp/ratvar/beam/catwalk +/obj/effect/temp_visual/ratvar/beam/catwalk layer = LATTICE_LAYER -/obj/effect/overlay/temp/ratvar/wall +/obj/effect/temp_visual/ratvar/wall icon_state = "ratvarwallglow" -/obj/effect/overlay/temp/ratvar/wall/false +/obj/effect/temp_visual/ratvar/wall/false layer = OBJ_LAYER -/obj/effect/overlay/temp/ratvar/floor +/obj/effect/temp_visual/ratvar/floor icon_state = "ratvarfloorglow" -/obj/effect/overlay/temp/ratvar/floor/catwalk +/obj/effect/temp_visual/ratvar/floor/catwalk layer = LATTICE_LAYER -/obj/effect/overlay/temp/ratvar/window +/obj/effect/temp_visual/ratvar/window icon_state = "ratvarwindowglow" layer = ABOVE_OBJ_LAYER -/obj/effect/overlay/temp/ratvar/window/single +/obj/effect/temp_visual/ratvar/window/single icon_state = "ratvarwindowglow_s" -/obj/effect/overlay/temp/ratvar/gear +/obj/effect/temp_visual/ratvar/gear icon_state = "ratvargearglow" layer = BELOW_OBJ_LAYER -/obj/effect/overlay/temp/ratvar/grille +/obj/effect/temp_visual/ratvar/grille icon_state = "ratvargrilleglow" layer = BELOW_OBJ_LAYER -/obj/effect/overlay/temp/ratvar/grille/broken +/obj/effect/temp_visual/ratvar/grille/broken icon_state = "ratvarbrokengrilleglow" -/obj/effect/overlay/temp/ratvar/mending_mantra +/obj/effect/temp_visual/ratvar/mending_mantra layer = ABOVE_MOB_LAYER duration = 20 alpha = 200 @@ -70,7 +70,7 @@ light_range = 1.5 light_color = "#1E8CE1" -/obj/effect/overlay/temp/ratvar/mending_mantra/Initialize(mapload) +/obj/effect/temp_visual/ratvar/mending_mantra/Initialize(mapload) . = ..() transform = matrix()*2 var/matrix/M = transform @@ -78,7 +78,7 @@ animate(src, alpha = 20, time = duration, easing = BOUNCE_EASING, flags = ANIMATION_PARALLEL) animate(src, transform = M, time = duration, flags = ANIMATION_PARALLEL) -/obj/effect/overlay/temp/ratvar/volt_hit +/obj/effect/temp_visual/ratvar/volt_hit name = "volt blast" layer = ABOVE_MOB_LAYER duration = 5 @@ -89,13 +89,13 @@ var/mob/user var/damage = 20 -/obj/effect/overlay/temp/ratvar/volt_hit/Initialize(mapload, caster, multiplier) +/obj/effect/temp_visual/ratvar/volt_hit/Initialize(mapload, caster, multiplier) if(multiplier) damage *= multiplier duration = max(round(damage * 0.2), 1) . = ..() -/obj/effect/overlay/temp/ratvar/volt_hit/true/Initialize(mapload, caster, multiplier) +/obj/effect/temp_visual/ratvar/volt_hit/true/Initialize(mapload, caster, multiplier) . = ..() user = caster if(user) @@ -104,7 +104,7 @@ transform = M INVOKE_ASYNC(src, .proc/volthit) -/obj/effect/overlay/temp/ratvar/volt_hit/proc/volthit() +/obj/effect/temp_visual/ratvar/volt_hit/proc/volthit() if(user) Beam(get_turf(user), "volt_ray", time=duration, maxdistance=8, beam_type=/obj/effect/ebeam/volt_ray) var/hit_amount = 0 @@ -134,61 +134,61 @@ else playsound(src, "sparks", 50, 1) -/obj/effect/overlay/temp/ratvar/ocular_warden +/obj/effect/temp_visual/ratvar/ocular_warden name = "warden's gaze" layer = ABOVE_MOB_LAYER icon_state = "warden_gaze" duration = 3 -/obj/effect/overlay/temp/ratvar/ocular_warden/Initialize() +/obj/effect/temp_visual/ratvar/ocular_warden/Initialize() . = ..() pixel_x = rand(-8, 8) pixel_y = rand(-10, 10) animate(src, alpha = 0, time = 3, easing = EASE_OUT) -/obj/effect/overlay/temp/ratvar/spearbreak +/obj/effect/temp_visual/ratvar/spearbreak icon = 'icons/effects/64x64.dmi' icon_state = "ratvarspearbreak" layer = BELOW_MOB_LAYER pixel_y = -16 pixel_x = -16 -/obj/effect/overlay/temp/ratvar/geis_binding +/obj/effect/temp_visual/ratvar/geis_binding icon_state = "geisbinding" -/obj/effect/overlay/temp/ratvar/geis_binding/top +/obj/effect/temp_visual/ratvar/geis_binding/top icon_state = "geisbinding_top" -/obj/effect/overlay/temp/ratvar/component +/obj/effect/temp_visual/ratvar/component icon = 'icons/obj/clockwork_objects.dmi' icon_state = "belligerent_eye" layer = ABOVE_MOB_LAYER duration = 10 -/obj/effect/overlay/temp/ratvar/component/Initialize() +/obj/effect/temp_visual/ratvar/component/Initialize() . = ..() transform = matrix()*0.75 pixel_x = rand(-10, 10) pixel_y = rand(-10, -2) animate(src, pixel_y = pixel_y + 10, alpha = 50, time = 10, easing = EASE_OUT) -/obj/effect/overlay/temp/ratvar/component/cogwheel +/obj/effect/temp_visual/ratvar/component/cogwheel icon_state = "vanguard_cogwheel" -/obj/effect/overlay/temp/ratvar/component/capacitor +/obj/effect/temp_visual/ratvar/component/capacitor icon_state = "geis_capacitor" -/obj/effect/overlay/temp/ratvar/component/alloy +/obj/effect/temp_visual/ratvar/component/alloy icon_state = "replicant_alloy" -/obj/effect/overlay/temp/ratvar/component/ansible +/obj/effect/temp_visual/ratvar/component/ansible icon_state = "hierophant_ansible" -/obj/effect/overlay/temp/ratvar/sigil +/obj/effect/temp_visual/ratvar/sigil name = "glowing circle" icon_state = "sigildull" -/obj/effect/overlay/temp/ratvar/sigil/transgression +/obj/effect/temp_visual/ratvar/sigil/transgression color = "#FAE48C" layer = ABOVE_MOB_LAYER duration = 70 @@ -196,13 +196,13 @@ light_power = 2 light_color = "#FAE48C" -/obj/effect/overlay/temp/ratvar/sigil/transgression/Initialize() +/obj/effect/temp_visual/ratvar/sigil/transgression/Initialize() . = ..() var/oldtransform = transform animate(src, transform = matrix()*2, time = 5) animate(transform = oldtransform, alpha = 0, time = 65) -/obj/effect/overlay/temp/ratvar/sigil/vitality +/obj/effect/temp_visual/ratvar/sigil/vitality color = "#1E8CE1" icon_state = "sigilactivepulse" layer = ABOVE_MOB_LAYER @@ -210,7 +210,7 @@ light_power = 0.5 light_color = "#1E8CE1" -/obj/effect/overlay/temp/ratvar/sigil/accession +/obj/effect/temp_visual/ratvar/sigil/accession color = "#AF0AAF" layer = ABOVE_MOB_LAYER duration = 70 diff --git a/code/game/objects/effects/temporary_visuals/cult.dm b/code/game/objects/effects/temporary_visuals/cult.dm index ad3f84fe06..78cc50cfc1 100644 --- a/code/game/objects/effects/temporary_visuals/cult.dm +++ b/code/game/objects/effects/temporary_visuals/cult.dm @@ -1,58 +1,58 @@ -//temporary visual effects(/obj/effect/overlay/temp) used by cult stuff -/obj/effect/overlay/temp/cult +//temporary visual effects(/obj/effect/temp_visual) used by cult stuff +/obj/effect/temp_visual/cult icon = 'icons/effects/cult_effects.dmi' randomdir = 0 duration = 10 -/obj/effect/overlay/temp/cult/sparks +/obj/effect/temp_visual/cult/sparks randomdir = 1 name = "blood sparks" icon_state = "bloodsparkles" -/obj/effect/overlay/temp/cult/blood // The traditional teleport +/obj/effect/temp_visual/cult/blood // The traditional teleport name = "blood jaunt" duration = 12 icon_state = "bloodin" -/obj/effect/overlay/temp/cult/blood/out +/obj/effect/temp_visual/cult/blood/out icon_state = "bloodout" -/obj/effect/overlay/temp/dir_setting/cult/phase // The veil shifter teleport +/obj/effect/temp_visual/dir_setting/cult/phase // The veil shifter teleport name = "phase glow" duration = 7 icon_state = "cultin" -/obj/effect/overlay/temp/dir_setting/cult/phase/out +/obj/effect/temp_visual/dir_setting/cult/phase/out icon_state = "cultout" -/obj/effect/overlay/temp/cult/sac +/obj/effect/temp_visual/cult/sac name = "maw of Nar-Sie" icon_state = "sacconsume" -/obj/effect/overlay/temp/cult/door +/obj/effect/temp_visual/cult/door name = "unholy glow" icon_state = "doorglow" layer = CLOSED_FIREDOOR_LAYER //above closed doors -/obj/effect/overlay/temp/cult/door/unruned +/obj/effect/temp_visual/cult/door/unruned icon_state = "unruneddoorglow" -/obj/effect/overlay/temp/cult/turf +/obj/effect/temp_visual/cult/turf name = "unholy glow" icon_state = "wallglow" layer = ABOVE_NORMAL_TURF_LAYER -/obj/effect/overlay/temp/cult/turf/floor +/obj/effect/temp_visual/cult/turf/floor icon_state = "floorglow" duration = 5 //visuals for runes being magically created -/obj/effect/overlay/temp/cult/rune_spawn +/obj/effect/temp_visual/cult/rune_spawn icon_state = "runeouter" alpha = 0 var/turnedness = 179 //179 turns counterclockwise, 181 turns clockwise -/obj/effect/overlay/temp/cult/rune_spawn/Initialize(mapload, set_duration, set_color) +/obj/effect/temp_visual/cult/rune_spawn/Initialize(mapload, set_duration, set_color) if(isnum(set_duration)) duration = set_duration if(set_color) @@ -66,79 +66,79 @@ animate(src, alpha = 255, time = duration, easing = BOUNCE_EASING, flags = ANIMATION_PARALLEL) animate(src, transform = oldtransform, time = duration, flags = ANIMATION_PARALLEL) -/obj/effect/overlay/temp/cult/rune_spawn/rune1 +/obj/effect/temp_visual/cult/rune_spawn/rune1 icon_state = "rune1words" turnedness = 181 -/obj/effect/overlay/temp/cult/rune_spawn/rune1/inner +/obj/effect/temp_visual/cult/rune_spawn/rune1/inner icon_state = "rune1inner" turnedness = 179 -/obj/effect/overlay/temp/cult/rune_spawn/rune1/center +/obj/effect/temp_visual/cult/rune_spawn/rune1/center icon_state = "rune1center" -/obj/effect/overlay/temp/cult/rune_spawn/rune2 +/obj/effect/temp_visual/cult/rune_spawn/rune2 icon_state = "rune2words" turnedness = 181 -/obj/effect/overlay/temp/cult/rune_spawn/rune2/inner +/obj/effect/temp_visual/cult/rune_spawn/rune2/inner icon_state = "rune2inner" turnedness = 179 -/obj/effect/overlay/temp/cult/rune_spawn/rune2/center +/obj/effect/temp_visual/cult/rune_spawn/rune2/center icon_state = "rune2center" -/obj/effect/overlay/temp/cult/rune_spawn/rune3 +/obj/effect/temp_visual/cult/rune_spawn/rune3 icon_state = "rune3words" turnedness = 181 -/obj/effect/overlay/temp/cult/rune_spawn/rune3/inner +/obj/effect/temp_visual/cult/rune_spawn/rune3/inner icon_state = "rune3inner" turnedness = 179 -/obj/effect/overlay/temp/cult/rune_spawn/rune3/center +/obj/effect/temp_visual/cult/rune_spawn/rune3/center icon_state = "rune3center" -/obj/effect/overlay/temp/cult/rune_spawn/rune4 +/obj/effect/temp_visual/cult/rune_spawn/rune4 icon_state = "rune4words" turnedness = 181 -/obj/effect/overlay/temp/cult/rune_spawn/rune4/inner +/obj/effect/temp_visual/cult/rune_spawn/rune4/inner icon_state = "rune4inner" turnedness = 179 -/obj/effect/overlay/temp/cult/rune_spawn/rune4/center +/obj/effect/temp_visual/cult/rune_spawn/rune4/center icon_state = "rune4center" -/obj/effect/overlay/temp/cult/rune_spawn/rune5 +/obj/effect/temp_visual/cult/rune_spawn/rune5 icon_state = "rune5words" turnedness = 181 -/obj/effect/overlay/temp/cult/rune_spawn/rune5/inner +/obj/effect/temp_visual/cult/rune_spawn/rune5/inner icon_state = "rune5inner" turnedness = 179 -/obj/effect/overlay/temp/cult/rune_spawn/rune5/center +/obj/effect/temp_visual/cult/rune_spawn/rune5/center icon_state = "rune5center" -/obj/effect/overlay/temp/cult/rune_spawn/rune6 +/obj/effect/temp_visual/cult/rune_spawn/rune6 icon_state = "rune6words" turnedness = 181 -/obj/effect/overlay/temp/cult/rune_spawn/rune6/inner +/obj/effect/temp_visual/cult/rune_spawn/rune6/inner icon_state = "rune6inner" turnedness = 179 -/obj/effect/overlay/temp/cult/rune_spawn/rune6/center +/obj/effect/temp_visual/cult/rune_spawn/rune6/center icon_state = "rune6center" -/obj/effect/overlay/temp/cult/rune_spawn/rune7 +/obj/effect/temp_visual/cult/rune_spawn/rune7 icon_state = "rune7words" turnedness = 181 -/obj/effect/overlay/temp/cult/rune_spawn/rune7/inner +/obj/effect/temp_visual/cult/rune_spawn/rune7/inner icon_state = "rune7inner" turnedness = 179 -/obj/effect/overlay/temp/cult/rune_spawn/rune7/center +/obj/effect/temp_visual/cult/rune_spawn/rune7/center icon_state = "rune7center" diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index 2ceea0aced..c3cf2a5103 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -1,12 +1,12 @@ //unsorted miscellaneous temporary visuals -/obj/effect/overlay/temp/dir_setting/bloodsplatter +/obj/effect/temp_visual/dir_setting/bloodsplatter icon = 'icons/effects/blood.dmi' duration = 5 randomdir = FALSE layer = BELOW_MOB_LAYER var/splatter_type = "splatter" -/obj/effect/overlay/temp/dir_setting/bloodsplatter/Initialize(mapload, set_dir) +/obj/effect/temp_visual/dir_setting/bloodsplatter/Initialize(mapload, set_dir) if(set_dir in GLOB.diagonals) icon_state = "[splatter_type][pick(1, 2, 6)]" else @@ -40,22 +40,22 @@ layer = ABOVE_MOB_LAYER animate(src, pixel_x = target_pixel_x, pixel_y = target_pixel_y, alpha = 0, time = duration) -/obj/effect/overlay/temp/dir_setting/bloodsplatter/xenosplatter +/obj/effect/temp_visual/dir_setting/bloodsplatter/xenosplatter splatter_type = "xsplatter" -/obj/effect/overlay/temp/dir_setting/speedbike_trail +/obj/effect/temp_visual/dir_setting/speedbike_trail name = "speedbike trails" icon_state = "ion_fade" layer = BELOW_MOB_LAYER duration = 10 randomdir = 0 -/obj/effect/overlay/temp/dir_setting/firing_effect +/obj/effect/temp_visual/dir_setting/firing_effect icon = 'icons/effects/effects.dmi' icon_state = "firing_effect" duration = 2 -/obj/effect/overlay/temp/dir_setting/firing_effect/setDir(newdir) +/obj/effect/temp_visual/dir_setting/firing_effect/setDir(newdir) switch(newdir) if(NORTH) layer = BELOW_MOB_LAYER @@ -69,84 +69,84 @@ pixel_y = rand(-1,1) ..() -/obj/effect/overlay/temp/dir_setting/firing_effect/energy +/obj/effect/temp_visual/dir_setting/firing_effect/energy icon_state = "firing_effect_energy" duration = 3 -/obj/effect/overlay/temp/dir_setting/firing_effect/magic +/obj/effect/temp_visual/dir_setting/firing_effect/magic icon_state = "shieldsparkles" duration = 3 -/obj/effect/overlay/temp/dir_setting/ninja +/obj/effect/temp_visual/dir_setting/ninja name = "ninja shadow" icon = 'icons/mob/mob.dmi' icon_state = "uncloak" duration = 9 -/obj/effect/overlay/temp/dir_setting/ninja/cloak +/obj/effect/temp_visual/dir_setting/ninja/cloak icon_state = "cloak" -/obj/effect/overlay/temp/dir_setting/ninja/shadow +/obj/effect/temp_visual/dir_setting/ninja/shadow icon_state = "shadow" -/obj/effect/overlay/temp/dir_setting/ninja/phase +/obj/effect/temp_visual/dir_setting/ninja/phase name = "ninja energy" icon_state = "phasein" -/obj/effect/overlay/temp/dir_setting/ninja/phase/out +/obj/effect/temp_visual/dir_setting/ninja/phase/out icon_state = "phaseout" -/obj/effect/overlay/temp/dir_setting/wraith +/obj/effect/temp_visual/dir_setting/wraith name = "blood" icon = 'icons/mob/mob.dmi' icon_state = "phase_shift2" duration = 12 -/obj/effect/overlay/temp/dir_setting/wraith/out +/obj/effect/temp_visual/dir_setting/wraith/out icon_state = "phase_shift" -/obj/effect/overlay/temp/dir_setting/tailsweep +/obj/effect/temp_visual/dir_setting/tailsweep icon_state = "tailsweep" duration = 4 -/obj/effect/overlay/temp/wizard +/obj/effect/temp_visual/wizard name = "water" icon = 'icons/mob/mob.dmi' icon_state = "reappear" duration = 5 -/obj/effect/overlay/temp/wizard/out +/obj/effect/temp_visual/wizard/out icon_state = "liquify" duration = 12 -/obj/effect/overlay/temp/monkeyify +/obj/effect/temp_visual/monkeyify icon = 'icons/mob/mob.dmi' icon_state = "h2monkey" duration = 22 -/obj/effect/overlay/temp/monkeyify/humanify +/obj/effect/temp_visual/monkeyify/humanify icon_state = "monkey2h" -/obj/effect/overlay/temp/borgflash +/obj/effect/temp_visual/borgflash icon = 'icons/mob/mob.dmi' icon_state = "blspell" duration = 5 -/obj/effect/overlay/temp/guardian +/obj/effect/temp_visual/guardian randomdir = 0 -/obj/effect/overlay/temp/guardian/phase +/obj/effect/temp_visual/guardian/phase duration = 5 icon_state = "phasein" -/obj/effect/overlay/temp/guardian/phase/out +/obj/effect/temp_visual/guardian/phase/out icon_state = "phaseout" -/obj/effect/overlay/temp/decoy +/obj/effect/temp_visual/decoy desc = "It's a decoy!" duration = 15 -/obj/effect/overlay/temp/decoy/Initialize(mapload, atom/mimiced_atom) +/obj/effect/temp_visual/decoy/Initialize(mapload, atom/mimiced_atom) . = ..() alpha = initial(alpha) if(mimiced_atom) @@ -155,95 +155,95 @@ setDir(mimiced_atom.dir) mouse_opacity = 0 -/obj/effect/overlay/temp/decoy/fading/Initialize(mapload, atom/mimiced_atom) +/obj/effect/temp_visual/decoy/fading/Initialize(mapload, atom/mimiced_atom) . = ..() animate(src, alpha = 0, time = duration) -/obj/effect/overlay/temp/decoy/fading/fivesecond +/obj/effect/temp_visual/decoy/fading/fivesecond duration = 50 -/obj/effect/overlay/temp/small_smoke +/obj/effect/temp_visual/small_smoke icon_state = "smoke" duration = 50 -/obj/effect/overlay/temp/fire +/obj/effect/temp_visual/fire icon = 'icons/effects/fire.dmi' icon_state = "3" duration = 20 -/obj/effect/overlay/temp/revenant +/obj/effect/temp_visual/revenant name = "spooky lights" icon_state = "purplesparkles" -/obj/effect/overlay/temp/revenant/cracks +/obj/effect/temp_visual/revenant/cracks name = "glowing cracks" icon_state = "purplecrack" duration = 6 -/obj/effect/overlay/temp/gravpush +/obj/effect/temp_visual/gravpush name = "gravity wave" icon_state = "shieldsparkles" duration = 5 -/obj/effect/overlay/temp/telekinesis +/obj/effect/temp_visual/telekinesis name = "telekinetic force" icon_state = "empdisable" duration = 5 -/obj/effect/overlay/temp/emp +/obj/effect/temp_visual/emp name = "emp sparks" icon_state = "empdisable" -/obj/effect/overlay/temp/emp/pulse +/obj/effect/temp_visual/emp/pulse name = "emp pulse" icon_state = "emppulse" duration = 8 randomdir = 0 -/obj/effect/overlay/temp/gib_animation +/obj/effect/temp_visual/gib_animation icon = 'icons/mob/mob.dmi' duration = 15 -/obj/effect/overlay/temp/gib_animation/Initialize(mapload, gib_icon) +/obj/effect/temp_visual/gib_animation/Initialize(mapload, gib_icon) icon_state = gib_icon // Needs to be before ..() so icon is correct . = ..() -/obj/effect/overlay/temp/gib_animation/animal +/obj/effect/temp_visual/gib_animation/animal icon = 'icons/mob/animal.dmi' -/obj/effect/overlay/temp/dust_animation +/obj/effect/temp_visual/dust_animation icon = 'icons/mob/mob.dmi' duration = 15 -/obj/effect/overlay/temp/dust_animation/Initialize(mapload, dust_icon) +/obj/effect/temp_visual/dust_animation/Initialize(mapload, dust_icon) icon_state = dust_icon // Before ..() so the correct icon is flick()'d . = ..() -/obj/effect/overlay/temp/mummy_animation +/obj/effect/temp_visual/mummy_animation icon = 'icons/mob/mob.dmi' icon_state = "mummy_revive" duration = 20 -/obj/effect/overlay/temp/heal //color is white by default, set to whatever is needed +/obj/effect/temp_visual/heal //color is white by default, set to whatever is needed name = "healing glow" icon_state = "heal" duration = 15 -/obj/effect/overlay/temp/heal/Initialize(mapload, set_color) +/obj/effect/temp_visual/heal/Initialize(mapload, set_color) if(set_color) add_atom_colour(set_color, FIXED_COLOUR_PRIORITY) . = ..() pixel_x = rand(-12, 12) pixel_y = rand(-9, 0) -/obj/effect/overlay/temp/kinetic_blast +/obj/effect/temp_visual/kinetic_blast name = "kinetic explosion" icon = 'icons/obj/projectiles.dmi' icon_state = "kinetic_blast" layer = ABOVE_ALL_MOB_LAYER duration = 4 -/obj/effect/overlay/temp/explosion +/obj/effect/temp_visual/explosion name = "explosion" icon = 'icons/effects/96x96.dmi' icon_state = "explosion" @@ -251,22 +251,22 @@ pixel_y = -32 duration = 8 -/obj/effect/overlay/temp/explosion/fast +/obj/effect/temp_visual/explosion/fast icon_state = "explosionfast" duration = 4 -/obj/effect/overlay/temp/blob +/obj/effect/temp_visual/blob name = "blob" icon_state = "blob_attack" alpha = 140 randomdir = 0 duration = 6 -/obj/effect/overlay/temp/impact_effect +/obj/effect/temp_visual/impact_effect icon_state = "impact_bullet" duration = 5 -/obj/effect/overlay/temp/impact_effect/Initialize(mapload, atom/target, obj/item/projectile/P) +/obj/effect/temp_visual/impact_effect/Initialize(mapload, atom/target, obj/item/projectile/P) if(target == P.original) //the projectile hit the target originally clicked pixel_x = P.p_x + target.pixel_x - 16 + rand(-4,4) pixel_y = P.p_y + target.pixel_y - 16 + rand(-4,4) @@ -275,37 +275,37 @@ pixel_y = target.pixel_y + rand(-4,4) . = ..() -/obj/effect/overlay/temp/impact_effect/red_laser +/obj/effect/temp_visual/impact_effect/red_laser icon_state = "impact_laser" duration = 4 -/obj/effect/overlay/temp/impact_effect/red_laser/wall +/obj/effect/temp_visual/impact_effect/red_laser/wall icon_state = "impact_laser_wall" duration = 10 -/obj/effect/overlay/temp/impact_effect/blue_laser +/obj/effect/temp_visual/impact_effect/blue_laser icon_state = "impact_laser_blue" duration = 4 -/obj/effect/overlay/temp/impact_effect/green_laser +/obj/effect/temp_visual/impact_effect/green_laser icon_state = "impact_laser_green" duration = 4 -/obj/effect/overlay/temp/impact_effect/purple_laser +/obj/effect/temp_visual/impact_effect/purple_laser icon_state = "impact_laser_purple" duration = 4 -/obj/effect/overlay/temp/impact_effect/ion +/obj/effect/temp_visual/impact_effect/ion icon_state = "shieldsparkles" duration = 6 -/obj/effect/overlay/temp/heart +/obj/effect/temp_visual/heart name = "heart" icon = 'icons/mob/animal.dmi' icon_state = "heart" duration = 25 -/obj/effect/overlay/temp/heart/Initialize(mapload) +/obj/effect/temp_visual/heart/Initialize(mapload) . = ..() pixel_x = rand(-4,4) pixel_y = rand(-4,4) diff --git a/code/game/objects/effects/temporary_visuals/temporary_visual.dm b/code/game/objects/effects/temporary_visuals/temporary_visual.dm index 8c7a178bd6..44b9b91224 100644 --- a/code/game/objects/effects/temporary_visuals/temporary_visual.dm +++ b/code/game/objects/effects/temporary_visuals/temporary_visual.dm @@ -1,5 +1,5 @@ //temporary visual effects -/obj/effect/overlay/temp +/obj/effect/temp_visual icon_state = "nothing" anchored = 1 layer = ABOVE_MOB_LAYER @@ -8,30 +8,30 @@ var/randomdir = TRUE var/timerid -/obj/effect/overlay/temp/Initialize() +/obj/effect/temp_visual/Initialize() . = ..() if(randomdir) setDir(pick(GLOB.cardinal)) timerid = QDEL_IN(src, duration) -/obj/effect/overlay/temp/Destroy() +/obj/effect/temp_visual/Destroy() . = ..() deltimer(timerid) -/obj/effect/overlay/temp/singularity_act() +/obj/effect/temp_visual/singularity_act() return -/obj/effect/overlay/temp/singularity_pull() +/obj/effect/temp_visual/singularity_pull() return -/obj/effect/overlay/temp/ex_act() +/obj/effect/temp_visual/ex_act() return -/obj/effect/overlay/temp/dir_setting +/obj/effect/temp_visual/dir_setting randomdir = FALSE -/obj/effect/overlay/temp/dir_setting/Initialize(mapload, set_dir) +/obj/effect/temp_visual/dir_setting/Initialize(mapload, set_dir) if(set_dir) setDir(set_dir) . = ..()