Merge branch 'master' of github.com:Kashargul/VOREStation into usr-to-user-up-to-player_effects

This commit is contained in:
Kashargul
2024-11-27 23:53:06 +01:00
281 changed files with 3628 additions and 3318 deletions
@@ -36,11 +36,11 @@
if(!partner)
return 0
if(!air_master || air_master.current_cycle <= update_cycle)
if(!SSair || SSair.current_cycle <= update_cycle)
return 0
update_cycle = air_master.current_cycle
partner.update_cycle = air_master.current_cycle
update_cycle = SSair.current_cycle
partner.update_cycle = SSair.current_cycle
var/air_heat_capacity = air_contents.heat_capacity()
var/other_air_heat_capacity = partner.air_contents.heat_capacity()