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

..

binary_devices

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

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

electrolyzer

Fixes atmos machines resetting their names when they should only be updating their icon (#91228)

2025-05-29 16:16:09 -04:00

fusion

Moves the HFR from process() to process_atmos() (#93902)

2025-11-19 04:09:42 +01:00

gas_recipe_machines

Turn atmos machines on/off correctly (#91521)

2025-06-15 15:53:27 -04:00

trinary_devices

Merged New() & Initialize() for atmos machines (#91512)

2025-07-11 17:37:21 -04:00

unary_devices

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

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

components_base.dm

Fixes random runtimes from RPD usage (#92246)

2025-08-08 15:29:12 -04:00

tank.dm

Fixes atmos machines resetting their names when they should only be updating their icon (#91228)

2025-05-29 16:16:09 -04:00