nevimer a9a59ed3f9 Merge remote-tracking branch 'origin/upsteam-12-15-25-revert-unique-reskins' ...

# Conflicts:
#	_maps/bubber/automapper/templates/centcom/interlink_adminoffice.dmm
#	_maps/map_files/BoxStation/BoxStation.dmm
#	_maps/map_files/generic/CentCom_skyrat_z2.dmm
#	_maps/map_files/moonstation/moonstation.dmm
#	code/modules/holiday/holidays.dm

2026-01-12 22:09:10 -05:00

..

items

Merge remote-tracking branch 'tgstation/master' into upstream-2025-11-29

2025-11-29 22:49:21 -05:00

ai_upgrades.dm

…

robot_parts.dm

Assembling med/repair/secbots will now put their assemblies in your main hand instead of your offhand, and only do so if you held the original item (#94078)

2025-11-30 03:07:31 +01:00

robot_upgrades.dm

Fixes oversight with borg expand/shrink modules (#5029)

2025-12-17 14:44:46 -07:00