diff --git a/code/controllers/subsystem/jukeboxes.dm b/code/controllers/subsystem/jukeboxes.dm index 3e87ff256a..1e457703c2 100644 --- a/code/controllers/subsystem/jukeboxes.dm +++ b/code/controllers/subsystem/jukeboxes.dm @@ -161,15 +161,15 @@ SUBSYSTEM_DEF(jukeboxes) if(istype(hearer_env)) pressure_factor = min(source_pressure, hearer_env.return_pressure()) - if(pressure_factor && targetfalloff && M.can_hear() && (M.z in audible_zlevels)) - if(get_area(M) == currentarea) + if(pressure_factor && targetfalloff && M.can_hear() && (hearerturf.z in audible_zlevels)) + if(get_area(hearerturf) == currentarea) inrange = TRUE else if(M in hearerscache) inrange = TRUE - song_played.x = (currentturf.x - M.x) * SOUND_DEFAULT_DISTANCE_MULTIPLIER - song_played.z = (currentturf.y - M.y) * SOUND_DEFAULT_DISTANCE_MULTIPLIER - song_played.y = (((currentturf.z - M.z) * 10 * SOUND_DEFAULT_DISTANCE_MULTIPLIER) + ((currentturf.z < M.z) ? -5 : 5)) + song_played.x = (currentturf.x - hearerturf.x) * SOUND_DEFAULT_DISTANCE_MULTIPLIER + song_played.z = (currentturf.y - hearerturf.y) * SOUND_DEFAULT_DISTANCE_MULTIPLIER + song_played.y = (((currentturf.z - hearerturf.z) * 10 * SOUND_DEFAULT_DISTANCE_MULTIPLIER) + ((currentturf.z < hearerturf.z) ? -5 : 5)) if(pressure_factor < ONE_ATMOSPHERE) song_played.volume = (min((targetfalloff * 50), 100) * max((pressure_factor - SOUND_MINIMUM_PRESSURE)/(ONE_ATMOSPHERE - SOUND_MINIMUM_PRESSURE), 1)) diff --git a/html/changelogs/archive/2022-06.yml b/html/changelogs/archive/2022-06.yml index 5f91d66896..168c23483c 100644 --- a/html/changelogs/archive/2022-06.yml +++ b/html/changelogs/archive/2022-06.yml @@ -107,6 +107,12 @@ SandPoot: - tweak: The "MobInteraction" is now written on typescript. 2022-06-11: + - refactor: Does some extremely minor touches on pulling/pushing code. + timothyteakettle: + - rscadd: updates existing poly maid outfit with tg sprite but polychromatic + - rscadd: adds polychromic maid apron, gloves, collar, headband + - rscadd: adds support for polychromic accessories +2022-06-12: Bhijn & Myr: - rscadd: The station minimap now features higher detail! Instead of just windows and grilles being outlined, all dense+anchored structures and machinery are @@ -134,23 +140,28 @@ - rscadd: 'The chat now supports blockquotes! tweak: Examining, medical scanners, self-checking, and mood checkups, have all been converted to make use of blockquotes.' Bhijn & Myr (+ UI work and cleanup by Sandpoot!): - - rscadd: 'Colormates now have HSV coloration! tweak: Colormates have had their - "please use white clothing" message removed, as that recommendation''s now mostly - pointless tweak: The default mode for colormates is now HSV coloration tweak: - The temp messages in colormates have been tweaked slightly to be more user-friendly, - as they''re user-facing. tweak: The description for constants in the colormate + - rscadd: 'Colormates now have HSV coloration!' + - tweak: Colormates have had their "please use white clothing" message removed, as that + recommendation's now mostly pointless + - tweak: The default mode for colormates is now HSV coloration + - tweak: The temp messages in colormates have been tweaked slightly to be more user-friendly, + as they''re user-facing. + - tweak: The description for constants in the colormate matrix mode has been fixed; the constant variables have nothing to do with contrast, - they simply add color tweak: Matrix mode has been made a lot more usable; it''s - now clamped between -10 and 10, and features a step of 0.01, making it much - easier to simply click and drag to adjust the values, rather than having to - punch them in manually' + they simply add color + - tweak: Matrix mode has been made a lot more usable; it''s now clamped between + -10 and 10, and features a step of 0.01, making it much easier to simply click + and drag to adjust the values, rather than having to punch them in manually' Putnam3145: - balance: QCD matter is now worth 10x as much and makes 2 research pointer per mole SandPoot: - - bugfix: Fixed items that use strip_mod and strip_silence (stripping people faster - or without giving them a message) - rscadd: Added a search box to all vending machine uis. - qol: Vending machines have candystripes for better clarity. + - bugfix: Fixed items that use strip_mod and strip_silence (stripping people faster + or without giving them a message) keronshb: - bugfix: Families fixed from crashing +2022-06-13: + Bhijn & Myr: + - bugfix: Jukebox audio is now audible within closets, crates, etc!