cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 22:19:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for ca2cc70322

Browse Source
This commit is contained in:
Roxy
2025-10-25 15:51:03 -04:00
parent 96f4136174
commit 3e3fa72cdf
6 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/unit_tests/screenshots/screenshot_high_luminosity_eyes_light_emissive.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 989 B

After

Width:  |  Height:  |  Size: 995 B

code/modules/unit_tests/screenshots/screenshot_saturnx_invisibility.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

modular_skyrat/modules/synths/code/bodyparts/ears.dm
+2 -2
View File
@@ -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
modular_zubbers/code/datums/components/nanites.dm
+1 -3
View File
@@ -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
modular_zubbers/code/game/objects/structures/lewd_portals.dm
+1 -1
View File
@@ -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)
modular_zubbers/code/modules/security_rocket_launcher/fake_explosion.dm
+2 -3
View File
@@ -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