Skip to content

Commit

Permalink
[MIRROR] Update blood filter [NO GBP] [MDB IGNORE] (#4233)
Browse files Browse the repository at this point in the history
* Update blood filter [NO GBP] (#84535)

## About The Pull Request

Updates the blood filter sound change made in
tgstation/tgstation#84431


https://github.com/tgstation/tgstation/assets/83487515/abe88a4c-2c48-46af-8ea9-f6c0f2da7259

## Why It's Good For The Game

The sound in the first PR is clipping when used as a surgery success
sound. Rounds the removal amount so it doesn't leave small decimal point
values left in the blood.

## Changelog

:cl: LT3
sound: Changed blood filter cycle sound
/:cl:

* Update blood filter [NO GBP]

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: lessthanthree <[email protected]>
Co-authored-by: NovaBot13 <[email protected]>
  • Loading branch information
4 people authored Jul 5, 2024
1 parent eb495aa commit 95ddd19
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions code/modules/surgery/blood_filter.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
*/
/datum/surgery_step/filter_blood/proc/has_filterable_chems(mob/living/carbon/target, obj/item/blood_filter/bloodfilter)
if(!length(target.reagents?.reagent_list))
bloodfilter.audible_message(span_notice("The [bloodfilter] pings as it reports no chemicals detected in [target]'s blood."))
bloodfilter.audible_message(span_notice("[bloodfilter] pings as it reports no chemicals detected in [target]'s blood."))
playsound(get_turf(target), 'sound/machines/ping.ogg', 75, TRUE, falloff_exponent = 12, falloff_distance = 1)
return FALSE

Expand All @@ -58,7 +58,7 @@
implements = list(/obj/item/blood_filter = 95)
repeatable = TRUE
time = 2.5 SECONDS
success_sound = 'sound/machines/fan_loop.ogg'
success_sound = 'sound/machines/card_slide.ogg'

/datum/surgery_step/filter_blood/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
display_pain(target, "You feel a throbbing pain in your chest!")
Expand All @@ -68,7 +68,7 @@
if(target.reagents?.total_volume)
for(var/datum/reagent/chem as anything in target.reagents.reagent_list)
if(!length(bloodfilter.whitelist) || (chem.type in bloodfilter.whitelist))
target.reagents.remove_reagent(chem.type, min(chem.volume * 0.22, 10))
target.reagents.remove_reagent(chem.type, min(round(chem.volume * 0.22, 0.2), 10))
display_results(
user,
target,
Expand Down

0 comments on commit 95ddd19

Please sign in to comment.