diff --git a/code/modules/unit_tests/screenshots/screenshot_high_luminosity_eyes_light_emissive.png b/code/modules/unit_tests/screenshots/screenshot_high_luminosity_eyes_light_emissive.png index 7445f2cfffa..cf4c0bfca8a 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_high_luminosity_eyes_light_emissive.png and b/code/modules/unit_tests/screenshots/screenshot_high_luminosity_eyes_light_emissive.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_saturnx_invisibility.png b/code/modules/unit_tests/screenshots/screenshot_saturnx_invisibility.png index b89eb66262f..8bffe88816f 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_saturnx_invisibility.png and b/code/modules/unit_tests/screenshots/screenshot_saturnx_invisibility.png differ diff --git a/modular_skyrat/modules/synths/code/bodyparts/ears.dm b/modular_skyrat/modules/synths/code/bodyparts/ears.dm index 04bf9e1e437..bceca4bcbaf 100644 --- a/modular_skyrat/modules/synths/code/bodyparts/ears.dm +++ b/modular_skyrat/modules/synths/code/bodyparts/ears.dm @@ -21,11 +21,11 @@ COOLDOWN_START(src, severe_cooldown, 10 SECONDS) switch(severity) if(EMP_HEAVY) - adjustEarDamage(SYNTH_ORGAN_HEAVY_EMP_DAMAGE, SYNTH_DEAF_STACKS) + owner.sound_damage(SYNTH_ORGAN_HEAVY_EMP_DAMAGE, SYNTH_DEAF_STACKS * 2) to_chat(owner, span_warning("Alert: Null feedback from auditory sensors detected, seek maintenance immediately. Error Code: AS-105")) if(EMP_LIGHT) - adjustEarDamage(SYNTH_ORGAN_LIGHT_EMP_DAMAGE, SYNTH_DEAF_STACKS) + owner.sound_damage(SYNTH_ORGAN_LIGHT_EMP_DAMAGE, SYNTH_DEAF_STACKS * 2) to_chat(owner, span_warning("Alert: Anomalous feedback from auditory sensors detected. Error Code: AS-50")) /datum/design/synth_ears diff --git a/modular_zubbers/code/datums/components/nanites.dm b/modular_zubbers/code/datums/components/nanites.dm index 78d345aec27..de8665ca304 100644 --- a/modular_zubbers/code/datums/components/nanites.dm +++ b/modular_zubbers/code/datums/components/nanites.dm @@ -270,9 +270,7 @@ host_mob.Paralyze(120) if(iscarbon(host_mob)) var/mob/living/carbon/carbon = host_mob - var/obj/item/organ/ears/ears = carbon.get_organ_slot(ORGAN_SLOT_EARS) - if(ears) - ears.adjustEarDamage(0, 30) //nanites coming out of your ears + carbon.sound_damage(0, 60 SECONDS) //nanites coming out of your ears carbon.vomit(VOMIT_CATEGORY_NANITE, /obj/effect/decal/cleanable/vomit/nanites) //nanites coming out of your mouth //nanites everywhere diff --git a/modular_zubbers/code/game/objects/structures/lewd_portals.dm b/modular_zubbers/code/game/objects/structures/lewd_portals.dm index 4524adca7c4..cf90dea5442 100644 --- a/modular_zubbers/code/game/objects/structures/lewd_portals.dm +++ b/modular_zubbers/code/game/objects/structures/lewd_portals.dm @@ -412,7 +412,7 @@ add_overlay(penis_image) /obj/lewd_portal_relay/proc/lower_body_only() - owner.dna.species.handle_body(owner) //Suboptimal way for doing this but I couldn't figure out another way to maintain underwear when dropping items + owner.update_body() //Suboptimal way for doing this but I couldn't figure out another way to maintain underwear when dropping items cut_overlays() for(var/limb in list(BODY_ZONE_R_LEG, BODY_ZONE_L_LEG, BODY_ZONE_CHEST)) var/obj/item/bodypart/limb_object = owner.get_bodypart(limb) diff --git a/modular_zubbers/code/modules/security_rocket_launcher/fake_explosion.dm b/modular_zubbers/code/modules/security_rocket_launcher/fake_explosion.dm index b8d474752e5..ff49f0a0994 100644 --- a/modular_zubbers/code/modules/security_rocket_launcher/fake_explosion.dm +++ b/modular_zubbers/code/modules/security_rocket_launcher/fake_explosion.dm @@ -33,9 +33,8 @@ //Do the knockdown victim_as_living.Knockdown(2 SECONDS) //Do the ear damage - var/obj/item/organ/ears/ears = victim_as_living.get_organ_slot(ORGAN_SLOT_EARS) - if(ears && !HAS_TRAIT_FROM_ONLY(victim_as_living, TRAIT_DEAF, EAR_DAMAGE)) - ears.adjustEarDamage(15, 60) + if(!HAS_TRAIT_FROM_ONLY(victim_as_living, TRAIT_DEAF, EAR_DAMAGE)) + victim_as_living.sound_damage(15, 120 SECONDS) continue