Merge remote-tracking branch 'tgstation/master' into upstream-12-15

# Conflicts:
#	.github/workflows/compile_all_maps.yml
#	.github/workflows/run_integration_tests.yml
#	_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm
#	code/_onclick/hud/credits.dm
#	code/controllers/subsystem/networks/id_access.dm
#	code/datums/diseases/advance/advance.dm
#	code/datums/diseases/advance/symptoms/heal.dm
#	code/game/machinery/doors/door.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/antagonists/malf_ai/malf_ai_modules.dm
#	code/modules/jobs/job_types/_job.dm
#	code/modules/loadout/categories/accessories.dm
#	code/modules/loadout/loadout_helpers.dm
#	code/modules/loadout/loadout_items.dm
#	code/modules/loadout/loadout_preference.dm
#	code/modules/mob/living/silicon/robot/robot_defense.dm
#	code/modules/mod/mod_theme.dm
#	code/modules/projectiles/ammunition/energy/laser.dm
#	code/modules/reagents/reagent_containers/cups/drinks.dm
#	code/modules/shuttle/mobile_port/variants/supply.dm
#	code/modules/surgery/organs/internal/eyes/_eyes.dm
#	code/modules/unit_tests/screenshots/screenshot_antag_icons_heretic.png
#	icons/hud/screen_full.dmi
This commit is contained in:
nevimer
2025-12-15 18:12:29 -05:00
1053 changed files with 115751 additions and 34654 deletions
@@ -149,6 +149,7 @@
if(internal_cell)
internal_cell = new internal_cell(src)
AddElement(/datum/element/drag_to_activate)
install_default_programs()
register_context()
update_appearance()
@@ -399,10 +400,6 @@
update_appearance()
return TRUE
/obj/item/modular_computer/mouse_drop_dragged(atom/over_object, mob/user)
if(!istype(over_object, /atom/movable/screen))
return attack_self(user)
/obj/item/modular_computer/attack_ai(mob/user)
return attack_self(user)
@@ -133,6 +133,7 @@
starting_programs = list(
/datum/computer_file/program/records/security,
/datum/computer_file/program/robocontrol,
/datum/computer_file/program/budgetorders,
)
/**
@@ -10,6 +10,7 @@
density = TRUE
max_integrity = 300
integrity_failure = 0.5
custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 10)
///A flag that describes this device type
var/hardware_flag = PROGRAM_CONSOLE