Merge branch 'master' of https://github.com/tgstation/tgstation into pupstream-2025-09-07

# Conflicts:
#	README.md
#	code/__DEFINES/admin.dm
#	code/__DEFINES/melee.dm
#	code/_globalvars/traits/_traits.dm
#	code/controllers/subsystem/economy.dm
#	code/datums/components/crafting/crafting.dm
#	code/datums/elements/crusher_loot.dm
#	code/modules/antagonists/pirate/pirate_shuttle_equipment.dm
#	code/modules/clothing/suits/_suits.dm
#	code/modules/escape_menu/leave_body.dm
#	code/modules/jobs/job_types/_job.dm
#	code/modules/mining/equipment/mineral_scanner.dm
#	code/modules/mob/living/living.dm
#	code/modules/plumbing/plumbers/pill_press.dm
#	tgui/packages/tgui/interfaces/Vending.tsx
This commit is contained in:
nevimer
2025-09-07 00:37:52 -04:00
362 changed files with 82084 additions and 106117 deletions
@@ -23,7 +23,7 @@
hackables = "health processor circuits"
possessed_message = "You are a medbot! Ensure good health among the crew to the best of your ability!"
additional_access = /datum/id_trim/job/paramedic
additional_access = /datum/id_trim/medibot
announcement_type = /datum/action/cooldown/bot_announcement/medbot
path_image_color = "#d9d9f4"
@@ -336,9 +336,10 @@
if(DOING_INTERACTION(src, TEND_DAMAGE_INTERACTION))
return
if((damage_type_healer == HEAL_ALL_DAMAGE && patient.get_total_damage() <= heal_threshold) || (!(damage_type_healer == HEAL_ALL_DAMAGE) && patient.get_current_damage_of_type(damage_type_healer) <= heal_threshold))
to_chat(src, "[patient] is healthy! Your programming prevents you from tending the wounds of anyone with less than [heal_threshold + 1] [damage_type_healer == HEAL_ALL_DAMAGE ? "total" : damage_type_healer] damage.")
return
if (!(bot_access_flags & BOT_COVER_EMAGGED))
if((damage_type_healer == HEAL_ALL_DAMAGE && patient.get_total_damage() <= heal_threshold) || (!(damage_type_healer == HEAL_ALL_DAMAGE) && patient.get_current_damage_of_type(damage_type_healer) <= heal_threshold))
to_chat(src, "[patient] is healthy! Your programming prevents you from tending the wounds of anyone with less than [heal_threshold + 1] [damage_type_healer == HEAL_ALL_DAMAGE ? "total" : damage_type_healer] damage.")
return
update_bot_mode(new_mode = BOT_HEALING, update_hud = FALSE)
patient.visible_message("[src] is trying to tend the wounds of [patient]", span_userdanger("[src] is trying to tend your wounds!"))
@@ -374,6 +375,32 @@
if(CanReach(patient))
melee_attack(patient)
/datum/id_trim/medibot
assignment = JOB_MEDIBOT
trim_state = "trim_paramedic"
department_color = COLOR_MEDICAL_BLUE
subdepartment_color = COLOR_MEDICAL_BLUE
sechud_icon_state = SECHUD_PARAMEDIC
access = list(
ACCESS_BIT_DEN,
ACCESS_CARGO,
ACCESS_CONSTRUCTION,
ACCESS_HYDROPONICS,
ACCESS_MAINT_TUNNELS,
ACCESS_MECH_MEDICAL,
ACCESS_MEDICAL,
ACCESS_MINERAL_STOREROOM,
ACCESS_MINING,
ACCESS_MINING_STATION,
ACCESS_MORGUE,
ACCESS_SCIENCE,
ACCESS_SERVICE,
ACCESS_SURGERY,
ACCESS_VIROLOGY,
ACCESS_PHARMACY,
)
honorifics = list("Medical Robot")
honorific_positions = HONORIFIC_POSITION_FIRST | HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_FIRST_FULL | HONORIFIC_POSITION_NONE
/mob/living/basic/bot/medbot/autopatrol
bot_mode_flags = BOT_MODE_ON | BOT_MODE_AUTOPATROL | BOT_MODE_REMOTE_ENABLED | BOT_MODE_CAN_BE_SAPIENT | BOT_MODE_ROUNDSTART_POSSESSION