From fa9d8869e1e1352cf3224a018ea698cea2057987 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 18 Nov 2022 02:26:07 +0100 Subject: [PATCH] [MIRROR] Moves flick_overlay to atom instead of being global [MDB IGNORE] (#17529) * Moves flick_overlay to atom instead of being global (#71045) ## About The Pull Request Moves flick_overlay and flick_overlay_view to atom instead of being a global proc ## Why It's Good For The Game General performance and syntaxical improvements, makes it easier to retrieve iconstates ## Changelog :cl: fix: flick_overlay is an atom proc /:cl: Co-authored-by: etherware-novice Co-authored-by: Candycaneannihalator Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com> * Moves flick_overlay to atom instead of being global * modular flick Co-authored-by: texan-down-under <73374039+etherware-novice@users.noreply.github.com> Co-authored-by: etherware-novice Co-authored-by: Candycaneannihalator Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com> Co-authored-by: tastyfish --- code/__HELPERS/game.dm | 18 ++++++++++++++---- code/__HELPERS/icons.dm | 8 ++++---- code/datums/brain_damage/imaginary_friend.dm | 2 +- code/game/objects/items.dm | 4 ++-- .../game/objects/items/devices/laserpointer.dm | 2 +- .../items/devices/scanners/t_scanner.dm | 2 +- .../crates_lockers/closets/cardboardbox.dm | 2 +- code/game/turfs/closed/minerals.dm | 2 +- code/modules/admin/verbs/secrets.dm | 2 +- code/modules/antagonists/blob/blob_mobs.dm | 2 +- .../modules/clothing/glasses/engine_goggles.dm | 6 +++--- code/modules/events/portal_storm.dm | 2 +- code/modules/hallucination/fake_chat.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 2 +- code/modules/mob/living/living_defense.dm | 2 +- code/modules/mob/living/living_say.dm | 2 +- .../simple_animal/guardian/types/protector.dm | 2 +- code/modules/mob/living/ventcrawling.dm | 4 ++-- code/modules/vehicles/mecha/_mecha.dm | 2 +- .../code/additionalemotes/overlay_emote.dm | 14 +++++++------- .../emotes/code/additionalemotes/turf_list.dm | 2 +- 21 files changed, 47 insertions(+), 37 deletions(-) diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index a72a7a23e34..24cdd81386d 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -122,16 +122,26 @@ for(var/client/remove_from in show_to) remove_from.images -= image_to_remove + ///Add an image to a list of clients and calls a proc to remove it after a duration -/proc/flick_overlay(image/image_to_show, list/show_to, duration) +/proc/flick_overlay_global(image/image_to_show, list/show_to, duration) for(var/client/add_to in show_to) add_to.images += image_to_show addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(remove_images_from_clients), image_to_show, show_to), duration, TIMER_CLIENT_TIME) -///wrapper for flick_overlay(), flicks to everyone who can see the target atom -/proc/flick_overlay_view(image/image_to_show, atom/target, duration) +/// Flicks a certain overlay onto an atom, handling icon_state strings +/atom/proc/flick_overlay(image_to_show, list/show_to, duration, layer) + var/image/passed_image = \ + istext(image_to_show) \ + ? image(icon, src, image_to_show, layer) \ + : image_to_show + + flick_overlay_global(passed_image, show_to, duration) + +/// flicks an overlay to anyone who can view this atom +/atom/proc/flick_overlay_view(image_to_show, duration) var/list/viewing = list() - for(var/mob/viewer as anything in viewers(target)) + for(var/mob/viewer as anything in viewers(src)) if(viewer.client) viewing += viewer.client flick_overlay(image_to_show, viewing, duration) diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index 1b5b5039d68..65086aff125 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -1394,13 +1394,13 @@ GLOBAL_LIST_EMPTY(transformation_animation_objects) return image_to_center ///Flickers an overlay on an atom -/proc/flick_overlay_static(overlay_image, atom/source, duration) +/atom/proc/flick_overlay_static(overlay_image, duration) set waitfor = FALSE - if(!source || !overlay_image) + if(!overlay_image) return - source.add_overlay(overlay_image) + add_overlay(overlay_image) sleep(duration) - source.cut_overlay(overlay_image) + cut_overlay(overlay_image) ///Perform a shake on an atom, resets its position afterwards /atom/proc/Shake(pixelshiftx = 15, pixelshifty = 15, duration = 250) diff --git a/code/datums/brain_damage/imaginary_friend.dm b/code/datums/brain_damage/imaginary_friend.dm index c335b643110..2c89a9c7b1b 100644 --- a/code/datums/brain_damage/imaginary_friend.dm +++ b/code/datums/brain_damage/imaginary_friend.dm @@ -217,7 +217,7 @@ var/image/bubble = mutable_appearance('icons/mob/effects/talk.dmi', src, "default[say_test(message)]", FLY_LAYER) SET_PLANE_EXPLICIT(bubble, ABOVE_GAME_PLANE, src) bubble.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA - INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(flick_overlay), bubble, list(owner.client), 30) + INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(flick_overlay_global), bubble, list(owner.client), 30) LAZYADD(update_on_z, bubble) addtimer(CALLBACK(src, PROC_REF(clear_saypopup), bubble), 3.5 SECONDS) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index d5c3a1eebc9..075e5a5b131 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -1474,7 +1474,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e to_y += 10 pickup_animation.pixel_x += 6 * (prob(50) ? 1 : -1) //6 to the right or left, helps break up the straight upward move - flick_overlay(pickup_animation, GLOB.clients, 4) + flick_overlay_global(pickup_animation, GLOB.clients, 4) var/matrix/animation_matrix = new(pickup_animation.transform) animation_matrix.Turn(pick(-30, 30)) animation_matrix.Scale(0.65) @@ -1556,7 +1556,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e if(!attack_image) return - flick_overlay(attack_image, GLOB.clients, 10) + flick_overlay_global(attack_image, GLOB.clients, 10) var/matrix/copy_transform = new(transform) // And animate the attack! animate(attack_image, alpha = 175, transform = copy_transform.Scale(0.75), pixel_x = 0, pixel_y = 0, pixel_z = 0, time = 3) diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index 60142f991fc..747bd4b4eff 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -190,7 +190,7 @@ to_chat(user, span_warning("[src]'s battery is overused, it needs time to recharge!")) recharge_locked = TRUE - flick_overlay_view(I, targloc, 10) + targloc.flick_overlay_view(I, 10) icon_state = "pointer" /obj/item/laser_pointer/process(delta_time) diff --git a/code/game/objects/items/devices/scanners/t_scanner.dm b/code/game/objects/items/devices/scanners/t_scanner.dm index a1d58fba9ed..482f8cef8ce 100644 --- a/code/game/objects/items/devices/scanners/t_scanner.dm +++ b/code/game/objects/items/devices/scanners/t_scanner.dm @@ -55,4 +55,4 @@ I.appearance = MA t_ray_images += I if(t_ray_images.len) - flick_overlay(t_ray_images, list(viewer.client), flick_time) + flick_overlay_global(t_ray_images, list(viewer.client), flick_time) diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index 6ae90af2ea7..47902948fb0 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -74,7 +74,7 @@ /atom/proc/do_alert_animation() var/image/alert_image = image('icons/obj/storage/closet.dmi', src, "cardboard_special", layer+1) SET_PLANE_EXPLICIT(alert_image, ABOVE_LIGHTING_PLANE, src) - flick_overlay_view(alert_image, src, 0.8 SECONDS) + flick_overlay_view(alert_image, 0.8 SECONDS) alert_image.alpha = 0 animate(alert_image, pixel_z = 32, alpha = 255, time = 0.5 SECONDS, easing = ELASTIC_EASING) // We use this list to update plane values on parent z change, which is why we need the timer too diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm index 6748c97d054..7f5862664dd 100644 --- a/code/game/turfs/closed/minerals.dm +++ b/code/game/turfs/closed/minerals.dm @@ -691,7 +691,7 @@ /turf/closed/mineral/gibtonite/proc/countdown(notify_admins = FALSE) set waitfor = FALSE while(istype(src, /turf/closed/mineral/gibtonite) && stage == GIBTONITE_ACTIVE && det_time > 0 && mineralAmt >= 1) - flick_overlay_view(image('icons/turf/smoothrocks.dmi', src, "rock_Gibtonite_active"), src, 5) //makes the animation pulse one time per tick + flick_overlay_view(image('icons/turf/smoothrocks.dmi', src, "rock_Gibtonite_active"), 5) //makes the animation pulse one time per tick det_time-- sleep(0.5 SECONDS) if(istype(src, /turf/closed/mineral/gibtonite)) diff --git a/code/modules/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm index bbe5282e850..f8b45c2e9a8 100644 --- a/code/modules/admin/verbs/secrets.dm +++ b/code/modules/admin/verbs/secrets.dm @@ -613,7 +613,7 @@ GLOBAL_DATUM(everyone_a_traitor, /datum/everyone_is_a_traitor_controller) var/mob/living/carbon/human/H = spawnedMob H.equipOutfit(humanoutfit) var/turf/T = get_step(loc, SOUTHWEST) - flick_overlay_static(portal_appearance[GET_TURF_PLANE_OFFSET(T) + 1], T, 15) + T.flick_overlay_static(portal_appearance[GET_TURF_PLANE_OFFSET(T) + 1], 15) playsound(T, 'sound/magic/lightningbolt.ogg', rand(80, 100), TRUE) ///Makes sure latejoining crewmembers also become traitors. diff --git a/code/modules/antagonists/blob/blob_mobs.dm b/code/modules/antagonists/blob/blob_mobs.dm index d17d393b46e..aef43e18022 100644 --- a/code/modules/antagonists/blob/blob_mobs.dm +++ b/code/modules/antagonists/blob/blob_mobs.dm @@ -327,7 +327,7 @@ I.appearance_flags = RESET_COLOR if(overmind) I.color = overmind.blobstrain.complementary_color - flick_overlay_view(I, src, 8) + flick_overlay_view(I, 8) /mob/living/simple_animal/hostile/blob/blobbernaut/AttackingTarget() . = ..() diff --git a/code/modules/clothing/glasses/engine_goggles.dm b/code/modules/clothing/glasses/engine_goggles.dm index ed3bfa44b2b..67bd598075d 100644 --- a/code/modules/clothing/glasses/engine_goggles.dm +++ b/code/modules/clothing/glasses/engine_goggles.dm @@ -108,7 +108,7 @@ pic = new('icons/turf/overlays.dmi', place, "greenOverlay", AREA_LAYER) else pic = new('icons/turf/overlays.dmi', place, "redOverlay", AREA_LAYER) - flick_overlay(pic, list(user.client), 8) + flick_overlay_global(pic, list(user.client), 8) /obj/item/clothing/glasses/meson/engine/proc/show_connections() var/mob/living/carbon/human/user = loc @@ -132,7 +132,7 @@ PIPING_LAYER_DOUBLE_SHIFT(arrow, smart.piping_layer) connection_images[smart][dir2text(direction)] = arrow if(connection_images.len) - flick_overlay(connection_images[smart][dir2text(direction)], list(user.client), 1.5 SECONDS) + flick_overlay_global(connection_images[smart][dir2text(direction)], list(user.client), 1.5 SECONDS) /obj/item/clothing/glasses/meson/engine/update_icon_state() icon_state = inhand_icon_state = "trayson-[mode]" @@ -204,7 +204,7 @@ pic.color = COLOR_RED pic.mouse_opacity = MOUSE_OPACITY_TRANSPARENT pic.alpha = 200 - flick_overlay(pic, list(viewer.client), duration) + flick_overlay_global(pic, list(viewer.client), duration) #undef MODE_NONE diff --git a/code/modules/events/portal_storm.dm b/code/modules/events/portal_storm.dm index d7a4f9ea70a..a334d5b1d70 100644 --- a/code/modules/events/portal_storm.dm +++ b/code/modules/events/portal_storm.dm @@ -105,7 +105,7 @@ log_game("Portal Storm failed to spawn effect due to an invalid location.") return T = get_step(T, SOUTHWEST) //align center of image with turf - flick_overlay_static(storm_appearances[GET_TURF_PLANE_OFFSET(T) + 1], T, 15) + T.flick_overlay_static(storm_appearances[GET_TURF_PLANE_OFFSET(T) + 1], 15) playsound(T, 'sound/magic/lightningbolt.ogg', rand(80, 100), TRUE) /datum/round_event/portal_storm/proc/spawn_hostile() diff --git a/code/modules/hallucination/fake_chat.dm b/code/modules/hallucination/fake_chat.dm index 54054a416cd..a47c061a74f 100644 --- a/code/modules/hallucination/fake_chat.dm +++ b/code/modules/hallucination/fake_chat.dm @@ -75,7 +75,7 @@ // Display the message if(!is_radio && !plus_runechat) var/image/speech_overlay = image('icons/mob/effects/talk.dmi', speaker, "default0", layer = ABOVE_MOB_LAYER) - INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(flick_overlay), speech_overlay, list(hallucinator.client), 30) + INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(flick_overlay_global), speech_overlay, list(hallucinator.client), 30) if(plus_runechat) hallucinator.create_chat_message(speaker, understood_language, chosen, spans) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 4f1bf01f9fd..85acc6e5aa5 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -724,7 +724,7 @@ addtimer(CALLBACK(src, PROC_REF(end_electrocution_animation), electrocution_skeleton_anim), anim_duration) else //or just do a generic animation - flick_overlay_view(image(icon,src,"electrocuted_generic",ABOVE_MOB_LAYER), src, anim_duration) + flick_overlay_view("electrocuted_generic", src, anim_duration, ABOVE_MOB_LAYER) /mob/living/carbon/human/proc/end_electrocution_animation(mutable_appearance/MA) remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, "#000000") diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 25291c16276..0bbee43617f 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -497,7 +497,7 @@ var/image/gloveimg = image('icons/effects/effects.dmi', slapped, "slapglove", slapped.layer + 0.1) gloveimg.pixel_y = 10 // should line up with head gloveimg.pixel_x = 10 - flick_overlay(gloveimg, GLOB.clients, 10) + flick_overlay_global(gloveimg, GLOB.clients, 10) // And animate the attack! animate(gloveimg, alpha = 175, transform = matrix() * 0.75, pixel_x = 0, pixel_y = 10, pixel_z = 0, time = 3) diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm index 340836bf788..6406d019891 100644 --- a/code/modules/mob/living/living_say.dm +++ b/code/modules/mob/living/living_say.dm @@ -388,7 +388,7 @@ GLOBAL_LIST_INIT(message_modes_stat_limits, list( var/image/say_popup = image('icons/mob/effects/talk.dmi', src, "[bubble_type][say_test(message)]", FLY_LAYER) SET_PLANE_EXPLICIT(say_popup, ABOVE_GAME_PLANE, src) say_popup.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA - INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(flick_overlay), say_popup, speech_bubble_recipients, 3 SECONDS) + INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(flick_overlay_global), say_popup, speech_bubble_recipients, 3 SECONDS) LAZYADD(update_on_z, say_popup) addtimer(CALLBACK(src, PROC_REF(clear_saypopup), say_popup), 3.5 SECONDS) diff --git a/code/modules/mob/living/simple_animal/guardian/types/protector.dm b/code/modules/mob/living/simple_animal/guardian/types/protector.dm index 9fa286a3639..413ff9b9806 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/protector.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/protector.dm @@ -29,7 +29,7 @@ var/image/I = new('icons/effects/effects.dmi', src, "shield-flash", MOB_LAYER+0.01, dir = pick(GLOB.cardinals)) if(guardiancolor) I.color = guardiancolor - flick_overlay_view(I, src, 5) + flick_overlay_view(I, 5) /mob/living/simple_animal/hostile/guardian/protector/ToggleMode() if(cooldown > world.time) diff --git a/code/modules/mob/living/ventcrawling.dm b/code/modules/mob/living/ventcrawling.dm index 8e8f42e5e2c..fc139e00762 100644 --- a/code/modules/mob/living/ventcrawling.dm +++ b/code/modules/mob/living/ventcrawling.dm @@ -66,13 +66,13 @@ else var/datum/pipeline/vent_parent = ventcrawl_target.parents[1] if(vent_parent && (vent_parent.members.len || vent_parent.other_atmos_machines)) - flick_overlay_static(image('icons/effects/vent_indicator.dmi', "arrow", ABOVE_MOB_LAYER, dir = get_dir(src.loc, ventcrawl_target.loc)), ventcrawl_target, 2 SECONDS) + ventcrawl_target.flick_overlay_static(image('icons/effects/vent_indicator.dmi', "arrow", ABOVE_MOB_LAYER, dir = get_dir(src.loc, ventcrawl_target.loc)), 2 SECONDS) visible_message(span_notice("[src] begins climbing into the ventilation system...") ,span_notice("You begin climbing into the ventilation system...")) if(!do_after(src, 2.5 SECONDS, target = ventcrawl_target, extra_checks = CALLBACK(src, PROC_REF(can_enter_vent), ventcrawl_target))) return if(!client) return - flick_overlay_static(image('icons/effects/vent_indicator.dmi', "insert", ABOVE_MOB_LAYER), ventcrawl_target, 1 SECONDS) + ventcrawl_target.flick_overlay_static(image('icons/effects/vent_indicator.dmi', "insert", ABOVE_MOB_LAYER), 1 SECONDS) visible_message(span_notice("[src] scrambles into the ventilation ducts!"),span_notice("You climb into the ventilation ducts.")) move_into_vent(ventcrawl_target) else diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm index 87695a40218..1438503b54f 100644 --- a/code/modules/vehicles/mecha/_mecha.dm +++ b/code/modules/vehicles/mecha/_mecha.dm @@ -656,7 +656,7 @@ for(var/mob/M in speech_bubble_recipients) if(M.client) speech_bubble_recipients.Add(M.client) - INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(flick_overlay), image('icons/mob/effects/talk.dmi', src, "machine[say_test(speech_args[SPEECH_MESSAGE])]",MOB_LAYER+1), speech_bubble_recipients, 30) + INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(flick_overlay_global), image('icons/mob/effects/talk.dmi', src, "machine[say_test(speech_args[SPEECH_MESSAGE])]",MOB_LAYER+1), speech_bubble_recipients, 30) ///////////////////////// diff --git a/modular_skyrat/modules/emotes/code/additionalemotes/overlay_emote.dm b/modular_skyrat/modules/emotes/code/additionalemotes/overlay_emote.dm index b987dc58075..2c480b67002 100644 --- a/modular_skyrat/modules/emotes/code/additionalemotes/overlay_emote.dm +++ b/modular_skyrat/modules/emotes/code/additionalemotes/overlay_emote.dm @@ -18,7 +18,7 @@ var/mutable_appearance/overlay = mutable_appearance(overlay_emote, "sweatdrop", ABOVE_MOB_LAYER) overlay.pixel_x = 10 overlay.pixel_y = 10 - flick_overlay_static(overlay, user, 50) + user.flick_overlay_static(overlay, 50) playsound(get_turf(user), 'modular_skyrat/modules/emotes/sound/emotes/sweatdrop.ogg', 25, TRUE) /datum/emote/living/exclaim @@ -31,7 +31,7 @@ var/mutable_appearance/overlay = mutable_appearance(overlay_emote, "exclamation", ABOVE_MOB_LAYER) overlay.pixel_x = 10 overlay.pixel_y = 28 - flick_overlay_static(overlay, user, 50) + user.flick_overlay_static(overlay, 50) playsound(get_turf(user), 'sound/machines/chime.ogg', 25, TRUE) /datum/emote/living/question @@ -44,7 +44,7 @@ var/mutable_appearance/overlay = mutable_appearance(overlay_emote, "question", ABOVE_MOB_LAYER) overlay.pixel_x = 10 overlay.pixel_y = 28 - flick_overlay_static(overlay, user, 50) + user.flick_overlay_static(overlay, 50) playsound(get_turf(user), 'modular_skyrat/modules/emotes/sound/emotes/question.ogg', 25, TRUE) @@ -60,7 +60,7 @@ overlay.pixel_y = 10 else overlay.pixel_y = 15 - flick_overlay_static(overlay, user, 50) + user.flick_overlay_static(overlay, 50) playsound(get_turf(user), 'modular_skyrat/modules/emotes/sound/emotes/realize.ogg', 25, TRUE) /datum/emote/living/annoyed @@ -73,7 +73,7 @@ var/mutable_appearance/overlay = mutable_appearance(overlay_emote, "annoyed", ABOVE_MOB_LAYER) overlay.pixel_x = 10 overlay.pixel_y = 10 - flick_overlay_static(overlay, user, 50) + user.flick_overlay_static(overlay, 50) playsound(get_turf(user), 'modular_skyrat/modules/emotes/sound/emotes/annoyed.ogg', 25, TRUE) @@ -89,7 +89,7 @@ var/mutable_appearance/overlay = mutable_appearance(overlay_emote, "glasses", ABOVE_MOB_LAYER) if(isteshari(user)) overlay.pixel_y = -5 - flick_overlay_static(overlay, user, 10) + user.flick_overlay_static(overlay, 10) else return FALSE @@ -105,4 +105,4 @@ if(isteshari(user)) overlay.pixel_y = -4 - flick_overlay_static(overlay, user, 50) + user.flick_overlay_static(overlay, 50) diff --git a/modular_skyrat/modules/emotes/code/additionalemotes/turf_list.dm b/modular_skyrat/modules/emotes/code/additionalemotes/turf_list.dm index 41a9863ea57..5a17e3e20bf 100644 --- a/modular_skyrat/modules/emotes/code/additionalemotes/turf_list.dm +++ b/modular_skyrat/modules/emotes/code/additionalemotes/turf_list.dm @@ -31,7 +31,7 @@ desc = "It's a patch of water." icon_state = "water" src.add_overlay(image('modular_skyrat/master_files/icons/effects/turf_effects.dmi', "water_top", EXTRA_ABOVE_MOB_LAYER)) - flick_overlay_static(image('modular_skyrat/modules/liquids/icons/obj/effects/splash.dmi', "splash", EXTRA_ABOVE_MOB_LAYER), src, 20) + flick_overlay_static(image('modular_skyrat/modules/liquids/icons/obj/effects/splash.dmi', "splash", EXTRA_ABOVE_MOB_LAYER), 20) playsound(get_turf(src), 'modular_skyrat/master_files/sound/effects/watersplash.ogg', 25, TRUE) if("smoke")