From c89b1e8463b652f88ba4de21227d67d25f82f5fa Mon Sep 17 00:00:00 2001 From: uraniummeltdown Date: Thu, 18 Jan 2018 13:03:49 +0500 Subject: [PATCH] repaths /obj/effect/overlay/temp to /obj/effect/temp_visual --- code/_onclick/telekinesis.dm | 2 +- code/datums/spells/construct_spells.dm | 4 +- code/datums/spells/ethereal_jaunt.dm | 4 +- code/datums/spells/wizard.dm | 2 +- code/game/dna/genes/monkey.dm | 4 +- code/game/gamemodes/cult/cult_items.dm | 6 +- code/game/gamemodes/cult/cult_structures.dm | 4 +- code/game/gamemodes/cult/runes.dm | 2 +- .../miniantags/abduction/abduction_gear.dm | 4 +- .../miniantags/abduction/machinery/pad.dm | 16 ++-- .../gamemodes/miniantags/guardian/guardian.dm | 6 +- .../miniantags/guardian/types/assassin.dm | 2 +- .../miniantags/guardian/types/charger.dm | 2 +- .../miniantags/guardian/types/fire.dm | 4 +- .../miniantags/guardian/types/healer.dm | 4 +- .../miniantags/guardian/types/protector.dm | 4 +- .../miniantags/revenant/revenant_abilities.dm | 20 ++--- code/game/machinery/machinery.dm | 2 +- .../objects/effects/temporary_visuals/cult.dm | 20 ++--- .../temporary_visuals/miscellaneous.dm | 70 +++++++++--------- .../temporary_visuals/temporary_visual.dm | 14 ++-- code/game/objects/empulse.dm | 2 +- code/game/objects/items/devices/flash.dm | 4 +- code/game/objects/items/weapons/powerfist.dm | 2 +- code/game/objects/structures/misc.dm | 2 +- code/game/turfs/simulated/walls_misc.dm | 6 +- .../clothing/spacesuits/rig/modules/ninja.dm | 6 +- code/modules/mining/equipment_locker.dm | 8 +- .../mining/lavaland/loot/ashdragon_loot.dm | 4 +- .../mining/lavaland/loot/colossus_loot.dm | 6 +- .../mining/lavaland/loot/hierophant_loot.dm | 26 +++---- .../living/simple_animal/friendly/corgi.dm | 2 +- .../hostile/megafauna/bubblegum.dm | 36 ++++----- .../hostile/megafauna/colossus.dm | 6 +- .../simple_animal/hostile/megafauna/dragon.dm | 20 ++--- .../hostile/megafauna/hierophant.dm | 74 +++++++++---------- code/modules/mob/mob_movement.dm | 4 +- .../guns/energy/kinetic_accelerator.dm | 4 +- code/modules/projectiles/projectile.dm | 4 +- code/modules/shuttle/ripple.dm | 4 +- code/modules/shuttle/shuttle.dm | 2 +- code/modules/vehicle/speedbike.dm | 2 +- 42 files changed, 210 insertions(+), 210 deletions(-) diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index 18c2aab62e4..02c2954b61f 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -180,7 +180,7 @@ var/const/tk_maxrange = 15 /obj/item/tk_grab/proc/apply_focus_overlay() if(!focus) return - new /obj/effect/overlay/temp/telekinesis(get_turf(focus)) + new /obj/effect/temp_visual/telekinesis(get_turf(focus)) /obj/item/tk_grab/proc/form_grab(mob/user, obj/target) user.put_in_active_hand(src) diff --git a/code/datums/spells/construct_spells.dm b/code/datums/spells/construct_spells.dm index 7ec21d50f33..b625a1ad6e6 100644 --- a/code/datums/spells/construct_spells.dm +++ b/code/datums/spells/construct_spells.dm @@ -113,8 +113,8 @@ jaunt_duration = 50 //in deciseconds centcom_cancast = 0 //Stop people from getting to centcom jaunt_in_time = 12 - jaunt_in_type = /obj/effect/overlay/temp/dir_setting/wraith - jaunt_out_type = /obj/effect/overlay/temp/dir_setting/wraith/out + jaunt_in_type = /obj/effect/temp_visual/dir_setting/wraith + jaunt_out_type = /obj/effect/temp_visual/dir_setting/wraith/out /obj/effect/proc_holder/spell/targeted/projectile/magic_missile/lesser name = "Lesser Magic Missile" diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm index e1bc6aea70d..056e8b5aa8a 100644 --- a/code/datums/spells/ethereal_jaunt.dm +++ b/code/datums/spells/ethereal_jaunt.dm @@ -15,8 +15,8 @@ var/jaunt_duration = 50 //in deciseconds var/jaunt_in_time = 5 - var/jaunt_in_type = /obj/effect/overlay/temp/wizard - var/jaunt_out_type = /obj/effect/overlay/temp/wizard/out + var/jaunt_in_type = /obj/effect/temp_visual/wizard + var/jaunt_out_type = /obj/effect/temp_visual/wizard/out action_icon_state = "jaunt" diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm index dc0217f3152..0816659e414 100644 --- a/code/datums/spells/wizard.dm +++ b/code/datums/spells/wizard.dm @@ -334,7 +334,7 @@ cooldown_min = 150 selection_type = "view" var/maxthrow = 5 - var/sparkle_path = /obj/effect/overlay/temp/gravpush + var/sparkle_path = /obj/effect/temp_visual/gravpush action_icon_state = "repulse" sound = 'sound/magic/Repulse.ogg' diff --git a/code/game/dna/genes/monkey.dm b/code/game/dna/genes/monkey.dm index 33a0f74668c..53f4a00f8d6 100644 --- a/code/game/dna/genes/monkey.dm +++ b/code/game/dna/genes/monkey.dm @@ -25,7 +25,7 @@ H.icon = null H.invisibility = 101 - new /obj/effect/overlay/temp/monkeyify(H.loc) + new /obj/effect/temp_visual/monkeyify(H.loc) sleep(22) H.SetStunned(0) @@ -63,7 +63,7 @@ H.icon = null H.invisibility = 101 - new /obj/effect/overlay/temp/monkeyify/humanify(H.loc) + new /obj/effect/temp_visual/monkeyify/humanify(H.loc) sleep(22) H.SetStunned(0) diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 18055c27634..4ef8fe93626 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -165,7 +165,7 @@ if(current_charges) owner.visible_message("\The [attack_text] is deflected in a burst of blood-red sparks!") current_charges-- - new /obj/effect/overlay/temp/cult/sparks(get_turf(owner)) + new /obj/effect/temp_visual/cult/sparks(get_turf(owner)) if(!current_charges) owner.visible_message("The runed shield around [owner] suddenly disappears!") owner.update_inv_wear_suit() @@ -329,14 +329,14 @@ if(uses <= 0) icon_state ="shifter_drained" playsound(mobloc, "sparks", 50, 1) - new /obj/effect/overlay/temp/dir_setting/cult/phase/out(mobloc, C.dir) + new /obj/effect/temp_visual/dir_setting/cult/phase/out(mobloc, C.dir) var/atom/movable/pulled = handle_teleport_grab(destination, C) C.forceMove(destination) if(pulled) C.start_pulling(pulled) //forcemove resets pulls, so we need to re-pull - new /obj/effect/overlay/temp/dir_setting/cult/phase(destination, C.dir) + new /obj/effect/temp_visual/dir_setting/cult/phase(destination, C.dir) playsound(destination, 'sound/effects/phasein.ogg', 25, 1) playsound(destination, "sparks", 50, 1) diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index b2b97f9adc8..e5f2ce5d4ef 100644 --- a/code/game/gamemodes/cult/cult_structures.dm +++ b/code/game/gamemodes/cult/cult_structures.dm @@ -208,7 +208,7 @@ var/list/blacklisted_pylon_turfs = typecacheof(list( for(var/mob/living/L in range(5, src)) if(iscultist(L) || istype(L, /mob/living/simple_animal/shade) || istype(L, /mob/living/simple_animal/hostile/construct)) if(L.health != L.maxHealth) - new /obj/effect/overlay/temp/heal(get_turf(src), "#960000") + new /obj/effect/temp_visual/heal(get_turf(src), "#960000") if(ishuman(L)) L.adjustBruteLoss(-1) L.adjustFireLoss(-1) @@ -237,7 +237,7 @@ var/list/blacklisted_pylon_turfs = typecacheof(list( else var/turf/simulated/floor/engine/cult/F = safepick(cultturfs) if(F) - new /obj/effect/overlay/temp/cult/turf/open/floor(F) + new /obj/effect/temp_visual/cult/turf/open/floor(F) else // Are we in space or something? No cult turfs or // convertable turfs? diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 7f5ce71ffe0..13e14ab5c3a 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -427,7 +427,7 @@ var/list/teleport_runes = list() sacrificed.Add(T.mind) if(is_sacrifice_target(T.mind)) sacrifice_fulfilled = 1 - new /obj/effect/overlay/temp/cult/sac(loc) + new /obj/effect/temp_visual/cult/sac(loc) if(ticker && ticker.mode && ticker.mode.name == "cult") cult_mode.harvested++ diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index a61fbdb3062..c00200230c5 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -54,7 +54,7 @@ stealth_active = 1 if(ishuman(loc)) var/mob/living/carbon/human/M = src.loc - new /obj/effect/overlay/temp/dir_setting/ninja/cloak(get_turf(M), M.dir) + new /obj/effect/temp_visual/dir_setting/ninja/cloak(get_turf(M), M.dir) M.name_override = disguise.name M.icon = disguise.icon M.icon_state = disguise.icon_state @@ -68,7 +68,7 @@ stealth_active = 0 if(ishuman(loc)) var/mob/living/carbon/human/M = src.loc - new /obj/effect/overlay/temp/dir_setting/ninja(get_turf(M), M.dir) + new /obj/effect/temp_visual/dir_setting/ninja(get_turf(M), M.dir) M.name_override = null M.overlays.Cut() M.regenerate_icons() diff --git a/code/game/gamemodes/miniantags/abduction/machinery/pad.dm b/code/game/gamemodes/miniantags/abduction/machinery/pad.dm index 1c6b06a9c7e..ce30708a76f 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/pad.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/pad.dm @@ -15,37 +15,37 @@ flick("alien-pad", src) for(var/mob/living/target in loc) target.forceMove(teleport_target) - new /obj/effect/overlay/temp/dir_setting/ninja(get_turf(target), target.dir) + new /obj/effect/temp_visual/dir_setting/ninja(get_turf(target), target.dir) to_chat(target, "The instability of the warp leaves you disoriented!") target.Stun(3) /obj/machinery/abductor/pad/proc/Retrieve(mob/living/target) flick("alien-pad", src) - new /obj/effect/overlay/temp/dir_setting/ninja(get_turf(target), target.dir) + new /obj/effect/temp_visual/dir_setting/ninja(get_turf(target), target.dir) Warp(target) /obj/machinery/abductor/pad/proc/MobToLoc(place,mob/living/target) - new/obj/effect/overlay/temp/teleport_abductor(place) + new/obj/effect/temp_visual/teleport_abductor(place) sleep(80) flick("alien-pad", src) target.forceMove(place) - new /obj/effect/overlay/temp/dir_setting/ninja(get_turf(target), target.dir) + new /obj/effect/temp_visual/dir_setting/ninja(get_turf(target), target.dir) /obj/machinery/abductor/pad/proc/PadToLoc(place) - new/obj/effect/overlay/temp/teleport_abductor(place) + new/obj/effect/temp_visual/teleport_abductor(place) sleep(80) flick("alien-pad", src) for(var/mob/living/target in src.loc) target.forceMove(place) - new /obj/effect/overlay/temp/dir_setting/ninja(get_turf(target), target.dir) + new /obj/effect/temp_visual/dir_setting/ninja(get_turf(target), target.dir) -/obj/effect/overlay/temp/teleport_abductor +/obj/effect/temp_visual/teleport_abductor name = "Huh" icon = 'icons/obj/abductor.dmi' icon_state = "teleport" duration = 80 -/obj/effect/overlay/temp/teleport_abductor/New() +/obj/effect/temp_visual/teleport_abductor/New() var/datum/effect_system/spark_spread/S = new S.set_up(10,0,loc) S.start() diff --git a/code/game/gamemodes/miniantags/guardian/guardian.dm b/code/game/gamemodes/miniantags/guardian/guardian.dm index 009debb8324..42003013441 100644 --- a/code/game/gamemodes/miniantags/guardian/guardian.dm +++ b/code/game/gamemodes/miniantags/guardian/guardian.dm @@ -65,9 +65,9 @@ if(istype(summoner.loc, /obj/effect)) Recall(TRUE) else - new /obj/effect/overlay/temp/guardian/phase/out(loc) + new /obj/effect/temp_visual/guardian/phase/out(loc) forceMove(summoner.loc) //move to summoner's tile, don't recall - new /obj/effect/overlay/temp/guardian/phase(loc) + new /obj/effect/temp_visual/guardian/phase(loc) /mob/living/simple_animal/hostile/guardian/Move() //Returns to summoner if they move out of range ..() @@ -136,7 +136,7 @@ if(cooldown > world.time && !forced) return if(!summoner) return - new /obj/effect/overlay/temp/guardian/phase/out(get_turf(src)) + new /obj/effect/temp_visual/guardian/phase/out(get_turf(src)) forceMove(summoner) buckled = null cooldown = world.time + 30 diff --git a/code/game/gamemodes/miniantags/guardian/types/assassin.dm b/code/game/gamemodes/miniantags/guardian/types/assassin.dm index 39ea9992308..28626133557 100644 --- a/code/game/gamemodes/miniantags/guardian/types/assassin.dm +++ b/code/game/gamemodes/miniantags/guardian/types/assassin.dm @@ -61,7 +61,7 @@ melee_damage_lower = 50 melee_damage_upper = 50 armour_penetration = 100 - new /obj/effect/overlay/temp/guardian/phase(get_turf(src)) + new /obj/effect/temp_visual/guardian/phase(get_turf(src)) alpha = 15 if(!forced) to_chat(src, "You enter stealth, empowering your next attack.") diff --git a/code/game/gamemodes/miniantags/guardian/types/charger.dm b/code/game/gamemodes/miniantags/guardian/types/charger.dm index 39bf995967e..abdc349f175 100644 --- a/code/game/gamemodes/miniantags/guardian/types/charger.dm +++ b/code/game/gamemodes/miniantags/guardian/types/charger.dm @@ -39,7 +39,7 @@ /mob/living/simple_animal/hostile/guardian/charger/Move() if(charging) - new /obj/effect/overlay/temp/decoy/fading(loc,src) + new /obj/effect/temp_visual/decoy/fading(loc,src) . = ..() /mob/living/simple_animal/hostile/guardian/charger/snapback() diff --git a/code/game/gamemodes/miniantags/guardian/types/fire.dm b/code/game/gamemodes/miniantags/guardian/types/fire.dm index 1447f36e739..2a9dc2d2c8e 100644 --- a/code/game/gamemodes/miniantags/guardian/types/fire.dm +++ b/code/game/gamemodes/miniantags/guardian/types/fire.dm @@ -39,9 +39,9 @@ if(ismovableatom(target)) var/atom/movable/M = target if(!M.anchored && M != summoner) - new /obj/effect/overlay/temp/guardian/phase/out(get_turf(M)) + new /obj/effect/temp_visual/guardian/phase/out(get_turf(M)) do_teleport(M, M, 10) - new /obj/effect/overlay/temp/guardian/phase/out(get_turf(M)) + new /obj/effect/temp_visual/guardian/phase/out(get_turf(M)) /mob/living/simple_animal/hostile/guardian/fire/Crossed(AM as mob|obj) ..() diff --git a/code/game/gamemodes/miniantags/guardian/types/healer.dm b/code/game/gamemodes/miniantags/guardian/types/healer.dm index 0a6efb45d06..c8001050ad1 100644 --- a/code/game/gamemodes/miniantags/guardian/types/healer.dm +++ b/code/game/gamemodes/miniantags/guardian/types/healer.dm @@ -125,9 +125,9 @@ if((Z.temperature > 270) && (Z.temperature < 360)) var/pressure = Z.return_pressure() if((pressure > 20) && (pressure < 550)) - new /obj/effect/overlay/temp/guardian/phase/out(get_turf(A)) + new /obj/effect/temp_visual/guardian/phase/out(get_turf(A)) do_teleport(A, beacon, 0) - new /obj/effect/overlay/temp/guardian/phase(get_turf(A)) + new /obj/effect/temp_visual/guardian/phase(get_turf(A)) else to_chat(src, "The beacon isn't in a safe location!") else diff --git a/code/game/gamemodes/miniantags/guardian/types/protector.dm b/code/game/gamemodes/miniantags/guardian/types/protector.dm index aa8bcaf09dc..fe8b4897c42 100644 --- a/code/game/gamemodes/miniantags/guardian/types/protector.dm +++ b/code/game/gamemodes/miniantags/guardian/types/protector.dm @@ -52,6 +52,6 @@ else to_chat(summoner, "You moved out of range, and were pulled back! You can only move [range] meters from [src]!") summoner.visible_message("[summoner] jumps back to their protector.") - new /obj/effect/overlay/temp/guardian/phase/out(get_turf(summoner)) + new /obj/effect/temp_visual/guardian/phase/out(get_turf(summoner)) summoner.forceMove(get_turf(src)) - new /obj/effect/overlay/temp/guardian/phase(get_turf(summoner))//Protector \ No newline at end of file + new /obj/effect/temp_visual/guardian/phase(get_turf(summoner))//Protector \ No newline at end of file diff --git a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm index dc4a62438b7..f982d335fde 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm @@ -212,7 +212,7 @@ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread/ s.set_up(4, 0, L) s.start() - new/obj/effect/overlay/temp/revenant(L.loc) + new/obj/effect/temp_visual/revenant(L.loc) sleep(20) if(!L.on) //wait, wait, don't shock me return @@ -249,23 +249,23 @@ spawn(0) if(T.flags & NOJAUNT) T.flags -= NOJAUNT - new/obj/effect/overlay/temp/revenant(T) + new/obj/effect/temp_visual/revenant(T) for(var/mob/living/carbon/human/human in T.contents) to_chat(human, "You suddenly feel [pick("sick and tired", "tired and confused", "nauseated", "dizzy")].") human.adjustStaminaLoss(stamdamage) human.adjustToxLoss(toxdamage) human.AdjustConfused(confusion, bound_lower = 0, bound_upper = maxconfusion) - new/obj/effect/overlay/temp/revenant(human.loc) + new/obj/effect/temp_visual/revenant(human.loc) if(!istype(T, /turf/simulated/shuttle) && !istype(T, /turf/simulated/wall/rust) && !istype(T, /turf/simulated/wall/r_wall) && istype(T, /turf/simulated/wall) && prob(15)) - new/obj/effect/overlay/temp/revenant(T) + new/obj/effect/temp_visual/revenant(T) T.ChangeTurf(/turf/simulated/wall/rust) if(!istype(T, /turf/simulated/wall/r_wall/rust) && istype(T, /turf/simulated/wall/r_wall) && prob(15)) - new/obj/effect/overlay/temp/revenant(T) + new/obj/effect/temp_visual/revenant(T) T.ChangeTurf(/turf/simulated/wall/r_wall/rust) for(var/obj/structure/window/window in T.contents) window.hit(rand(30,80)) if(window && window.is_fulltile()) - new/obj/effect/overlay/temp/revenant/cracks(window.loc) + new/obj/effect/temp_visual/revenant/cracks(window.loc) for(var/obj/structure/closet/closet in T.contents) closet.open() @@ -296,26 +296,26 @@ spawn(0) for(var/mob/living/simple_animal/bot/bot in T.contents) if(!bot.emagged) - new/obj/effect/overlay/temp/revenant(bot.loc) + new/obj/effect/temp_visual/revenant(bot.loc) bot.locked = 0 bot.open = 1 bot.emag_act(null) for(var/mob/living/carbon/human/human in T.contents) to_chat(human, "You feel [pick("your sense of direction flicker out", "a stabbing pain in your head", "your mind fill with static")].") - new/obj/effect/overlay/temp/revenant(human.loc) + new/obj/effect/temp_visual/revenant(human.loc) human.emp_act(1) for(var/obj/thing in T.contents) if(istype(thing, /obj/machinery/power/apc) || istype(thing, /obj/machinery/power/smes)) //Doesn't work on dominators, SMES and APCs, to prevent kekkery continue if(prob(20)) if(prob(50)) - new/obj/effect/overlay/temp/revenant(thing.loc) + new/obj/effect/temp_visual/revenant(thing.loc) thing.emag_act(null) else if(!istype(thing, /obj/machinery/clonepod)) //I hate everything but mostly the fact there's no better way to do this without just not affecting it at all thing.emp_act(1) for(var/mob/living/silicon/robot/S in T.contents) //Only works on cyborgs, not AI playsound(S, 'sound/machines/warning-buzzer.ogg', 50, 1) - new/obj/effect/overlay/temp/revenant(S.loc) + new/obj/effect/temp_visual/revenant(S.loc) S.spark_system.start() S.emp_act(1) diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 8bdeb7059ca..0497ac716f0 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -173,7 +173,7 @@ Class Procs: if(use_power && stat == 0) use_power(7500/severity) - new/obj/effect/overlay/temp/emp(loc) + new/obj/effect/temp_visual/emp(loc) ..() /obj/machinery/ex_act(severity) diff --git a/code/game/objects/effects/temporary_visuals/cult.dm b/code/game/objects/effects/temporary_visuals/cult.dm index 55ea2799ce8..8edb88a7e79 100644 --- a/code/game/objects/effects/temporary_visuals/cult.dm +++ b/code/game/objects/effects/temporary_visuals/cult.dm @@ -1,40 +1,40 @@ -//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 = FALSE duration = 10 -/obj/effect/overlay/temp/cult/sparks +/obj/effect/temp_visual/cult/sparks randomdir = TRUE name = "blood sparks" icon_state = "bloodsparkles" -/obj/effect/overlay/temp/dir_setting/cult/phase +/obj/effect/temp_visual/dir_setting/cult/phase name = "phase glow" duration = 7 icon = 'icons/effects/cult_effects.dmi' 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 = 3.17 //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 = TURF_LAYER + 0.07 -/obj/effect/overlay/temp/cult/turf/open/floor +/obj/effect/temp_visual/cult/turf/open/floor icon_state = "floorglow" duration = 5 \ No newline at end of file diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index 04e87285e38..041d848f5f7 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -1,4 +1,4 @@ -/obj/effect/overlay/temp/dir_setting/bloodsplatter +/obj/effect/temp_visual/dir_setting/bloodsplatter icon = 'icons/effects/blood.dmi' duration = 5 randomdir = FALSE @@ -6,7 +6,7 @@ color = "#C80000" var/splatter_type = "splatter" -/obj/effect/overlay/temp/dir_setting/bloodsplatter/New(loc, set_dir, blood_color) +/obj/effect/temp_visual/dir_setting/bloodsplatter/New(loc, set_dir, blood_color) if(blood_color) color = blood_color if(set_dir in diagonals) @@ -42,11 +42,11 @@ layer = MOB_LAYER + 0.1 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 color = null splatter_type = "xsplatter" -/obj/effect/overlay/temp/dir_setting/speedbike_trail +/obj/effect/temp_visual/dir_setting/speedbike_trail name = "speedbike trails" icon = 'icons/effects/effects.dmi' icon_state = "ion_fade" @@ -54,72 +54,72 @@ randomdir = FALSE layer = MOB_LAYER - 0.2 -/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/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 = FALSE -/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/New(loc, atom/mimiced_atom) +/obj/effect/temp_visual/decoy/New(loc, atom/mimiced_atom) ..() alpha = initial(alpha) if(mimiced_atom) @@ -128,62 +128,62 @@ setDir(mimiced_atom.dir) mouse_opacity = 0 -/obj/effect/overlay/temp/decoy/fading/New(loc, atom/mimiced_atom) +/obj/effect/temp_visual/decoy/fading/New(loc, atom/mimiced_atom) ..() animate(src, alpha = 0, time = duration) -/obj/effect/overlay/temp/revenant +/obj/effect/temp_visual/revenant name = "spooky lights" icon = 'icons/effects/effects.dmi' 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 = 'icons/effects/effects.dmi' icon_state = "empdisable" -/obj/effect/overlay/temp/emp/pulse +/obj/effect/temp_visual/emp/pulse name = "emp pulse" icon_state = "emppulse" duration = 8 randomdir = FALSE -/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 = 'icons/effects/effects.dmi' icon_state = "heal" duration = 15 -/obj/effect/overlay/temp/heal/New(loc, colour) +/obj/effect/temp_visual/heal/New(loc, colour) ..() pixel_x = rand(-12, 12) pixel_y = rand(-9, 0) if(colour) color = colour -/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_MOB_LAYER duration = 4 -/obj/effect/overlay/temp/explosion +/obj/effect/temp_visual/explosion name = "explosion" icon = 'icons/effects/96x96.dmi' icon_state = "explosion" @@ -191,17 +191,17 @@ 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/heart +/obj/effect/temp_visual/heart name = "heart" icon = 'icons/mob/animal.dmi' icon_state = "heart" duration = 25 -/obj/effect/overlay/temp/heart/New(loc) +/obj/effect/temp_visual/heart/New(loc) ..() 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 552371e9be2..c9c88861ae2 100644 --- a/code/game/objects/effects/temporary_visuals/temporary_visual.dm +++ b/code/game/objects/effects/temporary_visuals/temporary_visual.dm @@ -1,30 +1,30 @@ //temporary visual effects -/obj/effect/overlay/temp +/obj/effect/temp_visual anchored = 1 layer = ABOVE_MOB_LAYER mouse_opacity = 0 var/duration = 10 var/randomdir = TRUE -/obj/effect/overlay/temp/New() +/obj/effect/temp_visual/New() if(randomdir) setDir(pick(cardinal)) QDEL_IN(src, duration) -/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/New(loc, set_dir) +/obj/effect/temp_visual/dir_setting/New(loc, set_dir) if(set_dir) setDir(set_dir) ..() \ No newline at end of file diff --git a/code/game/objects/empulse.dm b/code/game/objects/empulse.dm index ce7efc4fee3..ddf5b618bd5 100644 --- a/code/game/objects/empulse.dm +++ b/code/game/objects/empulse.dm @@ -9,7 +9,7 @@ log_game("EMP with size ([heavy_range], [light_range]) in area [epicenter.loc.name] ") if(heavy_range > 1) - new/obj/effect/overlay/temp/emp/pulse(epicenter) + new/obj/effect/temp_visual/emp/pulse(epicenter) if(heavy_range > light_range) light_range = heavy_range diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index d449993b0c1..5c4b5d2fe02 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -179,11 +179,11 @@ /obj/item/device/flash/cyborg/attack(mob/living/M, mob/user) ..() - new /obj/effect/overlay/temp/borgflash(get_turf(src)) + new /obj/effect/temp_visual/borgflash(get_turf(src)) /obj/item/device/flash/cyborg/attack_self(mob/user) ..() - new /obj/effect/overlay/temp/borgflash(get_turf(src)) + new /obj/effect/temp_visual/borgflash(get_turf(src)) /obj/item/device/flash/memorizer name = "memorizer" diff --git a/code/game/objects/items/weapons/powerfist.dm b/code/game/objects/items/weapons/powerfist.dm index ec6f285acd1..4398b3d803b 100644 --- a/code/game/objects/items/weapons/powerfist.dm +++ b/code/game/objects/items/weapons/powerfist.dm @@ -85,7 +85,7 @@ target.apply_damage(force * fisto_setting, BRUTE) target.visible_message("[user]'s powerfist lets out a loud hiss as they punch [target.name]!", \ "You cry out in pain as [user]'s punch flings you backwards!") - new /obj/effect/overlay/temp/kinetic_blast(target.loc) + new /obj/effect/temp_visual/kinetic_blast(target.loc) playsound(loc, 'sound/weapons/resonator_blast.ogg', 50, 1) playsound(loc, 'sound/weapons/genhit2.ogg', 50, 1) diff --git a/code/game/objects/structures/misc.dm b/code/game/objects/structures/misc.dm index a344c4c8f18..707cfd00cdd 100644 --- a/code/game/objects/structures/misc.dm +++ b/code/game/objects/structures/misc.dm @@ -46,7 +46,7 @@ playsound(user.loc, 'sound/effects/phasein.ogg', 25, 1) playsound(user.loc, 'sound/effects/sparks2.ogg', 50, 1) - new /obj/effect/overlay/temp/dir_setting/ninja/phase(get_turf(user), user.dir) + new /obj/effect/temp_visual/dir_setting/ninja/phase(get_turf(user), user.dir) to_chat(user, "VOID-Shift translocation successful") if("No") diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm index d0b0a3c8960..8ce32658a62 100644 --- a/code/game/turfs/simulated/walls_misc.dm +++ b/code/game/turfs/simulated/walls_misc.dm @@ -13,7 +13,7 @@ /turf/simulated/wall/cult/New() ..() if(ticker.mode)//game hasn't started offically don't do shit.. - new /obj/effect/overlay/temp/cult/turf(src) + new /obj/effect/temp_visual/cult/turf(src) icon_state = ticker.mode.cultdat.cult_wall_icon_state /turf/simulated/wall/cult/artificer @@ -21,11 +21,11 @@ desc = "A cold stone wall engraved with indecipherable symbols. Studying them causes your head to pound." /turf/simulated/wall/cult/artificer/break_wall() - new /obj/effect/overlay/temp/cult/turf(get_turf(src)) + new /obj/effect/temp_visual/cult/turf(get_turf(src)) return null //excuse me we want no runed metal here /turf/simulated/wall/cult/artificer/devastate_wall() - new /obj/effect/overlay/temp/cult/turf(get_turf(src)) + new /obj/effect/temp_visual/cult/turf(get_turf(src)) /turf/simulated/wall/cult/narsie_act() return diff --git a/code/modules/clothing/spacesuits/rig/modules/ninja.dm b/code/modules/clothing/spacesuits/rig/modules/ninja.dm index 79e73c7c086..1501e2c7f58 100644 --- a/code/modules/clothing/spacesuits/rig/modules/ninja.dm +++ b/code/modules/clothing/spacesuits/rig/modules/ninja.dm @@ -52,7 +52,7 @@ to_chat(H, "You are now visible.") H.invisibility = 0 - new /obj/effect/overlay/temp/dir_setting/ninja(get_turf(H), H.dir) + new /obj/effect/temp_visual/dir_setting/ninja(get_turf(H), H.dir) for(var/mob/O in oviewers(H)) O.show_message("[H.name] appears from thin air!",1) @@ -82,7 +82,7 @@ holder.spark_system.start() playsound(T, 'sound/effects/phasein.ogg', 25, 1) playsound(T, 'sound/effects/sparks2.ogg', 50, 1) - new /obj/effect/overlay/temp/dir_setting/ninja/phase(T, M.dir) + new /obj/effect/temp_visual/dir_setting/ninja/phase(T, M.dir) /obj/item/rig_module/teleporter/proc/phase_out(var/mob/M,var/turf/T) @@ -90,7 +90,7 @@ return playsound(T, "sparks", 50, 1) - new /obj/effect/overlay/temp/dir_setting/ninja/phase/out(T, M.dir) + new /obj/effect/temp_visual/dir_setting/ninja/phase/out(T, M.dir) /obj/item/rig_module/teleporter/engage(var/atom/target, var/notify_ai) diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index d8ab5de433c..700803792e2 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -906,10 +906,10 @@ minerals += M if(minerals.len) for(var/turf/simulated/mineral/M in minerals) - var/obj/effect/overlay/temp/mining_overlay/C = new/obj/effect/overlay/temp/mining_overlay(M) + var/obj/effect/temp_visual/mining_overlay/C = new/obj/effect/temp_visual/mining_overlay(M) C.icon_state = M.scan_state -/obj/effect/overlay/temp/mining_overlay +/obj/effect/temp_visual/mining_overlay layer = 18 icon = 'icons/turf/mining.dmi' anchored = 1 @@ -1009,7 +1009,7 @@ var/target_turf = get_turf(target) if(istype(target_turf, /turf/simulated/mineral)) var/turf/simulated/mineral/M = target_turf - new /obj/effect/overlay/temp/kinetic_blast(M) + new /obj/effect/temp_visual/kinetic_blast(M) M.gets_drilled(firer) ..() @@ -1035,7 +1035,7 @@ return if(proximity_flag && target == mark && isliving(target)) var/mob/living/L = target - new /obj/effect/overlay/temp/kinetic_blast(get_turf(L)) + new /obj/effect/temp_visual/kinetic_blast(get_turf(L)) mark = 0 if(L.mob_size >= MOB_SIZE_LARGE) L.underlays -= marked_image diff --git a/code/modules/mining/lavaland/loot/ashdragon_loot.dm b/code/modules/mining/lavaland/loot/ashdragon_loot.dm index c3b43e06d6f..176cbbcc66b 100644 --- a/code/modules/mining/lavaland/loot/ashdragon_loot.dm +++ b/code/modules/mining/lavaland/loot/ashdragon_loot.dm @@ -189,7 +189,7 @@ if(!istype(T)) return if(!istype(T, turf_type)) - var/obj/effect/overlay/temp/lavastaff/L = new /obj/effect/overlay/temp/lavastaff(T) + var/obj/effect/temp_visual/lavastaff/L = new /obj/effect/temp_visual/lavastaff(T) L.alpha = 0 animate(L, alpha = 255, time = create_delay) user.visible_message("[user] points [src] at [T]!") @@ -211,6 +211,6 @@ timer = world.time + reset_cooldown playsound(T,'sound/magic/Fireball.ogg', 200, 1) -/obj/effect/overlay/temp/lavastaff +/obj/effect/temp_visual/lavastaff icon_state = "lavastaff_warn" duration = 50 diff --git a/code/modules/mining/lavaland/loot/colossus_loot.dm b/code/modules/mining/lavaland/loot/colossus_loot.dm index fc950b429d2..ab3bf49e9ba 100644 --- a/code/modules/mining/lavaland/loot/colossus_loot.dm +++ b/code/modules/mining/lavaland/loot/colossus_loot.dm @@ -284,7 +284,7 @@ if(..()) for(var/i in range(1, src)) if(isturf(i)) - new /obj/effect/overlay/temp/cult/sparks(i) + new /obj/effect/temp_visual/cult/sparks(i) continue if(ishuman(i)) var/mob/living/carbon/human/H = i @@ -367,7 +367,7 @@ var/mob/living/L = target if(L.stat < DEAD) L.heal_overall_damage(heal_power, heal_power) - new /obj/effect/overlay/temp/heal(get_turf(target), "#80F5FF") + new /obj/effect/temp_visual/heal(get_turf(target), "#80F5FF") /mob/living/simple_animal/hostile/lightgeist/ghostize() if(..()) @@ -388,7 +388,7 @@ if(..()) var/list/L = list() var/turf/T = get_step(src, dir) - new /obj/effect/overlay/temp/emp/pulse(T) + new /obj/effect/temp_visual/emp/pulse(T) for(var/i in T) if(istype(i, /obj/item) && !is_type_in_typecache(i, banned_items_typecache)) var/obj/item/W = i diff --git a/code/modules/mining/lavaland/loot/hierophant_loot.dm b/code/modules/mining/lavaland/loot/hierophant_loot.dm index e613b2ab276..0c02d3d47cc 100644 --- a/code/modules/mining/lavaland/loot/hierophant_loot.dm +++ b/code/modules/mining/lavaland/loot/hierophant_loot.dm @@ -38,7 +38,7 @@ timer = world.time + cooldown_time if(isliving(target) && chaser_timer <= world.time) //living and chasers off cooldown? fire one! chaser_timer = world.time + chaser_cooldown - new /obj/effect/overlay/temp/hierophant/chaser(get_turf(user), user, target, 1.5, friendly_fire_check) + new /obj/effect/temp_visual/hierophant/chaser(get_turf(user), user, target, 1.5, friendly_fire_check) add_logs(user, target, "fired a chaser at", src) else spawn(0) @@ -63,7 +63,7 @@ if(do_after(user, 50, target = user)) var/turf/T = get_turf(user) playsound(T,'sound/magic/Blind.ogg', 200, 1, -4) - new /obj/effect/overlay/temp/hierophant/telegraph/teleport(T, user) + new /obj/effect/temp_visual/hierophant/telegraph/teleport(T, user) var/obj/effect/hierophant/H = new/obj/effect/hierophant(T) rune = H user.update_action_buttons_icon() @@ -93,8 +93,8 @@ to_chat(user, "The rune is blocked by something, preventing teleportation!") user.update_action_buttons_icon() return - new /obj/effect/overlay/temp/hierophant/telegraph(T, user) - new /obj/effect/overlay/temp/hierophant/telegraph(source, user) + new /obj/effect/temp_visual/hierophant/telegraph(T, user) + new /obj/effect/temp_visual/hierophant/telegraph(source, user) playsound(T,'sound/magic/blink.ogg', 200, 1) //playsound(T,'sound/magic/Wand_Teleport.ogg', 200, 1) playsound(source,'sound/magic/blink.ogg', 200, 1) @@ -110,13 +110,13 @@ user.update_action_buttons_icon() return add_logs(user, rune, "teleported self from ([source.x],[source.y],[source.z]) to") - new /obj/effect/overlay/temp/hierophant/telegraph/teleport(T, user) - new /obj/effect/overlay/temp/hierophant/telegraph/teleport(source, user) + new /obj/effect/temp_visual/hierophant/telegraph/teleport(T, user) + new /obj/effect/temp_visual/hierophant/telegraph/teleport(source, user) for(var/t in RANGE_TURFS(1, T)) - var/obj/effect/overlay/temp/hierophant/blast/B = new /obj/effect/overlay/temp/hierophant/blast(t, user, TRUE) //blasts produced will not hurt allies + var/obj/effect/temp_visual/hierophant/blast/B = new /obj/effect/temp_visual/hierophant/blast(t, user, TRUE) //blasts produced will not hurt allies B.damage = 30 for(var/t in RANGE_TURFS(1, source)) - var/obj/effect/overlay/temp/hierophant/blast/B = new /obj/effect/overlay/temp/hierophant/blast(t, user, TRUE) //but absolutely will hurt enemies + var/obj/effect/temp_visual/hierophant/blast/B = new /obj/effect/temp_visual/hierophant/blast(t, user, TRUE) //but absolutely will hurt enemies B.damage = 30 for(var/mob/living/L in range(1, source)) spawn(0) @@ -155,11 +155,11 @@ /obj/item/weapon/hierophant_staff/proc/cardinal_blasts(turf/T, mob/living/user) //fire cardinal cross blasts with a delay if(!T) return - new /obj/effect/overlay/temp/hierophant/telegraph/cardinal(T, user) + new /obj/effect/temp_visual/hierophant/telegraph/cardinal(T, user) playsound(T,'sound/magic/blink.ogg', 200, 1) //playsound(T,'sound/effects/bin_close.ogg', 200, 1) sleep(2) - new /obj/effect/overlay/temp/hierophant/blast(T, user, friendly_fire_check) + new /obj/effect/temp_visual/hierophant/blast(T, user, friendly_fire_check) for(var/d in cardinal) spawn(0) blast_wall(T, d, user) @@ -173,16 +173,16 @@ for(var/i in 1 to range) if(!J) return - new /obj/effect/overlay/temp/hierophant/blast(J, user, friendly_fire_check) + new /obj/effect/temp_visual/hierophant/blast(J, user, friendly_fire_check) previousturf = J J = get_step(previousturf, dir) /obj/item/weapon/hierophant_staff/proc/aoe_burst(turf/T, mob/living/user) //make a 3x3 blast around a target if(!T) return - new /obj/effect/overlay/temp/hierophant/telegraph(T, user) + new /obj/effect/temp_visual/hierophant/telegraph(T, user) playsound(T,'sound/magic/blink.ogg', 200, 1) //playsound(T,'sound/effects/bin_close.ogg', 200, 1) sleep(2) for(var/t in RANGE_TURFS(1, T)) - new /obj/effect/overlay/temp/hierophant/blast(t, user, friendly_fire_check) + new /obj/effect/temp_visual/hierophant/blast(t, user, friendly_fire_check) diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm index 295969c6ded..8841621c633 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm @@ -563,7 +563,7 @@ if(change) if(change > 0) if(M && stat != DEAD) // Added check to see if this mob (the corgi) is dead to fix issue 2454 - new /obj/effect/overlay/temp/heart(loc) + new /obj/effect/temp_visual/heart(loc) custom_emote(1, "yaps happily!") else if(M && stat != DEAD) // Same check here, even though emote checks it as well (poor form to check it only in the help case) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm index d6d1d92618d..f2af031039a 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -131,7 +131,7 @@ Difficulty: Hard /mob/living/simple_animal/hostile/megafauna/bubblegum/Move() if(charging) - new /obj/effect/overlay/temp/decoy/fading(loc, src) + new /obj/effect/temp_visual/decoy/fading(loc, src) DestroySurroundings() . = ..() if(!stat && .) @@ -152,12 +152,12 @@ Difficulty: Hard var/turf/T = get_turf(target) if(!T || T == loc) return - new /obj/effect/overlay/temp/dragon_swoop(T) + new /obj/effect/temp_visual/dragon_swoop(T) charging = 1 DestroySurroundings() walk(src, 0) dir = get_dir(src, T) - var/obj/effect/overlay/temp/decoy/D = new /obj/effect/overlay/temp/decoy(loc, src) + var/obj/effect/temp_visual/decoy/D = new /obj/effect/temp_visual/decoy(loc, src) animate(D, alpha = 0, color = "#FF0000", transform = matrix()*2, time = 5) sleep(5) throw_at(T, get_dist(src, T), 1, src, 0) @@ -242,9 +242,9 @@ Difficulty: Hard /mob/living/simple_animal/hostile/megafauna/bubblegum/proc/bloodsmack(turf/T, handedness) if(handedness) - new /obj/effect/overlay/temp/bubblegum_hands/rightsmack(T) + new /obj/effect/temp_visual/bubblegum_hands/rightsmack(T) else - new /obj/effect/overlay/temp/bubblegum_hands/leftsmack(T) + new /obj/effect/temp_visual/bubblegum_hands/leftsmack(T) sleep(2.5) for(var/mob/living/L in T) if(!faction_check(L)) @@ -256,11 +256,11 @@ Difficulty: Hard /mob/living/simple_animal/hostile/megafauna/bubblegum/proc/bloodgrab(turf/T, handedness) if(handedness) - new /obj/effect/overlay/temp/bubblegum_hands/rightpaw(T) - new /obj/effect/overlay/temp/bubblegum_hands/rightthumb(T) + new /obj/effect/temp_visual/bubblegum_hands/rightpaw(T) + new /obj/effect/temp_visual/bubblegum_hands/rightthumb(T) else - new /obj/effect/overlay/temp/bubblegum_hands/leftpaw(T) - new /obj/effect/overlay/temp/bubblegum_hands/leftthumb(T) + new /obj/effect/temp_visual/bubblegum_hands/leftpaw(T) + new /obj/effect/temp_visual/bubblegum_hands/leftthumb(T) sleep(6) for(var/mob/living/L in T) if(!faction_check(L)) @@ -274,28 +274,28 @@ Difficulty: Hard devour(L) sleep(1) -/obj/effect/overlay/temp/bubblegum_hands +/obj/effect/temp_visual/bubblegum_hands icon = 'icons/effects/bubblegum.dmi' duration = 9 -/obj/effect/overlay/temp/bubblegum_hands/rightthumb +/obj/effect/temp_visual/bubblegum_hands/rightthumb icon_state = "rightthumbgrab" -/obj/effect/overlay/temp/bubblegum_hands/leftthumb +/obj/effect/temp_visual/bubblegum_hands/leftthumb icon_state = "leftthumbgrab" -/obj/effect/overlay/temp/bubblegum_hands/rightpaw +/obj/effect/temp_visual/bubblegum_hands/rightpaw icon_state = "rightpawgrab" layer = MOB_LAYER - 0.1 -/obj/effect/overlay/temp/bubblegum_hands/leftpaw +/obj/effect/temp_visual/bubblegum_hands/leftpaw icon_state = "leftpawgrab" layer = MOB_LAYER - 0.1 -/obj/effect/overlay/temp/bubblegum_hands/rightsmack +/obj/effect/temp_visual/bubblegum_hands/rightsmack icon_state = "rightsmack" -/obj/effect/overlay/temp/bubblegum_hands/leftsmack +/obj/effect/temp_visual/bubblegum_hands/leftsmack icon_state = "leftsmack" /mob/living/simple_animal/hostile/megafauna/bubblegum/proc/blood_warp() @@ -311,7 +311,7 @@ Difficulty: Hard if(!pools.len) return FALSE - var/obj/effect/overlay/temp/decoy/DA = new /obj/effect/overlay/temp/decoy(loc, src) + var/obj/effect/temp_visual/decoy/DA = new /obj/effect/temp_visual/decoy(loc, src) DA.color = "#FF0000" var/oldtransform = DA.transform DA.transform = matrix()*2 @@ -353,7 +353,7 @@ Difficulty: Hard new /obj/effect/decal/cleanable/blood/bubblegum(J) for(var/i in 1 to range) J = get_step(previousturf, targetdir) - new /obj/effect/overlay/temp/dir_setting/bloodsplatter(previousturf, get_dir(previousturf, J)) + new /obj/effect/temp_visual/dir_setting/bloodsplatter(previousturf, get_dir(previousturf, J)) playsound(previousturf,'sound/effects/splat.ogg', 100, 1, -1) if(!J || !previousturf.CanAtmosPass(J)) break diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index b40e64c6a31..bf33462cb34 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -97,7 +97,7 @@ Difficulty: Very Hard ..() internal_gps = new/obj/item/device/gps/internal/colossus(src) -/obj/effect/overlay/temp/at_shield +/obj/effect/temp_visual/at_shield name = "anti-toolbox field" desc = "A shimmering forcefield protecting the colossus." icon = 'icons/effects/effects.dmi' @@ -107,7 +107,7 @@ Difficulty: Very Hard duration = 8 var/target -/obj/effect/overlay/temp/at_shield/New(new_loc, new_target) +/obj/effect/temp_visual/at_shield/New(new_loc, new_target) ..() target = new_target spawn(0) @@ -115,7 +115,7 @@ Difficulty: Very Hard /mob/living/simple_animal/hostile/megafauna/colossus/bullet_act(obj/item/projectile/P) if(!stat) - var/obj/effect/overlay/temp/at_shield/AT = new /obj/effect/overlay/temp/at_shield(loc, src) + var/obj/effect/temp_visual/at_shield/AT = new /obj/effect/temp_visual/at_shield(loc, src) var/random_x = rand(-32, 32) AT.pixel_x += random_x diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm index 38f8c121d5d..2ec7c213e1c 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm @@ -86,7 +86,7 @@ Difficulty: Medium /mob/living/simple_animal/hostile/megafauna/dragon/Process_Spacemove(movement_dir = 0) return 1 -/obj/effect/overlay/temp/fireball +/obj/effect/temp_visual/fireball icon = 'icons/obj/wizard.dmi' icon_state = "fireball" name = "fireball" @@ -96,18 +96,18 @@ Difficulty: Medium duration = 12 pixel_z = 500 -/obj/effect/overlay/temp/fireball/New(loc) +/obj/effect/temp_visual/fireball/New(loc) ..() animate(src, pixel_z = 0, time = 12) -/obj/effect/overlay/temp/target +/obj/effect/temp_visual/target icon = 'icons/mob/actions.dmi' icon_state = "sniper_zoom" layer = MOB_LAYER - 0.1 luminosity = 2 duration = 12 -/obj/effect/overlay/temp/dragon_swoop +/obj/effect/temp_visual/dragon_swoop name = "certain death" desc = "Don't just stand there, move!" icon = 'icons/effects/96x96.dmi' @@ -118,18 +118,18 @@ Difficulty: Medium color = "#FF0000" duration = 10 -/obj/effect/overlay/temp/target/ex_act() +/obj/effect/temp_visual/target/ex_act() return -/obj/effect/overlay/temp/target/New(loc) +/obj/effect/temp_visual/target/New(loc) ..() spawn(0) fall() -/obj/effect/overlay/temp/target/proc/fall() +/obj/effect/temp_visual/target/proc/fall() var/turf/T = get_turf(src) playsound(T,'sound/magic/Fireball.ogg', 200, 1) - new /obj/effect/overlay/temp/fireball(T) + new /obj/effect/temp_visual/fireball(T) sleep(12) explosion(T, 0, 0, 1, 0, 0, 0, 1) @@ -161,7 +161,7 @@ Difficulty: Medium visible_message("Fire rains from the sky!") for(var/turf/turf in range(12,get_turf(src))) if(prob(10)) - new /obj/effect/overlay/temp/target(turf) + new /obj/effect/temp_visual/target(turf) /mob/living/simple_animal/hostile/megafauna/dragon/proc/fire_walls() playsound(get_turf(src),'sound/magic/Fireball.ogg', 200, 1) @@ -223,7 +223,7 @@ Difficulty: Medium else tturf = get_turf(src) forceMove(tturf) - new /obj/effect/overlay/temp/dragon_swoop(tturf) + new /obj/effect/temp_visual/dragon_swoop(tturf) animate(src, pixel_x = initial(pixel_x), pixel_z = 0, time = 10) sleep(10) playsound(src.loc, 'sound/effects/meteorimpact.ogg', 200, 1) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm index 228f4df9ad6..07c4d2f25cd 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm @@ -242,7 +242,7 @@ Difficulty: Hard pickedtarget = pick_n_take(targets) if(pickedtarget.stat == DEAD) pickedtarget = target - var/obj/effect/overlay/temp/hierophant/chaser/C = new /obj/effect/overlay/temp/hierophant/chaser(loc, src, pickedtarget, chaser_speed, FALSE) + var/obj/effect/temp_visual/hierophant/chaser/C = new /obj/effect/temp_visual/hierophant/chaser(loc, src, pickedtarget, chaser_speed, FALSE) C.moving = 3 C.moving_dir = pick_n_take(cardinal_copy) sleep(10) @@ -277,10 +277,10 @@ Difficulty: Hard spawn(0) diagonal_blasts(target) else if(chaser_cooldown < world.time) //if chasers are off cooldown, fire some! - var/obj/effect/overlay/temp/hierophant/chaser/C = new /obj/effect/overlay/temp/hierophant/chaser(loc, src, target, chaser_speed, FALSE) + var/obj/effect/temp_visual/hierophant/chaser/C = new /obj/effect/temp_visual/hierophant/chaser(loc, src, target, chaser_speed, FALSE) chaser_cooldown = world.time + initial(chaser_cooldown) if((prob(anger_modifier) || target.Adjacent(src)) && target != src) - var/obj/effect/overlay/temp/hierophant/chaser/OC = new /obj/effect/overlay/temp/hierophant/chaser(loc, src, target, max(1.5, 5 - anger_modifier * 0.07), FALSE) + var/obj/effect/temp_visual/hierophant/chaser/OC = new /obj/effect/temp_visual/hierophant/chaser(loc, src, target, max(1.5, 5 - anger_modifier * 0.07), FALSE) OC.moving = 4 OC.moving_dir = pick(cardinal - C.moving_dir) else //just release a burst of power @@ -291,11 +291,11 @@ Difficulty: Hard var/turf/T = get_turf(victim) if(!T) return - new /obj/effect/overlay/temp/hierophant/telegraph/diagonal(T, src) + new /obj/effect/temp_visual/hierophant/telegraph/diagonal(T, src) playsound(T,'sound/magic/blink.ogg', 200, 1) //playsound(T,'sound/effects/bin_close.ogg', 200, 1) sleep(2) - new /obj/effect/overlay/temp/hierophant/blast(T, src, FALSE) + new /obj/effect/temp_visual/hierophant/blast(T, src, FALSE) for(var/d in diagonals) spawn(0) blast_wall(T, d) @@ -304,11 +304,11 @@ Difficulty: Hard var/turf/T = get_turf(victim) if(!T) return - new /obj/effect/overlay/temp/hierophant/telegraph/cardinal(T, src) + new /obj/effect/temp_visual/hierophant/telegraph/cardinal(T, src) playsound(T,'sound/magic/blink.ogg', 200, 1) //playsound(T,'sound/effects/bin_close.ogg', 200, 1) sleep(2) - new /obj/effect/overlay/temp/hierophant/blast(T, src, FALSE) + new /obj/effect/temp_visual/hierophant/blast(T, src, FALSE) for(var/d in cardinal) spawn(0) blast_wall(T, d) @@ -317,11 +317,11 @@ Difficulty: Hard var/turf/T = get_turf(victim) if(!T) return - new /obj/effect/overlay/temp/hierophant/telegraph(T, src) + new /obj/effect/temp_visual/hierophant/telegraph(T, src) playsound(T,'sound/magic/blink.ogg', 200, 1) //playsound(T,'sound/effects/bin_close.ogg', 200, 1) sleep(2) - new /obj/effect/overlay/temp/hierophant/blast(T, src, FALSE) + new /obj/effect/temp_visual/hierophant/blast(T, src, FALSE) for(var/d in alldirs) spawn(0) blast_wall(T, d) @@ -331,7 +331,7 @@ Difficulty: Hard var/turf/previousturf = T var/turf/J = get_step(previousturf, dir) for(var/i in 1 to range) - new /obj/effect/overlay/temp/hierophant/blast(J, src, FALSE) + new /obj/effect/temp_visual/hierophant/blast(J, src, FALSE) previousturf = J J = get_step(previousturf, dir) @@ -340,21 +340,21 @@ Difficulty: Hard return var/turf/T = get_turf(victim) var/turf/source = get_turf(src) - new /obj/effect/overlay/temp/hierophant/telegraph(T, src) - new /obj/effect/overlay/temp/hierophant/telegraph(source, src) + new /obj/effect/temp_visual/hierophant/telegraph(T, src) + new /obj/effect/temp_visual/hierophant/telegraph(source, src) playsound(T,'sound/magic/blink.ogg', 200, 1) //playsound(T,'sound/magic/Wand_Teleport.ogg', 200, 1) playsound(source,'sound/magic/blink.ogg', 200, 1) //playsound(source,'sound/machines/AirlockOpen.ogg', 200, 1) blinking = TRUE sleep(2) //short delay before we start... - new /obj/effect/overlay/temp/hierophant/telegraph/teleport(T, src) - new /obj/effect/overlay/temp/hierophant/telegraph/teleport(source, src) + new /obj/effect/temp_visual/hierophant/telegraph/teleport(T, src) + new /obj/effect/temp_visual/hierophant/telegraph/teleport(source, src) for(var/t in RANGE_TURFS(1, T)) - var/obj/effect/overlay/temp/hierophant/blast/B = new /obj/effect/overlay/temp/hierophant/blast(t, src, FALSE) + var/obj/effect/temp_visual/hierophant/blast/B = new /obj/effect/temp_visual/hierophant/blast(t, src, FALSE) B.damage = 30 for(var/t in RANGE_TURFS(1, source)) - var/obj/effect/overlay/temp/hierophant/blast/B = new /obj/effect/overlay/temp/hierophant/blast(t, src, FALSE) + var/obj/effect/temp_visual/hierophant/blast/B = new /obj/effect/temp_visual/hierophant/blast(t, src, FALSE) B.damage = 30 animate(src, alpha = 0, time = 2, easing = EASE_OUT) //fade out sleep(1) @@ -376,12 +376,12 @@ Difficulty: Hard var/turf/T = get_turf(victim) if(!T) return - new /obj/effect/overlay/temp/hierophant/telegraph(T, src) + new /obj/effect/temp_visual/hierophant/telegraph(T, src) playsound(T,'sound/magic/blink.ogg', 200, 1) //playsound(T,'sound/effects/bin_close.ogg', 200, 1) sleep(2) for(var/t in RANGE_TURFS(1, T)) - new /obj/effect/overlay/temp/hierophant/blast(t, src, FALSE) + new /obj/effect/temp_visual/hierophant/blast(t, src, FALSE) /mob/living/simple_animal/hostile/megafauna/hierophant/proc/burst(turf/original) //release a wave of blasts playsound(original,'sound/magic/blink.ogg', 200, 1) @@ -395,7 +395,7 @@ Difficulty: Hard if(dist > last_dist) last_dist = dist sleep(1 + (burst_range - last_dist) * 0.5) //gets faster as it gets further out - new /obj/effect/overlay/temp/hierophant/blast(T, src, FALSE) + new /obj/effect/temp_visual/hierophant/blast(T, src, FALSE) /mob/living/simple_animal/hostile/megafauna/hierophant/AltClickOn(atom/A) //player control handler(don't give this to a player holy fuck) if(!istype(A) || get_dist(A, src) <= 2) @@ -403,16 +403,16 @@ Difficulty: Hard blink(A) //Hierophant overlays -/obj/effect/overlay/temp/hierophant +/obj/effect/temp_visual/hierophant layer = MOB_LAYER - 0.1 var/mob/living/caster //who made this, anyway -/obj/effect/overlay/temp/hierophant/New(loc, new_caster) +/obj/effect/temp_visual/hierophant/New(loc, new_caster) ..() if(new_caster) caster = new_caster -/obj/effect/overlay/temp/hierophant/chaser //a hierophant's chaser. follows target around, moving and producing a blast every speed deciseconds. +/obj/effect/temp_visual/hierophant/chaser //a hierophant's chaser. follows target around, moving and producing a blast every speed deciseconds. duration = 98 var/mob/living/target //what it's following var/turf/targetturf //what turf the target is actually on @@ -426,7 +426,7 @@ Difficulty: Hard var/currently_seeking = FALSE var/friendly_fire_check = FALSE //if blasts produced apply friendly fire -/obj/effect/overlay/temp/hierophant/chaser/New(loc, new_caster, new_target, new_speed, is_friendly_fire) +/obj/effect/temp_visual/hierophant/chaser/New(loc, new_caster, new_target, new_speed, is_friendly_fire) ..() target = new_target friendly_fire_check = is_friendly_fire @@ -435,14 +435,14 @@ Difficulty: Hard spawn(0) seek_target() -/obj/effect/overlay/temp/hierophant/chaser/proc/get_target_dir() +/obj/effect/temp_visual/hierophant/chaser/proc/get_target_dir() . = get_cardinal_dir(src, targetturf) if((. != previous_moving_dir && . == more_previouser_moving_dir) || . == 0) //we're alternating, recalculate var/list/cardinal_copy = cardinal.Copy() cardinal_copy -= more_previouser_moving_dir . = pick(cardinal_copy) -/obj/effect/overlay/temp/hierophant/chaser/proc/seek_target() +/obj/effect/temp_visual/hierophant/chaser/proc/seek_target() if(!currently_seeking) currently_seeking = TRUE targetturf = get_turf(target) @@ -470,27 +470,27 @@ Difficulty: Hard sleep(speed) targetturf = get_turf(target) -/obj/effect/overlay/temp/hierophant/chaser/proc/make_blast() - new /obj/effect/overlay/temp/hierophant/blast(loc, caster, friendly_fire_check) +/obj/effect/temp_visual/hierophant/chaser/proc/make_blast() + new /obj/effect/temp_visual/hierophant/blast(loc, caster, friendly_fire_check) -/obj/effect/overlay/temp/hierophant/telegraph +/obj/effect/temp_visual/hierophant/telegraph icon = 'icons/effects/96x96.dmi' icon_state = "hierophant_telegraph" pixel_x = -32 pixel_y = -32 duration = 3 -/obj/effect/overlay/temp/hierophant/telegraph/diagonal +/obj/effect/temp_visual/hierophant/telegraph/diagonal icon_state = "hierophant_telegraph_diagonal" -/obj/effect/overlay/temp/hierophant/telegraph/cardinal +/obj/effect/temp_visual/hierophant/telegraph/cardinal icon_state = "hierophant_telegraph_cardinal" -/obj/effect/overlay/temp/hierophant/telegraph/teleport +/obj/effect/temp_visual/hierophant/telegraph/teleport icon_state = "hierophant_telegraph_teleport" duration = 9 -/obj/effect/overlay/temp/hierophant/blast +/obj/effect/temp_visual/hierophant/blast icon = 'icons/effects/effects.dmi' icon_state = "hierophant_blast" name = "vortex blast" @@ -502,7 +502,7 @@ Difficulty: Hard var/friendly_fire_check = FALSE var/bursting = FALSE //if we're bursting and need to hit anyone crossing us -/obj/effect/overlay/temp/hierophant/blast/New(loc, new_caster, friendly_fire) +/obj/effect/temp_visual/hierophant/blast/New(loc, new_caster, friendly_fire) ..() friendly_fire_check = friendly_fire if(new_caster) @@ -513,7 +513,7 @@ Difficulty: Hard spawn(0) blast() -/obj/effect/overlay/temp/hierophant/blast/proc/blast() +/obj/effect/temp_visual/hierophant/blast/proc/blast() var/turf/T = get_turf(src) if(!T) return @@ -524,12 +524,12 @@ Difficulty: Hard sleep(1.3) //slightly forgiving; the burst animation is 1.5 deciseconds bursting = FALSE //we no longer damage crossers -/obj/effect/overlay/temp/hierophant/blast/Crossed(atom/movable/AM) +/obj/effect/temp_visual/hierophant/blast/Crossed(atom/movable/AM) ..() if(bursting) do_damage(get_turf(src)) -/obj/effect/overlay/temp/hierophant/blast/proc/do_damage(turf/T) +/obj/effect/temp_visual/hierophant/blast/proc/do_damage(turf/T) for(var/mob/living/L in T.contents - hit_things) //find and damage mobs... hit_things += L if((friendly_fire_check && caster && caster.faction_check(L)) || L.stat == DEAD) @@ -570,7 +570,7 @@ Difficulty: Hard H.timer = world.time + 51 if(do_after(user, 50, target = src)) playsound(src,'sound/magic/Blind.ogg', 200, 1, -4) - new /obj/effect/overlay/temp/hierophant/telegraph/teleport(get_turf(src), user) + new /obj/effect/temp_visual/hierophant/telegraph/teleport(get_turf(src), user) to_chat(user, "You touch the rune with the staff, dispelling it!") H.rune = null user.update_action_buttons_icon() diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 1244bc71fea..a3c3c72b175 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -361,12 +361,12 @@ spawn(0) var/limit = 2//For only two trailing shadows. for(var/turf/T in getline(mobloc, L.loc)) - new /obj/effect/overlay/temp/dir_setting/ninja/shadow(T, L.dir) + new /obj/effect/temp_visual/dir_setting/ninja/shadow(T, L.dir) limit-- if(limit<=0) break else - new /obj/effect/overlay/temp/dir_setting/ninja/shadow(mobloc, L.dir) + new /obj/effect/temp_visual/dir_setting/ninja/shadow(mobloc, L.dir) L.forceMove(get_step(L, direct)) L.dir = direct if(3) //Incorporeal move, but blocked by holy-watered tiles diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index bdc4126a25c..22f235589ad 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -205,7 +205,7 @@ if(ismineralturf(target_turf)) var/turf/simulated/mineral/M = target_turf M.gets_drilled(firer) - var/obj/effect/overlay/temp/kinetic_blast/K = new /obj/effect/overlay/temp/kinetic_blast(target_turf) + var/obj/effect/temp_visual/kinetic_blast/K = new /obj/effect/temp_visual/kinetic_blast(target_turf) K.color = color for(var/type in hit_overlays) new type(target_turf) @@ -328,7 +328,7 @@ /obj/item/borg/upgrade/modkit/aoe/modify_projectile(obj/item/projectile/kinetic/K) K.name = "kinetic explosion" if(!K.turf_aoe && !K.mob_aoe) - K.hit_overlays += /obj/effect/overlay/temp/explosion/fast + K.hit_overlays += /obj/effect/temp_visual/explosion/fast K.mob_aoe += modifier /obj/item/borg/upgrade/modkit/aoe/turfs diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 71ac935153b..22d7d04784d 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -78,13 +78,13 @@ if(starting) splatter_dir = get_dir(starting, target_loca) if(isalien(L)) - new /obj/effect/overlay/temp/dir_setting/bloodsplatter/xenosplatter(target_loca, splatter_dir) + new /obj/effect/temp_visual/dir_setting/bloodsplatter/xenosplatter(target_loca, splatter_dir) else var/blood_color = "#C80000" if(ishuman(target)) H = target blood_color = H.species.blood_color - new /obj/effect/overlay/temp/dir_setting/bloodsplatter(target_loca, splatter_dir, blood_color) + new /obj/effect/temp_visual/dir_setting/bloodsplatter(target_loca, splatter_dir, blood_color) if(prob(33)) var/list/shift = list("x" = 0, "y" = 0) var/turf/step_over = get_step(target_loca, splatter_dir) diff --git a/code/modules/shuttle/ripple.dm b/code/modules/shuttle/ripple.dm index 0c48a9c24bf..3489394671b 100644 --- a/code/modules/shuttle/ripple.dm +++ b/code/modules/shuttle/ripple.dm @@ -1,4 +1,4 @@ -/obj/effect/overlay/temp/ripple +/obj/effect/temp_visual/ripple name = "hyperspace ripple" desc = "Something is coming through hyperspace, you can see the \ visual disturbances. It's probably best not to be on top of these \ @@ -13,7 +13,7 @@ duration = 3 * SHUTTLE_RIPPLE_TIME mouse_opacity = 1 -/obj/effect/overlay/temp/ripple/New() +/obj/effect/temp_visual/ripple/New() . = ..() smooth_icon(src) animate(src, alpha=255, time=SHUTTLE_RIPPLE_TIME) diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index d1f41585516..d3406556e27 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -383,7 +383,7 @@ /obj/docking_port/mobile/proc/create_ripples(obj/docking_port/stationary/S1) var/list/turfs = ripple_area(S1) for(var/i in turfs) - ripples += new /obj/effect/overlay/temp/ripple(i) + ripples += new /obj/effect/temp_visual/ripple(i) /obj/docking_port/mobile/proc/remove_ripples() if(ripples.len) diff --git a/code/modules/vehicle/speedbike.dm b/code/modules/vehicle/speedbike.dm index 198d3a6e9a5..ac57e65b2e6 100644 --- a/code/modules/vehicle/speedbike.dm +++ b/code/modules/vehicle/speedbike.dm @@ -16,7 +16,7 @@ /obj/vehicle/space/speedbike/Move(newloc,move_dir) if(buckled_mob) - new /obj/effect/overlay/temp/dir_setting/speedbike_trail(loc) + new /obj/effect/temp_visual/dir_setting/speedbike_trail(loc) . = ..() /obj/vehicle/space/speedbike/handle_vehicle_layer()