cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-14 09:35:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-23-10-2025

Browse Source
This commit is contained in:
Roxy
2025-10-23 17:38:23 -04:00
parent e9ee4dea19 2a5fae5d2a
commit e28e9fbdba
453 changed files with 20635 additions and 15897 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/basic/bots/honkbots/honkbot.dm
+1 -2
View File
@@ -83,8 +83,7 @@
if(HAS_TRAIT(current_target, TRAIT_DEAF))
return
var/obj/item/organ/ears/target_ears = current_target.get_organ_slot(ORGAN_SLOT_EARS)
target_ears?.adjustEarDamage(0, 5)
sound_damage(deafen = 10 SECONDS)
/mob/living/basic/bot/honkbot/ui_data(mob/user)
var/list/data = ..()
code/modules/mob/living/basic/bots/hygienebot/hygienebot_ai.dm
+1 -1
View File
@@ -86,7 +86,7 @@
found_target = wash_potential
break
for(var/atom/clothing in wash_potential.get_equipped_items())
for(var/atom/clothing in wash_potential.get_equipped_items(INCLUDE_HELD|INCLUDE_PROSTHETICS))
if(GET_ATOM_BLOOD_DNA_LENGTH(clothing))
found_target = wash_potential
break
code/modules/mob/living/basic/bots/medbot/medbot.dm
+1
View File
@@ -398,6 +398,7 @@
ACCESS_SURGERY,
ACCESS_VIROLOGY,
ACCESS_PHARMACY,
ACCESS_PARAMEDIC,
)
honorifics = list("Medical Robot")
honorific_positions = HONORIFIC_POSITION_FIRST | HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_FIRST_FULL | HONORIFIC_POSITION_NONE
code/modules/mob/living/basic/drone/verbs.dm
+1 -1
View File
@@ -30,5 +30,5 @@
var/area/A = get_area(loc)
if(alert_s && A && stat != DEAD)
var/msg = span_boldnotice("DRONE PING: [name]: [alert_s] priority alert in [A.name]!")
var/msg = span_big("DRONE PING: [name]: [alert_s] priority alert in [A.name]!")
alert_drones(msg)
code/modules/mob/living/basic/lavaland/legion/legion_tumour.dm
+3 -7
View File
@@ -31,14 +31,10 @@
. = ..()
animate_pulse()
/obj/item/organ/legion_tumour/apply_organ_damage(damage_amount, maximum, required_organ_flag)
var/was_failing = organ_flags & ORGAN_FAILING
. = ..()
if (was_failing != (organ_flags & ORGAN_FAILING))
animate_pulse()
/obj/item/organ/legion_tumour/on_begin_failure()
animate_pulse()
/obj/item/organ/legion_tumour/set_organ_damage(damage_amount, required_organ_flag)
. = ..()
/obj/item/organ/legion_tumour/on_failure_recovery()
animate_pulse()
/// Do a heartbeat animation depending on if we're failing or not