From 34f92b1237d5da62a3c3beb46761ae064e287681 Mon Sep 17 00:00:00 2001 From: Matt Atlas Date: Tue, 12 Aug 2025 18:22:30 +0200 Subject: [PATCH] Removes attack animations from various scanners. (#21155) The reason is that they look mega silly, especially when you're rapidly scanning the same person. Also improves the legibility of the price scanner output. Co-authored-by: Matt Atlas --- code/game/objects/items/devices/scanners.dm | 8 +-- .../mattatlas-healthscanneranim.yml | 58 +++++++++++++++++++ 2 files changed, 60 insertions(+), 6 deletions(-) create mode 100644 html/changelogs/mattatlas-healthscanneranim.yml diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 69c8a621869..725f1c640d9 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -31,7 +31,6 @@ BREATH ANALYZER last_scan = world.time sound_scan = TRUE user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) - user.do_attack_animation(src) flick("[icon_state]-scan", src) //makes it so that it plays the scan animation on a successful scan health_scan_mob(target_mob, user, mode, sound_scan = sound_scan) add_fingerprint(user) @@ -42,7 +41,6 @@ BREATH ANALYZER last_scan = world.time sound_scan = TRUE user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) - user.do_attack_animation(src) flick("[icon_state]-scan", src) //makes it so that it plays the scan animation on a successful scan health_scan_mob(user, user, mode, sound_scan = sound_scan) add_fingerprint(user) @@ -588,8 +586,8 @@ BREATH ANALYZER return var/value = get_value(target) - user.visible_message("\The [user] scans \the [target] with \the [src]") - user.show_message("Price estimation of \the [target]: [value ? value : "N/A"] Credits") + user.visible_message(SPAN_NOTICE("\The [user] scans \the [target] with \the [src].")) + to_chat(user, SPAN_NOTICE("\The [src] estimates the price of \the [target] at [value ? value : "N/A"].")) /obj/item/device/breath_analyzer name = "breath analyzer" @@ -631,7 +629,6 @@ BREATH ANALYZER return user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) - user.do_attack_animation(H) user.visible_message(SPAN_NOTICE("[user] is trying to take a breath sample from [H]."), SPAN_NOTICE("You gently insert \the [src] into [H]'s mouth.")) @@ -730,7 +727,6 @@ BREATH ANALYZER if(!connected) return user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) - user.do_attack_animation(src) user.visible_message("[user] starts scanning \the [target_mob] with \the [src].", SPAN_NOTICE("You start scanning \the [target_mob] with \the [src].")) flick("[icon_state]-scan", src) if(do_after(user, 7 SECONDS, target_mob, DO_UNIQUE)) diff --git a/html/changelogs/mattatlas-healthscanneranim.yml b/html/changelogs/mattatlas-healthscanneranim.yml new file mode 100644 index 00000000000..99fcbadb86c --- /dev/null +++ b/html/changelogs/mattatlas-healthscanneranim.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: MattAtlas + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscdel: "Removed attack animations from health scanners, breath analyzers, "