mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-14 17:45:02 +01:00
Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-23-10-2025
This commit is contained in:
@@ -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 = ..()
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user